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

Merge branch 'master' into hide-exit-button

Browse Source 
# Conflicts:
#	osu.Game/Screens/Menu/MainMenu.cs
This commit is contained in:
Shane Woolcock
2019-02-25 21:48:42 +09:00
parent 2bd5bb3f69 d6cfce8bce
commit bebb635ca1
16 changed files with 540 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -107,7 +107,7 @@ namespace osu.Game.Screens.Menu
public void LoadToSolo() => Schedule(onSolo);
private void onSolo() =>this.Push(consumeSongSelect());
private void onSolo() => this.Push(consumeSongSelect());
private Screen consumeSongSelect()
{
@ -191,7 +191,7 @@ namespace osu.Game.Screens.Menu
{
base.OnResuming(last);
((BackgroundScreenDefault)Background).Next();
(Background as BackgroundScreenDefault)?.Next();
//we may have consumed our preloaded instance, so let's make another.
preloadSongSelect();
@ -208,7 +208,7 @@ namespace osu.Game.Screens.Menu
{
if (!e.Repeat && e.ControlPressed && e.ShiftPressed && e.Key == Key.D)
{
this.Push(new Drawings());
this.Push(new Drawings());
return true;
}