1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 22:02:54 +08:00
Commit Graph

7068 Commits

Author SHA1 Message Date
Dean Herbert
189988236b Move PlayerInputManager logic inside RulesetInputManager 2017-08-24 15:23:17 +09:00
naoey
6291bd5ced Handle null current channel in setter, update framework. 2017-08-24 10:40:42 +05:30
naoey
3f403ba524 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-08-24 10:06:29 +05:30
naoey
2cace0e1ab Don't use virtual methods in ctor, always create closeButton. 2017-08-24 09:48:53 +05:30
Dean Herbert
251b325ded Merge pull request #1180 from smoogipooo/mania_reversing
Make ScrollingPlayfield.Reversed protected and make ManiaPlayfield invertible
2017-08-23 22:11:32 +09:00
Dean Herbert
7c3ef81d9c Merge branch 'master' into mania_reversing 2017-08-23 22:02:25 +09:00
Dan Balasescu
babe32be11 Merge pull request #1179 from peppy/reset-to-defaults
Add button to reset default bindings per section
2017-08-23 21:01:28 +09:00
smoogipooo
115e5c95af Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'. 2017-08-23 20:50:03 +09:00
Dean Herbert
c99ed6fd44 Add reset button
Also fixes a regression causing multiple rows to be displayed for a single action
2017-08-23 19:26:49 +09:00
Dean Herbert
e9dde822a1 Expose triangles in OsuButton for further customisation 2017-08-23 19:25:40 +09:00
Dean Herbert
17900fea62 Merge pull request #1173 from peppy/fix-incorrect-notification-count
Fix notification count including fading (already closed) notifications
2017-08-23 17:29:58 +09:00
Dan Balasescu
a18507b3b4 Merge branch 'master' into fix-incorrect-notification-count 2017-08-23 17:22:39 +09:00
Dean Herbert
6b6306218e Merge pull request #1177 from smoogipooo/hardrock-flipping
Hardrock flipping
2017-08-23 17:09:15 +09:00
Dean Herbert
1f04995a73 Merge branch 'master' into hardrock-flipping 2017-08-23 17:00:41 +09:00
Dean Herbert
028793e948 Merge pull request #1178 from peppy/headless-ftl
Make OsuTestCases use new non-realtime option
2017-08-23 17:00:08 +09:00
smoogipooo
56292bd7f0 Use constant definition. 2017-08-23 16:54:06 +09:00
Dean Herbert
022063f157 Update framework 2017-08-23 16:51:09 +09:00
Dean Herbert
1972b78cb1 Make OsuTestCases use new non-realtime option 2017-08-23 16:50:55 +09:00
smoogipooo
8ddc13e394 Fix replays not loading. 2017-08-23 16:48:13 +09:00
Dean Herbert
88106ab8e9 Merge pull request #1174 from smoogipooo/mania-action-support
Add KeyBinding support to osu!mania
2017-08-23 16:39:53 +09:00
smoogipooo
42e6865493 Flip hit objects. 2017-08-23 16:35:30 +09:00
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