|
|
97e71245e9
|
Merge branch 'master' into reduce-panel-width
|
2018-07-17 16:36:05 +09:00 |
|
|
|
9f933187e9
|
Apply review feedback
|
2018-07-17 16:33:08 +09:00 |
|
|
|
c51fe6a119
|
Remove more unused stuff
|
2018-07-17 16:01:47 +09:00 |
|
|
|
9f730dd784
|
Merge branch 'editor-composer-cleanup' into mania-mask-container
# Conflicts:
# osu.Game/Rulesets/Edit/HitObjectComposer.cs
# osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
|
2018-07-17 16:00:46 +09:00 |
|
|
|
3905a9105c
|
Add a playfield method to retrieve all hitobjects
|
2018-07-17 15:51:10 +09:00 |
|
|
|
48190e3b5a
|
Make NestedPlayfields non-null
|
2018-07-17 15:48:51 +09:00 |
|
|
|
569d0f7993
|
Merge branch 'master' into scrolldirection-cleanup
|
2018-07-17 15:39:13 +09:00 |
|
|
|
0b66f63f7d
|
Invert flow order of hitobjects between composer and mask layers
|
2018-07-17 15:35:32 +09:00 |
|
|
|
e681bd3244
|
Merge branch 'master' into fix-incorrect-mods
|
2018-07-17 15:23:21 +09:00 |
|
|
|
827c5c4939
|
Remove scroll direction from ScrolingPlayfield constructor
|
2018-07-17 15:14:03 +09:00 |
|
|
|
825941aff1
|
Use switch with type matching in place of if-else where possible
|
2018-07-17 14:35:09 +09:00 |
|
|
|
b967fe714b
|
Fix lead-in time now being long enough in many cases
|
2018-07-17 14:29:22 +09:00 |
|
|
|
745d596343
|
Merge branch 'master' into fix-incorrect-mods
|
2018-07-17 13:41:02 +09:00 |
|
|
|
7a2dc3c674
|
Merge branch 'master' into clickable-download-notifications
|
2018-07-17 13:29:16 +09:00 |
|
|
|
577ff4cc7f
|
Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Mania/UI/ManiaStage.cs
|
2018-07-17 13:13:57 +09:00 |
|
|
|
61f58ed08a
|
Merge branch 'master' into reduce-panel-width
|
2018-07-17 12:51:16 +09:00 |
|
|
|
e4fc3a1c65
|
Merge branch 'master' into fix-drawable-load-regression
|
2018-07-17 12:22:12 +09:00 |
|
|
|
4f1b7c8065
|
Merge branch 'master' into reduce-panel-width
|
2018-07-17 04:20:40 +09:00 |
|
|
|
84c13174d9
|
Merge branch 'master' into use-has-flags
|
2018-07-17 03:50:40 +09:00 |
|
|
|
40a1f8313e
|
Merge branch 'master' into make-notifications-quieter
|
2018-07-17 03:24:47 +09:00 |
|
|
|
f4591c6d0b
|
Merge branch 'master' into fix_color_parsing
|
2018-07-17 00:25:32 +09:00 |
|
|
|
da300baff1
|
Update hide logic
|
2018-07-17 00:06:51 +09:00 |
|
|
|
ca7b61367f
|
Merge branch 'master' into correctQuickFade
|
2018-07-17 00:02:15 +09:00 |
|
|
|
fc77e01ba9
|
Fix formatting, make StripComments protected
Don't strip comments when calling ParseLine
|
2018-07-16 16:35:55 +02:00 |
|
|
|
58fe434dd0
|
Don't use in invalidation logic to avoid incorrect execution
|
2018-07-16 16:39:52 +09:00 |
|
|
|
98cddc0c04
|
Fix some legacy cases
|
2018-07-16 16:26:37 +09:00 |
|
|
|
dbc538abbe
|
Use Enum.HasFlag
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
|
2018-07-16 16:18:46 +09:00 |
|
|
|
a117b323e2
|
Merge branch 'master' into make-notifications-quieter
|
2018-07-16 13:15:07 +09:00 |
|
|
|
a12c47536b
|
Change default to being important
|
2018-07-16 13:00:21 +09:00 |
|
|
|
429306aa87
|
Fix casing, use ordinal string comparison when stripping comments
|
2018-07-16 01:54:20 +02:00 |
|
|
|
87a4bf3d92
|
Remove using directive for regex in LegacyDecoder
|
2018-07-16 01:08:30 +02:00 |
|
|
|
6c861a1638
|
Strip comments from everything except metadata
|
2018-07-16 01:04:41 +02:00 |
|
|
|
4829f4f09c
|
Merge branch 'master' into download-button-state
|
2018-07-16 03:17:26 +09:00 |
|
|
|
453d58bcbd
|
Hide Content instead of particular overlays
|
2018-07-15 01:10:05 +02:00 |
|
|
|
c8697e1743
|
Fix KeyCounter counting clicks when game is paused
|
2018-07-14 03:08:28 +02:00 |
|
|
|
730eb2daa2
|
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
|
2018-07-14 03:47:56 +09:00 |
|
|
|
81e5a37d6d
|
Enlist a few more important notifications
|
2018-07-14 03:31:19 +09:00 |
|
|
|
e0bcd6988a
|
Merge branch 'master' into lesserSideKeys
|
2018-07-13 23:32:44 +09:00 |
|
|
|
d63611a9b3
|
Merge branch 'master' into fix-incorrect-mods
|
2018-07-13 22:08:21 +09:00 |
|
|
|
6698f320fb
|
Merge branch 'master' into download-button-state
|
2018-07-13 22:05:26 +09:00 |
|
|
|
4f5578245e
|
Fix regression causing previews to not play
|
2018-07-13 21:45:49 +09:00 |
|
|
|
63c40e9051
|
Remove unnecessary cache operations
|
2018-07-13 21:45:42 +09:00 |
|
|
|
ac35e8bd99
|
Remove redundant empty statement
|
2018-07-13 21:27:09 +09:00 |
|
|
|
ac4f25c5bc
|
Make notifications less noisy
|
2018-07-13 21:25:08 +09:00 |
|
|
|
fc3aff6689
|
Fix initial colour
|
2018-07-13 21:19:10 +09:00 |
|
|
|
6d8923a37c
|
Use better logic
|
2018-07-13 21:08:41 +09:00 |
|
|
|
ce804461e8
|
Merge branch 'master' into focused-overlay-blocks-select
|
2018-07-13 21:06:59 +09:00 |
|
|
|
a1a077398c
|
Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications
|
2018-07-13 21:04:17 +09:00 |
|
|
|
95f314d949
|
Fix crash when clicking notification from player
|
2018-07-13 21:04:10 +09:00 |
|
|
|
b33a0f772e
|
Don't close toolbar
|
2018-07-13 21:00:52 +09:00 |
|
