fc85bf919e
Merge remote-tracking branch 'origin/master' into focused-textbox-fix
2018-03-22 18:52:06 +09:00
9f220b3b9b
Add explanatory comment
2018-03-22 18:51:03 +09:00
366b7fca65
Remove GetColour method
2018-03-22 18:50:19 +09:00
425d4aa766
Add ability to lookup arbitrary SkinConfiguration values
2018-03-22 18:10:28 +09:00
c4fe6a04c5
Use string lookups for combo colours
2018-03-22 17:32:05 +09:00
ab9505652b
Merge branch 'master' into skin--completion
2018-03-22 16:44:00 +09:00
b8022070e8
Merge remote-tracking branch 'upstream/master' into beatmap-as-a-skin
2018-03-22 16:24:56 +09:00
dade52d15d
Fix vertical padding
2018-03-22 16:15:14 +09:00
f872402fc4
Merge branch 'master' into accent-colour-properties
2018-03-22 16:10:52 +09:00
a4804f47a9
Merge branch 'master' into beat-snap-divisor
2018-03-22 16:06:26 +09:00
6e379f0646
Fix FocusedTextBox in line with framework changes
2018-03-22 15:54:16 +09:00
5f1bb8d753
Merge branch 'master' into fix-player-loader
2018-03-22 15:46:37 +09:00
13a3c728dc
Merge branch 'master' into fix-dummy-ruleset
2018-03-22 15:29:43 +09:00
3f3f57e51e
Use cached vertexbatch add delegate
2018-03-22 15:13:38 +09:00
7bdca0ff39
Merge remote-tracking branch 'upstream/master' into accent-colour-properties
2018-03-22 15:07:28 +09:00
9a20839b74
Merge branch 'master' into better-import-notice
2018-03-22 14:57:04 +09:00
dd99a210e2
Merge branch 'master' into ignore-unknown-sections
2018-03-22 14:48:06 +09:00
dc9fb84e25
Update progress with the current item, not the next item
...
In the case where there is no next item, the progress will not get updated, so we'll essentially skip one element from filling the progress bar further. In the future we may/will want to not hide the notification upon completion, so this will look better in such scenarios.
2018-03-22 14:46:25 +09:00
5104ba8118
Merge branch 'master' into beatmap-as-a-skin
2018-03-22 13:45:30 +09:00
917334a39a
Move cancel code to exit paths for screen
2018-03-22 13:01:40 +09:00
e39b7b8d35
Don't hard-crash when an unknown section is encountered in a legacy file
2018-03-22 12:58:02 +09:00
504c3ff0ba
BeatmapSkin -> LegacyBeatmapSkin
2018-03-22 12:50:48 +09:00
976702aef9
Merge branch 'master' into fix-osu-logo-sounds
2018-03-22 12:50:45 +09:00
c5eecae32f
Improve shared code paths in legacy skins
2018-03-22 12:50:23 +09:00
78a8f60b39
IHasComboIndex -> IHasComboInformation
2018-03-22 12:35:17 +09:00
1a782a840c
Fix xmldoc
2018-03-22 12:34:29 +09:00
77ebd94804
Merge branch 'master' into beatmap-as-a-skin
2018-03-22 11:33:27 +09:00
552e7e314d
Merge branch 'master' into bail-on-invalid-archive
2018-03-22 11:32:38 +09:00
101caf3064
Apply same logic fixes to delete/restore all notifications
2018-03-22 11:28:40 +09:00
e0b74a357a
Fix osu! logo making hover beat sounds when not visible
2018-03-22 03:31:14 +09:00
8f71d53c17
Fix retry not allowing continuing beyond PlayerLoader
...
Resolves #2265 .
2018-03-22 02:10:31 +09:00
4991f2ad2e
Change filename format
2018-03-21 18:27:08 +03:00
62229300c4
Fix DummyRuleset getting selected
...
Resolves #2261 .
2018-03-22 00:26:48 +09:00
4a93abcc36
Add scale adjusts to bring legacy skins in-line with lazer sizing
2018-03-21 20:07:58 +09:00
65b6a2faad
Fix mod button sounds playing when mod overlay is not visible
...
Resolves #2240 .
2018-03-21 18:41:21 +09:00
271c082606
Adjust colour assignment
2018-03-21 16:25:32 +09:00
48142602ea
Adjust text size to match design
2018-03-21 16:04:43 +09:00
63f0419d6a
Apply minor fixes
2018-03-21 15:40:43 +09:00
f944c29505
Merge remote-tracking branch 'upstream/master' into take_screenshot
2018-03-21 12:32:27 +09:00
ccdd11d7b2
Add missing licence header
2018-03-21 12:29:44 +09:00
87b9ffced2
added description of the IReadFromConfig interface
2018-03-20 21:51:05 +01:00
8ac660b0c6
Fixes for keyboard handling and general code quality
2018-03-20 22:25:15 +09:00
aa8b0d017c
Adjust colours and spacing
2018-03-20 21:59:56 +09:00
dac1ba21db
Make keyboard control work
2018-03-20 21:38:22 +09:00
045610dbfe
Adjust styling and colours
2018-03-20 21:31:17 +09:00
5a10270a2a
return -> break
...
no real reason but whatever works
2018-03-20 20:32:32 +09:00
c2eb32c0e9
DrawableBeatDivisor -> BeatDivisorControl
2018-03-20 20:10:27 +09:00
6fd650777c
Move value change logic to bindable
...
Also add drag support
2018-03-20 20:09:55 +09:00
625e561fc8
Fix whitespace
2018-03-20 18:01:09 +09:00
fb3d319d0e
Make fallback bool into a function
...
Allows correct handling now that beatmap skins are also a thing.
2018-03-20 16:40:11 +09:00
