Merge branch 'master' into intro-v2

This commit is contained in:
Dean Herbert
2017-11-09 17:48:42 +09:00
committed by GitHub
9 changed files with 30 additions and 29 deletions

View File

@ -106,9 +106,9 @@ namespace osu.Game.Screens.Menu
Beatmap.ValueChanged += beatmap_ValueChanged;
}
protected override void OnArrivedLogo(OsuLogo logo, bool resuming)
protected override void LogoArriving(OsuLogo logo, bool resuming)
{
base.OnArrivedLogo(logo, resuming);
base.LogoArriving(logo, resuming);
buttons.SetOsuLogo(logo);
@ -122,7 +122,7 @@ namespace osu.Game.Screens.Menu
buttons.State = MenuState.TopLevel;
}
protected override void OnSuspendingLogo(OsuLogo logo)
protected override void LogoSuspending(OsuLogo logo)
{
logo.FadeOut(300, Easing.InSine)
.ScaleTo(0.2f, 300, Easing.InSine)