1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 01:07:42 +08:00
Commit Graph

4327 Commits

Author SHA1 Message Date
Jorolf
9b20da94e7 change Query to AllRulesets 2017-08-19 22:07:03 +02:00
smoogipooo
3ea7be1ccf Fix selecting unranked beatmaps in song select crashing the game. Fixes #1134. 2017-08-19 12:28:54 +09:00
Dean Herbert
86d97aa16b Merge branch 'master' into taiko-timingchanges-2 2017-08-18 22:44:36 +09:00
Dean Herbert
c34033c94a Merge branch 'master' into fix-track-not-resetting 2017-08-18 22:31:59 +09:00
Dean Herbert
bc7621607a Merge upstream/master in. 2017-08-18 22:20:45 +09:00
Dean Herbert
d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
Shane Woolcock
4901ac9e35 Add some comments explaining why the Track is being forcefully added to the TrackManager 2017-08-18 18:01:18 +09:30
Dean Herbert
ffc8f763e5 Merge branch 'master' into fix-track-not-resetting 2017-08-18 17:24:22 +09:00
smoogipooo
90885a31ae Round 2 of CI fixes. 2017-08-18 15:09:54 +09:00
smoogipooo
a47b6526a2 Fix CI issues. 2017-08-18 14:40:36 +09:00
Dan Balasescu
68303accef Merge branch 'master' into make-rulesetinfo-iequatable 2017-08-18 14:28:42 +09:00
Dan Balasescu
0f635c77b3 Merge branch 'master' into fix-ruleset-changing 2017-08-18 13:42:29 +09:00
Dan Balasescu
cc6a5824f0 Merge branch 'master' into fix-ruleset-changing 2017-08-18 13:40:52 +09:00
Dan Balasescu
243a6ca774 Update OsuLegacyDecoder.cs 2017-08-18 13:27:16 +09:00
Dan Balasescu
5a9375f336 Merge branch 'master' into fix-duplicate-difficulty-control-points 2017-08-18 13:12:00 +09:00
Dan Balasescu
f5c3af2f20 Merge branch 'master' into fix-nullref 2017-08-18 12:38:20 +09:00
Dean Herbert
02aa38d1c2 Merge branch 'master' into toolbar-button-swap 2017-08-18 11:18:19 +09:00
Dean Herbert
d919d8b0a3 Merge branch 'master' into onscreendisplay-fix 2017-08-18 11:06:12 +09:00
Dean Herbert
e4b832e8a6 Fix a possible nullref when login fails 2017-08-18 10:49:41 +09:00
PoULkY
cc39aad7f8 Fix OsuButton doesn't implement IFilterable 2017-08-18 01:23:44 +07:00
MrTheMake
6118209200 Fix unlit initial state of the OnScreenDisplay 2017-08-17 18:46:16 +02:00
Shane Woolcock
df683d9114 Fix multiple difficulty control points sharing the same time and thus confusing slider velocity calculations 2017-08-17 23:28:26 +09:30
Dean Herbert
f459794665 Update MainSettings.cs 2017-08-17 18:11:15 +09:00
Dean Herbert
58b1e9c954 Remove unused DI retrieval 2017-08-17 17:47:55 +09:00
Dean Herbert
a44ff5a2c2 Fix regression causing global hotkeys to no longer work 2017-08-17 17:47:44 +09:00
Dean Herbert
a19fc28cff Visually improve settings transitions and back button 2017-08-17 17:31:14 +09:00
smoogipooo
cceeb864d5 Fix hitobjects in TestCaseHitObjects not receiving actions. 2017-08-17 12:16:33 +09:00
Dan Balasescu
69a3251f61 Merge branch 'master' into toolbar-button-swap 2017-08-17 10:39:02 +09:00
Thomas Müller
4ef1be3080 More localised key binding hover colour logic 2017-08-17 08:43:45 +09:00
MrTheMake
94d664a626 Swap the order of the social and chat toolbar buttons 2017-08-16 17:00:30 +02:00
Dean Herbert
0c19202b9a Add basic back button 2017-08-16 23:20:18 +09:00
Dean Herbert
09089a3126 Fix potential nullref 2017-08-16 23:20:08 +09:00
Dean Herbert
e64f455ff7 Escape to cancel, again 2017-08-16 23:01:10 +09:00
Dean Herbert
c41ba7b704 Update with latest framework changes 2017-08-16 22:56:32 +09:00
Dean Herbert
71f83dbdfa Add null check for safety 2017-08-16 22:56:32 +09:00
Dean Herbert
5ebec53970 Integrate key binding config with main settings 2017-08-16 22:56:32 +09:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Thomas Müller
16372d9b45 Merge branch 'master' into key-config-settings 2017-08-16 17:48:00 +09:00
Dean Herbert
7e1fc47b76 Fix forgotten rename 2017-08-16 17:43:01 +09:00
Dean Herbert
3df51540e1 Code review fixes 2017-08-16 17:39:57 +09:00
Dean Herbert
54698f2d8f Use IntAction instead of new 2017-08-16 17:27:09 +09:00
Dean Herbert
dc82a88bb8 Improve namespaces of key bindings 2017-08-16 17:24:01 +09:00
Dean Herbert
25a3835c3c Cancel pending sidebar expansion when a button is clicked 2017-08-16 17:06:20 +09:00
Dean Herbert
89987229de Merge remote-tracking branch 'origin/is-alive' into key-config-settings 2017-08-16 15:49:43 +09:00
Dean Herbert
a5007fc64f Fix some remaining usage of local InputManager instances 2017-08-16 13:07:18 +09:00
Dean Herbert
2c7f0629ef Merge remote-tracking branch 'upstream/master' into is-alive 2017-08-16 12:11:32 +09:00
Dean Herbert
c221472d6e Code tidy-ups 2017-08-16 01:19:21 +09:00
Dean Herbert
72eb082f91 Use .Equals 2017-08-16 01:14:37 +09:00
Dean Herbert
9c75df884f Add initial implementation of KeyConfiguration overlay 2017-08-16 00:17:33 +09:00
Dean Herbert
2bd0981738 Improve default key binding logic
Defaults will be added to the database as long as the database has unbalanced counts for any actions.
2017-08-15 23:59:58 +09:00