Merge branch 'master' into player_loader_input_toggles

This commit is contained in:
Dean Herbert
2018-05-25 18:38:12 +09:00
committed by GitHub
20 changed files with 422 additions and 89 deletions

View File

@ -25,8 +25,8 @@ namespace osu.Game.Screens.Play
private BeatmapMetadataDisplay info;
private bool showOverlays = true;
public override bool ShowOverlaysOnEnter => showOverlays;
private bool hideOverlays;
protected override bool HideOverlaysOnEnter => hideOverlays;
private Task loadTask;
@ -36,7 +36,7 @@ namespace osu.Game.Screens.Play
player.RestartRequested = () =>
{
showOverlays = false;
hideOverlays = true;
ValidForResume = true;
};
}