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
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
5a10270a2a
return -> break
...
no real reason but whatever works
2018-03-20 20:32:32 +09:00
Dan Balasescu
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
Dean Herbert
625e561fc8
Fix whitespace
2018-03-20 18:01:09 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
9ad4e9284a
Add skin source fallback chain
2018-03-20 16:40:11 +09:00
Dean Herbert
fd0391daf7
Merge branch 'accent-colour-properties'
2018-03-20 16:25:22 +09:00
Dean Herbert
52472e005e
Merge branch 'beatmap-as-a-skin'
2018-03-20 16:24:41 +09:00
Dean Herbert
4aa9c26259
Merge branch 'skin-ini-parsing'
2018-03-20 16:24:35 +09:00
Dean Herbert
d1c2aa71d0
Add beatmap sample override support
2018-03-20 16:24:06 +09:00
Dean Herbert
9a0fc9e29a
Move combo colours completely out of beatmap
2018-03-20 16:24:06 +09:00
Dean Herbert
dbcf755618
Make Beatmaps parsable as skins
2018-03-20 16:05:29 +09:00
Dean Herbert
c38c26eacb
Move combo index processing to BeatmapProcessor
2018-03-20 15:57:43 +09:00
Dean Herbert
cb3d0db555
Move combo colours completely out of HitObjects
2018-03-20 15:50:12 +09:00
Dean Herbert
553fd3b789
Give DefaultSkin an empty Configuration
2018-03-19 21:00:27 +09:00
Dean Herbert
f565cc861d
Hard bail on attempting to import an invalid archive format
2018-03-19 20:41:12 +09:00
Dean Herbert
994c7bfabd
Further improvements to messaging
2018-03-19 20:40:14 +09:00
Dean Herbert
b71c123214
Allow import of skins which don't have ini files
2018-03-19 20:26:16 +09:00
Dean Herbert
18368d2446
Make import notifications fail when any imports fail
2018-03-19 20:18:23 +09:00
Dean Herbert
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
Dean Herbert
ec851648da
Add better ToString output from SkinInfo
2018-03-19 20:06:44 +09:00
Dean Herbert
397b06283a
Add basic skin configuration decoding support
2018-03-19 20:06:44 +09:00
Dean Herbert
8e52d91180
Handle missing files without hard failure
...
Also adds support for lookups with file extensions
2018-03-19 20:06:44 +09:00
Dean Herbert
62e908e22c
Add default separator character
2018-03-19 20:06:44 +09:00
Dean Herbert
c4f5b46d72
Add basic structure for skin configurations
2018-03-19 20:06:44 +09:00
Dean Herbert
f8886c5472
Merge branch 'master' into fix-catch-droplets
2018-03-19 19:48:24 +09:00
Dean Herbert
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
Dean Herbert
4b812279bb
Merge branch 'master' into fix-editor-clocks
2018-03-19 19:06:38 +09:00
Dean Herbert
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
smoogipoo
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
smoogipoo
193142e901
Fix missed BDL case
2018-03-19 16:44:46 +09:00
smoogipoo
e25d1f6982
Pass down editor clocks through DI
2018-03-19 16:27:52 +09:00
Dean Herbert
2c7a18984e
Merge branch 'master' into fix-catch-droplets
2018-03-19 00:36:05 +09:00
smoogipoo
abb5dcf678
Fix null-refing testcase
...
This would also be fixed with BDL loading children after we're fully loaded ;).
2018-03-16 23:53:55 +09:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks
2018-03-16 23:32:54 +09:00
Dean Herbert
cbe2de33c5
Merge pull request #2225 from smoogipoo/editor-wheel-movement
...
Implement mousewheel time scrolling in the editor
2018-03-16 23:31:45 +09:00
smoogipoo
6f7163769d
Adjust comment for readability
2018-03-16 19:57:14 +09:00
Dean Herbert
7c7f2e2dce
Merge branch 'master' into fix-catch-droplets
2018-03-16 19:05:58 +09:00
Dean Herbert
e8f7f2c8ab
Merge branch 'master' into editor-wheel-movement
2018-03-16 18:19:42 +09:00
Dean Herbert
1b2e4bb8f7
Merge pull request #2207 from FreezyLemon/fix-autoplay-button-deselect
...
Fix autoplay button wrongly being active after a Ctrl-Enter play
2018-03-16 18:01:55 +09:00
Dean Herbert
4411758ff7
Merge branch 'master' into fix-autoplay-button-deselect
2018-03-16 17:31:14 +09:00
