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

Merge branch 'master' into stateful-drawables

Browse Source 
Conflicts:
	osu.Game/GameModes/Menu/Intro.cs
This commit is contained in:
Dean Herbert
2016-10-09 22:08:32 +09:00
parent 926c46dbd4 de24c86c81
commit 25de055802
9 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/GameModes/Menu/MainMenu.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game.GameModes.Menu
OnSolo = delegate { Push(new PlaySongSelect()); },
OnMulti = delegate { Push(new Lobby()); },
OnTest = delegate { Push(new TestBrowser()); },
OnExit = delegate { Game.Scheduler.AddDelayed(Exit, ButtonSystem.EXIT_DELAY); },
OnExit = delegate { Scheduler.AddDelayed(Exit, ButtonSystem.EXIT_DELAY); },
OnSettings = delegate {
osu.Options.PoppedOut = !osu.Options.PoppedOut;
},