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

Resolve merge conflict

Browse Source
This commit is contained in:
Roman Kapustin
2018-05-18 00:25:47 +03:00
parent f2f2fb8c73 f755ea534d
commit 81d7e8a393
162 changed files with 2241 additions and 1104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ namespace osu.Game.Input.Bindings
{
new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
new KeyBinding(InputKey.F9, GlobalAction.ToggleSocial),
new KeyBinding(InputKey.F10, GlobalAction.ToggleGameplayMouseButtons),
new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.R }, GlobalAction.ResetInputSettings),
@ -80,6 +81,8 @@ namespace osu.Game.Input.Bindings
[Description("Take screenshot")]
TakeScreenshot,
[Description("Toggle gameplay mouse buttons")]
ToggleGameplayMouseButtons,
[Description("Go back")]
Back