|
|
5f8eb6d823
|
Fix class name
|
2018-05-22 16:04:36 +09:00 |
|
|
|
ebda287e81
|
Share code with HoldToConfirm implementations elsewhere
|
2018-05-22 01:44:06 +09:00 |
|
|
|
9e17eb2342
|
Reword settings text to be ruleset agnostic
|
2018-05-21 16:03:08 +09:00 |
|
|
|
cea935ea40
|
Merge branch 'master' into osu-hd-setting
|
2018-05-21 15:21:09 +09:00 |
|
|
|
c75ef7704a
|
Merge remote-tracking branch 'Joehuu/master' into ocboogie-ruleset-keybindings
|
2018-05-21 14:49:34 +09:00 |
|
|
|
42519e3723
|
Rewrite code for clarity
This also uses the AvailableRulesets list rather than private IDs
|
2018-05-21 14:49:26 +09:00 |
|
|
|
5e0bbe7d0a
|
Merge branch 'master' into master
|
2018-05-18 10:19:16 +02:00 |
|
|
|
d75fe4009a
|
Add back action support to settings back button
|
2018-05-18 13:40:35 +09:00 |
|
|
|
6a1abf4084
|
Merge branch 'master' into osu-hd-setting
|
2018-05-17 19:39:17 +02:00 |
|
|
|
fc192c8998
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons
|
2018-05-15 19:23:51 +09:00 |
|
|
|
5fee471307
|
Merge branch 'master' into beatmap-delete-fix
|
2018-05-15 14:49:09 +09:00 |
|
|
|
4055a6fc0c
|
Merge branch 'master' into ruleset-keybindings
|
2018-05-14 15:39:10 -07:00 |
|
|
|
7507d18a93
|
Merge branch 'master' into mapping-del
|
2018-05-14 20:56:12 +09:00 |
|
|
|
addb864d10
|
Allow help text to wrap
|
2018-05-14 19:56:03 +09:00 |
|
|
|
17861c2a16
|
Display "no key bound" when no shortcut
|
2018-05-14 19:20:53 +09:00 |
|
|
|
f14948c022
|
Merge branch 'master' into exit-hold-confirmation
|
2018-05-14 18:13:40 +09:00 |
|
|
|
027f6c3fa4
|
Fix instant movement not doing anything
|
2018-05-14 17:47:38 +09:00 |
|
|
|
4ceae6ba1f
|
Inline method
|
2018-05-14 17:45:11 +09:00 |
|
|
|
6eb7590ab0
|
Make MusicController handle all movement to previous/next tracks
|
2018-05-14 17:42:01 +09:00 |
|
|
|
bfcfeec9b9
|
Merge branch 'master' into ruleset-keybindings
|
2018-05-14 01:28:57 -07:00 |
|
|
|
5c41e7c39c
|
Merge pull request #2527 from peppy/fix-mousewheel-startup-crash
Fix crash on startup when adjusting volume before volume control loaded
|
2018-05-14 14:23:08 +09:00 |
|
|
|
ebd9d1a037
|
Resolve linting issues in ToolbarModeSelector.cs
|
2018-05-13 19:43:26 -07:00 |
|
|
|
327c7432be
|
Use OnKeyDown instead of a IKeyBindingHandler
|
2018-05-13 19:33:52 -07:00 |
|
|
|
ede4d6dd11
|
Merge branch 'master' into mapping-del
|
2018-05-14 10:58:58 +09:00 |
|
|
|
26f06a9ae1
|
Resolve linting issues in ToolbarModeSelector.cs
|
2018-05-12 17:25:15 -07:00 |
|
|
|
76800421c4
|
Merge branch 'master' into ruleset-keybindings
|
2018-05-12 16:40:27 -07:00 |
|
|
|
8a5bd27c20
|
Add global key bindings for changing current ruleset
|
2018-05-12 16:30:29 -07:00 |
|
|
|
861a8cf9a7
|
Fixes capitalization of enableSeek
|
2018-05-12 23:10:03 +02:00 |
|
|
|
a162453e9b
|
Merge remote-tracking branch 'upstream/master' into joystick
# Conflicts:
# osu-framework
# osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
|
2018-05-13 00:11:17 +09:00 |
|
|
|
a7e7c3a74a
|
Enables/Disables seek and Play/Resume on call to beatmapDisabledChanged
|
2018-05-12 11:55:52 +02:00 |
|
|
|
a14531b9a4
|
Fix crash on startup when adjusting volume before volume control loaded
|
2018-05-11 22:57:36 +09:00 |
|
|
|
aa5d5ab2a8
|
Fix readonly field
|
2018-05-11 21:48:35 +09:00 |
|
|
|
f1fd2ae7be
|
Merge branch 'master' into modmouseup
|
2018-05-11 21:41:14 +09:00 |
|
|
|
4fc887b25f
|
Add a pressing effect to make mouse up response feel good
|
2018-05-11 21:40:36 +09:00 |
|
|
|
c55d47ff10
|
Converts OnSeek assignment to method group
|
2018-05-11 09:56:36 +02:00 |
|
|
|
a877855fc6
|
Changes conditionSeek return type to void
|
2018-05-11 09:39:55 +02:00 |
|
|
|
d54a7295f6
|
Adds DisableSeek property to MusicController
|
2018-05-10 13:20:04 +02:00 |
|
|
|
4b3c2466a4
|
Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons
|
2018-05-10 19:16:52 +09:00 |
|
|
|
df604c40cc
|
Keep shortcut padding even when there is no shortut
|
2018-05-10 18:49:33 +09:00 |
|
|
|
c03ab9014f
|
Improve TestCaseOnScreenDisplay
Now doesn't rely on framesync.
|
2018-05-10 18:48:48 +09:00 |
|
|
|
5b99d8df62
|
Fixes private method name capitalization
|
2018-05-10 11:29:19 +02:00 |
|
|
|
fadb1a5e0b
|
Add tests and expand functionality to ensure single fire
|
2018-05-10 17:31:16 +09:00 |
|
|
|
bb6478cdc3
|
Adds a check to disable music controller's seek
|
2018-05-10 10:15:47 +02:00 |
|
|
|
5df9f126d1
|
Implement a hold-to-confirm screen when exiting game using escape key
|
2018-05-10 17:07:19 +09:00 |
|
|
|
853680ca51
|
Merge remote-tracking branch 'origin/master' into disable-mouse-buttons
|
2018-05-10 14:31:52 +09:00 |
|
|
|
2e9c91c32f
|
Merge branch 'master' into use-bindable-transforms
|
2018-05-10 11:45:29 +08:00 |
|
|
|
95dd2125ee
|
Load PlayButton.Preview asynchronously
|
2018-05-09 16:22:52 +03:00 |
|
|
|
c492f62eda
|
Use PreviewTrackManager in the PlayButton
|
2018-05-09 14:52:46 +03:00 |
|
|
|
ba5861b527
|
Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
# osu.Game/Online/API/Requests/GetMessagesRequest.cs
# osu.Game/Overlays/Chat/ChatTabControl.cs
|
2018-05-06 19:45:33 +02:00 |
|
|
|
33e2b91ccc
|
Decouple FilterControl.Ruleset from the game-wide ruleset bindable
|
2018-05-03 22:59:49 +03:00 |
|
