sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into quickEscape

Browse Source
This commit is contained in:
Dean Herbert
2019-06-24 18:14:48 +09:00
parent 07183c0069 303fb508af
commit d70248338d
1810 changed files with 69217 additions and 28867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using System.ComponentModel;
@ -43,6 +43,7 @@ namespace osu.Game.Input.Bindings
new KeyBinding(InputKey.Space, GlobalAction.Select),
new KeyBinding(InputKey.Enter, GlobalAction.Select),
new KeyBinding(InputKey.KeypadEnter, GlobalAction.Select),
};
public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@ -62,31 +63,41 @@ namespace osu.Game.Input.Bindings
{
[Description("Toggle chat overlay")]
ToggleChat,
[Description("Toggle social overlay")]
ToggleSocial,
[Description("Reset input settings")]
ResetInputSettings,
[Description("Toggle toolbar")]
ToggleToolbar,
[Description("Toggle settings")]
ToggleSettings,
[Description("Toggle osu!direct")]
ToggleDirect,
[Description("Increase Volume")]
[Description("Increase volume")]
IncreaseVolume,
[Description("Decrease Volume")]
[Description("Decrease volume")]
DecreaseVolume,
[Description("Toggle mute")]
ToggleMute,
// In-Game Keybindings
[Description("Skip Cutscene")]
[Description("Skip cutscene")]
SkipCutscene,
[Description("Quick Retry (Hold)")]
[Description("Quick retry (hold)")]
QuickRetry,
[Description("Take screenshot")]
TakeScreenshot,
[Description("Toggle gameplay mouse buttons")]
ToggleGameplayMouseButtons,