Merge branch 'master' into return_to_large_logo_after_idle

This commit is contained in:
Dean Herbert
2018-10-09 18:02:36 +09:00
committed by GitHub
181 changed files with 1194 additions and 1051 deletions

View File

@ -164,8 +164,8 @@ namespace osu.Game.Screens.Menu
private ButtonSystemState state = ButtonSystemState.Initial;
public override bool HandleKeyboardInput => state != ButtonSystemState.Exit;
public override bool HandleMouseInput => state != ButtonSystemState.Exit;
public override bool HandleNonPositionalInput => state != ButtonSystemState.Exit;
public override bool HandlePositionalInput => state != ButtonSystemState.Exit;
public ButtonSystemState State
{