1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-02 01:17:24 +08:00
Commit Graph

6819 Commits

Author SHA1 Message Date
Dean Herbert
efdd5eb152 Fix global key bindings being fetched with a non-null variant 2017-08-23 16:10:31 +09:00
Dean Herbert
bdd0a51c6e Fix left keys setting defaults in incorrect order 2017-08-23 16:10:10 +09:00
smoogipooo
4395ea3850 Add applied suggestions. 2017-08-23 15:37:22 +09:00
smoogipooo
7639e096d8 No longer flip legacy replay mouse positions. 2017-08-23 15:30:17 +09:00
smoogipooo
b4236d93f5 Merge remote-tracking branch 'origin/master' into mania-action-support 2017-08-23 15:24:13 +09:00
smoogipooo
0c60563fda Update framework. 2017-08-23 15:24:08 +09:00
Dan Balasescu
cc10eba178 Merge pull request #1176 from peppy/fix-unit-tests
Fix unit tests causing regular crashes
2017-08-23 15:22:06 +09:00
Dean Herbert
751bd3432e Update framework 2017-08-23 14:48:58 +09:00
Dean Herbert
e777ccc339 Avoid threading conflicts when resetting the database in unit tests 2017-08-23 14:42:46 +09:00
smoogipooo
68e7cf854f Add variant names. 2017-08-23 14:19:14 +09:00
smoogipooo
d8dfcc614a Make mania work with key bindings 2017-08-23 13:42:16 +09:00
smoogipooo
84dd1283de Fix nullref. 2017-08-23 13:39:51 +09:00
smoogipooo
0e41fc8842 Add mania bindings. 2017-08-23 12:49:50 +09:00
smoogipooo
c1860f2ce2 Make KeyBindingOverlay support variants as settings sub sections. 2017-08-23 12:49:30 +09:00
smoogipooo
38a4c84163 Load SettingsSubsection in load()
Fixes header not being displayed with variant bindings. This follows what SettingsSection does.
2017-08-23 12:48:53 +09:00
smoogipooo
be96fb32b3 Make RulesetContainer load KeyBindingInputManager in load() 2017-08-23 12:47:47 +09:00
Dean Herbert
b2db550cb4 Fix notification count including fading (already closed) notifications 2017-08-23 12:47:20 +09:00
smoogipooo
a6266850d6 Make KeyBindingRow take a non-action enum. 2017-08-23 12:46:28 +09:00
smoogipooo
fd3239ad15 Fix KeyBindingStore not getting correct defaults for variants. 2017-08-23 12:36:53 +09:00
Dan Balasescu
a2407948ed Merge pull request #1168 from peppy/update-changelog-notification
Show a notification after a successful update
2017-08-23 10:19:16 +09:00
Dean Herbert
630d67405f Merge branch 'master' into update-changelog-notification 2017-08-23 00:12:59 +09:00
Dean Herbert
532471c00e Merge pull request #1172 from smoogipooo/fix_taiko_sizing
Fix taiko hit objects being able to be scaled down depending on the timing section
2017-08-22 23:56:41 +09:00
Dean Herbert
dbde27ceef Update framework 2017-08-22 23:43:40 +09:00
Dean Herbert
ef2d9ffede Fix redundant initialiser 2017-08-22 23:43:10 +09:00
Dean Herbert
6f8e85c2e1 Merge branch 'master' into fix_taiko_sizing 2017-08-22 23:19:41 +09:00
Dean Herbert
3f475eb619 Merge pull request #1170 from smoogipooo/fix-speed-adjustments
Fix speed adjustments and hit objects within them being ordered incorrectly.
2017-08-22 23:17:40 +09:00
Dean Herbert
83bd430f89 Merge branch 'master' into fix-speed-adjustments 2017-08-22 23:07:42 +09:00
Dean Herbert
354e6c1297 Merge pull request #1171 from peppy/zero-notifications-closes
Allow the notification overlay to close when all notifications are dismissed
2017-08-22 22:56:40 +09:00
Dean Herbert
71af30d222 Remove redundant visibility changes 2017-08-22 22:48:50 +09:00
Dean Herbert
a257c6846e Merge branch 'master' into zero-notifications-closes 2017-08-22 22:45:52 +09:00
Dean Herbert
1ebc3ace58 Merge pull request #1167 from peppy/cursor-rotation-delay
Don't start rotating the cursor until it has travelled a minimum distance
2017-08-22 22:45:35 +09:00
smoogipooo
f8576d44b1 Add some more xmldoc. 2017-08-22 21:08:27 +09:00
smoogipooo
d080a7e970 Determine size of ScrollingContainer a bit better to avoid taiko weirdness 2017-08-22 20:53:19 +09:00
smoogipooo
db27551709 Make hit objects put in ScrollingContainers strictly ordered by start time
This won't change anything as is since all hit objects are given a depth at the moment.
2017-08-22 20:51:20 +09:00
Dan Balasescu
7689c06471 Merge branch 'master' into cursor-rotation-delay 2017-08-22 20:28:28 +09:00
Dean Herbert
bf13618c77 Merge pull request #1159 from smoogipooo/mania-key-conversion
Implement mania key conversion for converted beatmaps
2017-08-22 20:26:32 +09:00
Dean Herbert
9f52ecbb8a Merge branch 'master' into mania-key-conversion 2017-08-22 20:08:39 +09:00
Dan Balasescu
f371ca73f1 Merge branch 'master' into cursor-rotation-delay 2017-08-22 19:54:10 +09:00
Dan Balasescu
a06cd9b419 Merge pull request #1161 from peppy/volume-control-fixes
Update volume control logic to use key bindings
2017-08-22 19:52:39 +09:00
Dean Herbert
480d839d67 Allow the notification overlay to close when all notifications are dismissed 2017-08-22 19:51:42 +09:00
smoogipooo
4c66a20d4e Merge remote-tracking branch 'origin/master' into fix-speed-adjustments 2017-08-22 19:50:48 +09:00
Dean Herbert
9f69aa9082 Show a notification after a successful update
Allows access to the github changelog
2017-08-22 19:41:39 +09:00
Dean Herbert
0ea6c65be6 Fix potentially racey behaviour of versionManager initialisation
Changing the state while the container wasn't necessarily completed loading caused inconsistent behaviour.
2017-08-22 19:34:06 +09:00
Dean Herbert
ab0e3ccc55 Make SimpleNotifications support word wrap 2017-08-22 19:33:18 +09:00
smoogipooo
322dfe0250 Fix ScrollingContainer possibly not getting the correct size to cover hit objects. 2017-08-22 19:17:26 +09:00
Dean Herbert
9e96ee989d Merge branch 'master' into volume-control-fixes 2017-08-22 18:59:02 +09:00
Dean Herbert
2f915fce40 Merge branch 'master' into cursor-rotation-delay 2017-08-22 18:58:57 +09:00
Dan Balasescu
ad16f41e26 Merge pull request #1162 from peppy/nullref-fix
Fix a nullref when reaching the results screen with no user provided
2017-08-22 18:56:06 +09:00
smoogipooo
d64071f3de Fix up + make test case more sane. 2017-08-22 18:55:27 +09:00
smoogipooo
ad63cbf455 Fix default comparator being inverted. 2017-08-22 18:54:41 +09:00