1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 09:32:54 +08:00
Commit Graph

11307 Commits

Author SHA1 Message Date
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
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
e39b7b8d35 Don't hard-crash when an unknown section is encountered in a legacy file 2018-03-22 12:58:02 +09:00
Dan Balasescu
976702aef9
Merge branch 'master' into fix-osu-logo-sounds 2018-03-22 12:50:45 +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
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
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
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
Dean Herbert
8d790e180d Fix juice stream droplets spawning in incorrect locations
Closes #2149.
2018-03-16 17:03:38 +09:00
Dan Balasescu
18615ce8fd
Merge pull request #2223 from peppy/drawable-composite-hit-object
Make DrawableHitObject a CompositeDrawable
2018-03-16 16:24:26 +09:00
smoogipoo
20acc601bb Fix up breaking taiko changes 2018-03-16 16:10:09 +09:00
Dean Herbert
bca4b620b6
Merge branch 'master' into editor-wheel-movement 2018-03-16 15:56:51 +09:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:53:16 +09:00
Dean Herbert
f640b874df
Merge pull request #2219 from Joehuu/mod-fixes
Improve mods description and adjust multipliers to match stable
2018-03-16 15:53:04 +09:00