Merge branch 'master' into centralise-judgement-display

This commit is contained in:
Dean Herbert
2018-07-20 17:29:15 +09:00
committed by GitHub
14 changed files with 56 additions and 72 deletions

View File

@ -89,6 +89,14 @@ namespace osu.Game.Rulesets.UI
Ruleset = ruleset;
playfield = new Lazy<Playfield>(CreatePlayfield);
IsPaused.ValueChanged += paused =>
{
if (HasReplayLoaded)
return;
KeyBindingInputManager.UseParentInput = !paused;
};
Cursor = CreateCursor();
}
@ -120,6 +128,11 @@ namespace osu.Game.Rulesets.UI
public Replay Replay { get; private set; }
/// <summary>
/// Whether the game is paused. Used to block user input.
/// </summary>
public readonly BindableBool IsPaused = new BindableBool();
/// <summary>
/// Sets a replay to be used, overriding local input.
/// </summary>