h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-buttons

Browse Source
This commit is contained in:
Andrei Zavatski 2020-07-14 21:18:34 +03:00
commit e64604f335
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Input/Bindings/GlobalActionContainer.cs
View File

@ -57,6 +57,7 @@ namespace osu.Game.Input.Bindings
new KeyBinding(new[] { InputKey.Control, InputKey.Tilde }, GlobalAction.QuickExit),
new KeyBinding(new[] { InputKey.Control, InputKey.Plus }, GlobalAction.IncreaseScrollSpeed),
new KeyBinding(new[] { InputKey.Control, InputKey.Minus }, GlobalAction.DecreaseScrollSpeed),
new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
};
public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
@ -160,6 +161,9 @@ namespace osu.Game.Input.Bindings
Home,
[Description("Toggle notifications")]
ToggleNotifications
ToggleNotifications,
[Description("Pause")]
PauseGameplay,
}
}

2
osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
View File

@ -251,6 +251,7 @@ namespace osu.Game.Screens.Play.HUD
switch (action)
{
case GlobalAction.Back:
case GlobalAction.PauseGameplay: // in the future this behaviour will differ for replays etc.
if (!pendingAnimation)
BeginConfirm();
return true;
@ -264,6 +265,7 @@ namespace osu.Game.Screens.Play.HUD
switch (action)
{
case GlobalAction.Back:
case GlobalAction.PauseGameplay:
AbortConfirm();
break;
}