1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 02:22:59 +08:00
Commit Graph

11348 Commits

Author SHA1 Message Date
Dean Herbert
dade52d15d Fix vertical padding 2018-03-22 16:15:14 +09:00
Dean Herbert
1b116dd04e Adjust testcase sizing to match editor 2018-03-22 16:11:56 +09:00
Dean Herbert
a4804f47a9 Merge branch 'master' into beat-snap-divisor 2018-03-22 16:06:26 +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
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
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
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
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
Dean Herbert
dac1ba21db Make keyboard control work 2018-03-20 21:38:22 +09:00
Dean Herbert
045610dbfe Adjust styling and colours 2018-03-20 21:31:17 +09:00
Dean Herbert
5a10270a2a
return -> break
no real reason but whatever works
2018-03-20 20:32:32 +09:00
Dean Herbert
c2eb32c0e9 DrawableBeatDivisor -> BeatDivisorControl 2018-03-20 20:10:27 +09:00
Dean Herbert
6fd650777c Move value change logic to bindable
Also add drag support
2018-03-20 20:09:55 +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
smoogipoo
786e6242e1 Make bdl beat divisor nullable 2018-03-20 14:01:06 +09:00
smoogipoo
50192b21e3 Give DrawableBeatDivisor a ctor 2018-03-20 13:57:25 +09:00
Dean Herbert
553fd3b789 Give DefaultSkin an empty Configuration 2018-03-19 21:00:27 +09:00
smoogipoo
fa5fd46f85 Clean up + rename testcase 2018-03-19 20:42:42 +09:00
smoogipoo
b1d09500f2 Integrate beat snap divisor into editor seeking 2018-03-19 20:42:06 +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
smoogipoo
c5eab7a227 Actually rename to DrawableBeatDivisor... 2018-03-19 20:34:24 +09:00
smoogipoo
5ecbc5612c Integrate with dependency injection 2018-03-19 20:33:58 +09:00
Dean Herbert
b71c123214 Allow import of skins which don't have ini files 2018-03-19 20:26:16 +09:00
smoogipoo
46f10b392d Fix merge errors 2018-03-19 20:23:31 +09:00