sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-14 01:57:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into glow-piece

Browse Source
This commit is contained in:
Dan Balasescu 2020-01-06 15:52:09 +09:00 committed by GitHub
commit bb7de0114f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ namespace osu.Game.Input.Bindings
new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.R }, GlobalAction.ResetInputSettings), new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.R }, GlobalAction.ResetInputSettings),
new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar), new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar),
new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings), new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleDirect),
new KeyBinding(InputKey.Escape, GlobalAction.Back), new KeyBinding(InputKey.Escape, GlobalAction.Back),
new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back), new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),

2
osu.Game/Overlays/AccountCreation/ScreenEntry.cs
View File

@ -196,7 +196,7 @@ namespace osu.Game.Overlays.AccountCreation
return; return;
} }
api.Login(emailTextBox.Text, passwordTextBox.Text); api.Login(usernameTextBox.Text, passwordTextBox.Text);
}); });
}); });
} }