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

Merge branch 'master' into better-drawablehitobject-lifetimes

Browse Source
This commit is contained in:
Dean Herbert 2017-06-16 21:57:41 +09:00 committed by GitHub
commit 8c0850d679
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit e256557defe595032cbc3a9896797fa41d6ee8b6
Subproject commit 3dd751659b5f8e3267146db1557ec43d77456b8e

1
osu.Game/Graphics/UserInterface/SearchTextBox.cs
View File

@ -45,6 +45,7 @@ namespace osu.Game.Graphics.UserInterface
case Key.Up:
case Key.Down:
return false;
case Key.KeypadEnter:
case Key.Enter:
if (!AllowCommit) return false;
break;

2
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Dialog
{
if (args.Repeat) return false;
if (args.Key == Key.Enter)
if (args.Key == Key.Enter || args.Key == Key.KeypadEnter)
{
Buttons.OfType<PopupDialogOkButton>().FirstOrDefault()?.TriggerOnClick();
return true;

1
osu.Game/Screens/Select/SongSelect.cs
View File

@ -371,6 +371,7 @@ namespace osu.Game.Screens.Select
switch (args.Key)
{
case Key.KeypadEnter:
case Key.Enter:
raiseSelect();
return true;