Commit Graph

7284 Commits

Author SHA1 Message Date
e5f83530b8 Only allow settings or notifications to be visible at once
Resolves #2273.
2018-03-22 19:49:31 +09:00
2d08cee3b4 Merge branch 'master' into skin--completion 2018-03-22 19:04:22 +09:00
af65f2dd48 Move AccentColour changes local to rulesets which rely on it 2018-03-22 18:53:16 +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
b8022070e8 Merge remote-tracking branch 'upstream/master' into beatmap-as-a-skin 2018-03-22 16:24:56 +09:00
f872402fc4 Merge branch 'master' into accent-colour-properties 2018-03-22 16:10:52 +09:00
6e379f0646 Fix FocusedTextBox in line with framework changes 2018-03-22 15:54:16 +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
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
62229300c4 Fix DummyRuleset getting selected
Resolves #2261.
2018-03-22 00:26:48 +09:00
5a10270a2a return -> break
no real reason but whatever works
2018-03-20 20:32:32 +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
f03abb3145 Add GetTexture method to ISkinSource
Used to shortcut lookup checks without potentially expensive drawable creation overhead.
2018-03-20 16:40:11 +09:00
9ad4e9284a Add skin source fallback chain 2018-03-20 16:40:11 +09:00
fd0391daf7 Merge branch 'accent-colour-properties' 2018-03-20 16:25:22 +09:00
d1c2aa71d0 Add beatmap sample override support 2018-03-20 16:24:06 +09:00
9a0fc9e29a Move combo colours completely out of beatmap 2018-03-20 16:24:06 +09:00
dbcf755618 Make Beatmaps parsable as skins 2018-03-20 16:05:29 +09:00
c38c26eacb Move combo index processing to BeatmapProcessor 2018-03-20 15:57:43 +09:00
553fd3b789 Give DefaultSkin an empty Configuration 2018-03-19 21:00:27 +09:00
f565cc861d Hard bail on attempting to import an invalid archive format 2018-03-19 20:41:12 +09:00
994c7bfabd Further improvements to messaging 2018-03-19 20:40:14 +09:00
b71c123214 Allow import of skins which don't have ini files 2018-03-19 20:26:16 +09:00
18368d2446 Make import notifications fail when any imports fail 2018-03-19 20:18:23 +09:00
7272ba2f1b Add migration for skins which didn't get a proper name assigned
Also correctly imports new skins
2018-03-19 20:06:44 +09:00
ec851648da Add better ToString output from SkinInfo 2018-03-19 20:06:44 +09:00
397b06283a Add basic skin configuration decoding support 2018-03-19 20:06:44 +09:00
8e52d91180 Handle missing files without hard failure
Also adds support for lookups with file extensions
2018-03-19 20:06:44 +09:00
62e908e22c Add default separator character 2018-03-19 20:06:44 +09:00