Merge branch 'master' into return_to_large_logo_after_idle

This commit is contained in:
UselessToucan
2018-09-25 19:48:38 +03:00
committed by GitHub
66 changed files with 1153 additions and 294 deletions

View File

@ -115,7 +115,7 @@ namespace osu.Game.Screens.Menu
case GlobalAction.Back:
return goBack();
case GlobalAction.Select:
logo?.TriggerOnClick();
logo?.Click();
return true;
default:
return false;
@ -133,7 +133,7 @@ namespace osu.Game.Screens.Menu
sampleBack?.Play();
return true;
case ButtonSystemState.Play:
backButton.TriggerOnClick();
backButton.Click();
return true;
default:
return false;
@ -150,10 +150,10 @@ namespace osu.Game.Screens.Menu
State = ButtonSystemState.TopLevel;
return true;
case ButtonSystemState.TopLevel:
buttonsTopLevel.First().TriggerOnClick();
buttonsTopLevel.First().Click();
return false;
case ButtonSystemState.Play:
buttonsPlay.First().TriggerOnClick();
buttonsPlay.First().Click();
return false;
}
}