|
|
42bc6b6b2e
|
Merge branch 'master' into updateable-beatmap-set-cover
|
2018-05-31 17:33:31 +09:00 |
|
|
|
0f6c623ebb
|
Tidy up some unnecessary lines
|
2018-05-31 12:44:59 +09:00 |
|
|
|
205aa1a3cd
|
Fetch colour from OsuColour palette
|
2018-05-31 12:44:11 +09:00 |
|
|
|
319faf12f7
|
Fix incorrect naming of label
|
2018-05-31 12:39:56 +09:00 |
|
|
|
2f21b9c4ea
|
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
|
2018-05-31 12:36:37 +09:00 |
|
|
|
bdfb5752cd
|
Update existing drawables to use UpdateableBeatmapSetCover.
|
2018-05-28 19:31:20 -03:00 |
|
|
|
2b3a630270
|
add OverlayActivation enum
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
|
2018-05-28 13:43:47 +02:00 |
|
|
|
a3470f9ec3
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
|
2018-05-28 18:01:15 +09:00 |
|
|
|
bcdbd97da9
|
Merge branch 'master' into fix-playlist-pause
|
2018-05-27 11:00:50 +09:00 |
|
|
|
1cb7d50407
|
Add and use default size (smaller than before)
|
2018-05-25 18:51:57 +09:00 |
|
|
|
1b5bb79fe9
|
Merge remote-tracking branch 'upstream/master' into jorolf-open-external
|
2018-05-25 18:50:30 +09:00 |
|
|
|
568d4882c6
|
Remove unnecessary null coalesce
|
2018-05-25 11:00:56 +09:00 |
|
|
|
fb78854485
|
Fix audio playback getting paused if playlist changes beatmap
|
2018-05-23 19:41:13 +09:00 |
|
|
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
|
|
f894d73501
|
Fix possible MusicController nullref
|
2018-05-23 14:36:09 +09:00 |
|
|
|
b324337fa1
|
Add icon next to beatmap title/username to open in browser
|
2018-05-22 15:29:52 +02:00 |
|
|
|
a7bdaf75b0
|
Ensure badges are ordered correctly
|
2018-05-22 13:05:15 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
