h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-19 09:07:18 +08:00
Code Issues Releases Wiki Activity

Merge pull request #643 from peppy/general-fixes

Browse Source 
Updates in-line with framework.
This commit is contained in:
Dean Herbert 2017-04-18 16:34:34 +09:00 committed by GitHub
commit 3659ee891c
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 979fb1ffdfaa08c39ff4f0cdda42e5b313d70534
Subproject commit 21a97586f7fa8d9aa65b4131824151d88a70b520

2
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Toolbar
protected override bool HideOnEscape => false;
protected override bool BlockPassThroughInput => false;
protected override bool BlockPassThroughMouse => false;
private const double transition_time = 500;

2
osu.Game/Screens/Play/MenuOverlay.cs
View File

@ -25,6 +25,8 @@ namespace osu.Game.Screens.Play
protected override bool HideOnEscape => false;
protected override bool BlockPassThroughKeyboard => true;
public Action OnRetry;
public Action OnQuit;

2
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.Screens.Select
protected override bool HideOnEscape => false;
protected override bool BlockPassThroughInput => false;
protected override bool BlockPassThroughMouse => false;
protected override void PopIn()
{