f872402fc4
Merge branch 'master' into accent-colour-properties
2018-03-22 16:10:52 +09:00
4ccaf143b5
Give sliders a default accent colour
2018-03-22 15:50:19 +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
e39b7b8d35
Don't hard-crash when an unknown section is encountered in a legacy file
2018-03-22 12:58:02 +09:00
976702aef9
Merge branch 'master' into fix-osu-logo-sounds
2018-03-22 12:50:45 +09:00
78a8f60b39
IHasComboIndex -> IHasComboInformation
2018-03-22 12:35:17 +09:00
1a782a840c
Fix xmldoc
2018-03-22 12:34:29 +09:00
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
552e7e314d
Merge branch 'master' into bail-on-invalid-archive
2018-03-22 11:32:38 +09:00
606ad4b93b
Merge pull request #2244 from peppy/skin-ini-parsing
...
Add skin.ini parsing
2018-03-22 11:32:24 +09:00
101caf3064
Apply same logic fixes to delete/restore all notifications
2018-03-22 11:28:40 +09:00
53e79ca0d6
Merge branch 'master' into skin-ini-parsing
2018-03-22 11:17:14 +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
e67d8e1354
Update nuspec to include humanizer localisations
2018-03-21 22:32:10 +09:00
5a10270a2a
return -> break
...
no real reason but whatever works
2018-03-20 20:32:32 +09:00
3151940435
Merge pull request #2231 from peppy/fix-catch-droplets
...
Fix juice stream droplets spawning in incorrect locations
2018-03-20 20:06:22 +09:00
625e561fc8
Fix whitespace
2018-03-20 18:01:09 +09:00
c38c26eacb
Move combo index processing to BeatmapProcessor
2018-03-20 15:57:43 +09:00
cb3d0db555
Move combo colours completely out of HitObjects
2018-03-20 15:50:12 +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
c4f5b46d72
Add basic structure for skin configurations
2018-03-19 20:06:44 +09:00
f8886c5472
Merge branch 'master' into fix-catch-droplets
2018-03-19 19:48:24 +09:00
4e4f3fc039
Merge pull request #2226 from smoogipoo/fix-editor-clocks
...
Rewrite the way clocks are handled in the Editor
2018-03-19 19:19:59 +09:00
4b812279bb
Merge branch 'master' into fix-editor-clocks
2018-03-19 19:06:38 +09:00
caa2827581
Merge pull request #2243 from smoogipoo/fix-selectionbox-crash
...
Fix crash when attempting to select objects that don't have masks
2018-03-19 18:58:56 +09:00
8d4c9eda48
Fix attempting to add selection boxes with no selection
...
E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.
2018-03-19 18:00:11 +09:00
193142e901
Fix missed BDL case
2018-03-19 16:44:46 +09:00
