Dan Balasescu
f872402fc4
Merge branch 'master' into accent-colour-properties
2018-03-22 16:10:52 +09:00
Dean Herbert
a4804f47a9
Merge branch 'master' into beat-snap-divisor
2018-03-22 16:06:26 +09:00
Dean Herbert
6e379f0646
Fix FocusedTextBox in line with framework changes
2018-03-22 15:54:16 +09:00
smoogipoo
4ccaf143b5
Give sliders a default accent colour
2018-03-22 15:50:19 +09:00
Dean Herbert
5f1bb8d753
Merge branch 'master' into fix-player-loader
2018-03-22 15:46:37 +09:00
Dean Herbert
db9cfa574f
Merge pull request #2258 from peppy/update-nuspec
...
Update nuspec to include humanizer localisations
2018-03-22 15:46:14 +09:00
Dean Herbert
524326fabc
Merge branch 'master' into update-nuspec
2018-03-22 15:37:57 +09:00
Dean Herbert
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
Dan Balasescu
13a3c728dc
Merge branch 'master' into fix-dummy-ruleset
2018-03-22 15:29:43 +09:00
Dean Herbert
110eca1aca
Merge pull request #2277 from smoogipoo/batch-action-caching
...
Use cached VertexBuffer add delegate
2018-03-22 15:29:30 +09:00
Dean Herbert
799b7caf7e
Update framework
2018-03-22 15:20:58 +09:00
smoogipoo
3f3f57e51e
Use cached vertexbatch add delegate
2018-03-22 15:13:38 +09:00
Dean Herbert
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
Dean Herbert
7bdca0ff39
Merge remote-tracking branch 'upstream/master' into accent-colour-properties
2018-03-22 15:07:28 +09:00
Dean Herbert
9a20839b74
Merge branch 'master' into better-import-notice
2018-03-22 14:57:04 +09:00
Dean Herbert
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
Dan Balasescu
dd99a210e2
Merge branch 'master' into ignore-unknown-sections
2018-03-22 14:48:06 +09:00
smoogipoo
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
Dean Herbert
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
Dean Herbert
5104ba8118
Merge branch 'master' into beatmap-as-a-skin
2018-03-22 13:45:30 +09:00
Dean Herbert
917334a39a
Move cancel code to exit paths for screen
2018-03-22 13:01:40 +09:00
Dean Herbert
e39b7b8d35
Don't hard-crash when an unknown section is encountered in a legacy file
2018-03-22 12:58:02 +09:00
Dean Herbert
504c3ff0ba
BeatmapSkin -> LegacyBeatmapSkin
2018-03-22 12:50:48 +09:00
Dan Balasescu
976702aef9
Merge branch 'master' into fix-osu-logo-sounds
2018-03-22 12:50:45 +09:00
Dean Herbert
c5eecae32f
Improve shared code paths in legacy skins
2018-03-22 12:50:23 +09:00
Dean Herbert
78a8f60b39
IHasComboIndex -> IHasComboInformation
2018-03-22 12:35:17 +09:00
Dean Herbert
1a782a840c
Fix xmldoc
2018-03-22 12:34:29 +09:00
Dan Balasescu
2d2b56bb75
Merge pull request #2246 from peppy/bail-on-invalid-archive
...
Hard bail on attempting to import an invalid archive format
2018-03-22 11:59:52 +09:00
Dan Balasescu
77ebd94804
Merge branch 'master' into beatmap-as-a-skin
2018-03-22 11:33:27 +09:00
Dan Balasescu
552e7e314d
Merge branch 'master' into bail-on-invalid-archive
2018-03-22 11:32:38 +09:00
Dan Balasescu
606ad4b93b
Merge pull request #2244 from peppy/skin-ini-parsing
...
Add skin.ini parsing
2018-03-22 11:32:24 +09:00
Dean Herbert
101caf3064
Apply same logic fixes to delete/restore all notifications
2018-03-22 11:28:40 +09:00
Dan Balasescu
53e79ca0d6
Merge branch 'master' into skin-ini-parsing
2018-03-22 11:17:14 +09:00
Dean Herbert
e0b74a357a
Fix osu! logo making hover beat sounds when not visible
2018-03-22 03:31:14 +09:00
Dean Herbert
8f71d53c17
Fix retry not allowing continuing beyond PlayerLoader
...
Resolves #2265 .
2018-03-22 02:10:31 +09:00
TocoToucan
4991f2ad2e
Change filename format
2018-03-21 18:27:08 +03:00
Dean Herbert
62229300c4
Fix DummyRuleset getting selected
...
Resolves #2261 .
2018-03-22 00:26:48 +09:00
Dean Herbert
e67d8e1354
Update nuspec to include humanizer localisations
2018-03-21 22:32:10 +09:00
Dean Herbert
4a93abcc36
Add scale adjusts to bring legacy skins in-line with lazer sizing
2018-03-21 20:07:58 +09:00
Dean Herbert
d909cce8d6
Add the ability to skin the gameplay cursor
2018-03-21 20:06:10 +09:00
Dean Herbert
65b6a2faad
Fix mod button sounds playing when mod overlay is not visible
...
Resolves #2240 .
2018-03-21 18:41:21 +09:00
Dean Herbert
271c082606
Adjust colour assignment
2018-03-21 16:25:32 +09:00
Dean Herbert
48142602ea
Adjust text size to match design
2018-03-21 16:04:43 +09:00
Dean Herbert
63f0419d6a
Apply minor fixes
2018-03-21 15:40:43 +09:00
Dean Herbert
f944c29505
Merge remote-tracking branch 'upstream/master' into take_screenshot
2018-03-21 12:32:27 +09:00
Dean Herbert
357a3c535e
Update framework
2018-03-21 12:29:49 +09:00
Dean Herbert
ccdd11d7b2
Add missing licence header
2018-03-21 12:29:44 +09:00
Dean Herbert
9a5e464c99
Merge branch 'master' into beat-snap-divisor
2018-03-20 22:26:02 +09:00
Dean Herbert
8ac660b0c6
Fixes for keyboard handling and general code quality
2018-03-20 22:25:15 +09:00
Dean Herbert
aa8b0d017c
Adjust colours and spacing
2018-03-20 21:59:56 +09:00
