92d8781bf0
Merge branch 'master' into beat-snap-divisor
2018-03-22 20:14:50 +09:00
2b7d22c4ea
Very slightly reduce size of slider bar to increase bottom padding
2018-03-22 20:11:55 +09:00
4e2c6ccedc
Merge branch 'master' into skin-scaling
2018-03-22 20:11:30 +09:00
ff41ad976b
Merge pull request #2270 from peppy/fix-player-loader
...
Fix retry not allowing continuing beyond PlayerLoader
2018-03-22 20:09:57 +09:00
88ad3db022
Update framework
2018-03-22 20:00:57 +09:00
090c78bf10
Merge remote-tracking branch 'origin/master' into fix-player-loader
2018-03-22 20:00:21 +09:00
a6bcb0bbd1
Merge pull request #2279 from peppy/fix-settings-notification-verlay
...
Only allow settings or notifications to be visible at once
2018-03-22 19:59:31 +09:00
e5f83530b8
Only allow settings or notifications to be visible at once
...
Resolves #2273 .
2018-03-22 19:49:31 +09:00
ee12d75b30
Merge branch 'master' into skin-scaling
2018-03-22 19:30:17 +09:00
61ef635743
Merge pull request #2254 from peppy/skin--completion
...
Add skin/beatmap lookup hierarchy
2018-03-22 19:28:35 +09:00
2d08cee3b4
Merge branch 'master' into skin--completion
2018-03-22 19:04:22 +09:00
242ee8f6f1
Merge pull request #2278 from peppy/focused-textbox-fix
...
Fix FocusedTextBox in line with framework changes
2018-03-22 19:01:37 +09:00
af65f2dd48
Move AccentColour changes local to rulesets which rely on it
2018-03-22 18:53:16 +09:00
f87c376547
Update framework
2018-03-22 18:52:32 +09:00
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
75ca10af75
Merge pull request #2253 from peppy/beatmap-as-a-skin
...
Make Beatmaps decodable as Skins
2018-03-22 16:35:43 +09:00
b8022070e8
Merge remote-tracking branch 'upstream/master' into beatmap-as-a-skin
2018-03-22 16:24:56 +09:00
894575e3f5
Merge pull request #2252 from peppy/accent-colour-properties
...
Remove ComboColour from HitObjects
2018-03-22 16:19:42 +09:00
dade52d15d
Fix vertical padding
2018-03-22 16:15:14 +09:00
1b116dd04e
Adjust testcase sizing to match editor
2018-03-22 16:11:56 +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
4ccaf143b5
Give sliders a default accent colour
2018-03-22 15:50:19 +09:00
5f1bb8d753
Merge branch 'master' into fix-player-loader
2018-03-22 15:46:37 +09:00
db9cfa574f
Merge pull request #2258 from peppy/update-nuspec
...
Update nuspec to include humanizer localisations
2018-03-22 15:46:14 +09:00
524326fabc
Merge branch 'master' into update-nuspec
2018-03-22 15:37:57 +09:00
3e9acc3a46
Merge pull request #2262 from peppy/fix-dummy-ruleset
...
Fix DummyRuleset getting selected after non-matching filter
2018-03-22 15:37:36 +09:00
13a3c728dc
Merge branch 'master' into fix-dummy-ruleset
2018-03-22 15:29:43 +09:00
110eca1aca
Merge pull request #2277 from smoogipoo/batch-action-caching
...
Use cached VertexBuffer add delegate
2018-03-22 15:29:30 +09:00
799b7caf7e
Update framework
2018-03-22 15:20:58 +09:00
3f3f57e51e
Use cached vertexbatch add delegate
2018-03-22 15:13:38 +09:00
1a86a057bc
Merge pull request #2245 from peppy/better-import-notice
...
Make import notifications fail when any imports fail
2018-03-22 15:11:33 +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
977e73bba2
Merge pull request #2276 from peppy/ignore-unknown-sections
...
Don't hard-crash when an unknown section is encountered in a legacy file
2018-03-22 14:56:28 +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
42c1cb4bab
Merge pull request #2272 from peppy/fix-osu-logo-sounds
...
Fix osu! logo making hover beat sounds when not visible
2018-03-22 13:46:46 +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
