Merge remote-tracking branch 'upstream/master' into user-status-wiring

This commit is contained in:
Lucas A
2019-05-07 18:27:14 +02:00
224 changed files with 772 additions and 35 deletions

View File

@ -47,8 +47,6 @@ namespace osu.Game.Screens.Play
public bool HasFailed { get; private set; }
public bool PauseOnFocusLost { get; set; } = true;
private Bindable<bool> mouseWheelDisabled;
private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
@ -391,15 +389,6 @@ namespace osu.Game.Screens.Play
// already resuming
&& !IsResuming;
protected override void Update()
{
base.Update();
// eagerly pause when we lose window focus (if we are locally playing).
if (PauseOnFocusLost && !Game.IsActive.Value)
Pause();
}
public void Pause()
{
if (!canPause) return;