h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:13:00 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into general-fixes

Browse Source
This commit is contained in:
Dean Herbert 2017-01-23 21:39:05 +09:00
commit 373d2a0f35
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit f2eec2adf590d60e91dda77de6f11d757ad6055f
Subproject commit 29c4a3f29ad06a90da14ddafba1884f8265412d8

4
osu.Game/OsuGame.cs
View File

@ -110,11 +110,9 @@ namespace osu.Game
(modeStack = new Intro()).Preload(this, d =>
{
mainContent.Add(d);
modeStack.ModePushed += modeAdded;
modeStack.Exited += modeRemoved;
modeStack.DisplayAsRoot();
mainContent.Add(modeStack);
});
//overlay elements

5
osu.Game/Screens/Menu/Intro.cs
View File

@ -65,9 +65,10 @@ namespace osu.Game.Screens.Menu
bgm.Looping = true;
}
protected override void LoadComplete()
protected override void OnEntering(GameMode last)
{
base.LoadComplete();
base.OnEntering(last);
Scheduler.Add(delegate
{
welcome.Play();