From 57b9ed0f547fdcccd23aa66b5fdbe2f1e0aebd47 Mon Sep 17 00:00:00 2001 From: MrTheMake Date: Sat, 20 May 2017 18:56:50 +0200 Subject: [PATCH 1/3] Do not pause a running replay if the window is not focused. --- osu.Game/Screens/Play/Player.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index f9307595d2..3efc85d743 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -150,7 +150,7 @@ namespace osu.Game.Screens.Play FramedClock = offsetClock, OnRetry = Restart, OnQuit = Exit, - CheckCanPause = () => ValidForResume && !HasFailed, + CheckCanPause = () => ValidForResume && !HasFailed && !HitRenderer.HasReplayLoaded, Retries = RestartCount, OnPause = () => { hudOverlay.KeyCounter.IsCounting = pauseContainer.IsPaused; From 82cf94bbff70f42a10d35d06c1b7ef07aad7a89d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 22 May 2017 09:50:45 +0900 Subject: [PATCH 2/3] Move spinner colours to local definition for now We don't want to start polluting the OsuColours namespace with non-UI colours. --- osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 7 +++++-- osu.Game/Graphics/OsuColour.cs | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs index cc5086f442..3722d13ffc 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs @@ -30,6 +30,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables private readonly TextAwesome symbol; + private readonly Color4 baseColour = OsuColour.FromHex(@"002c3c"); + private readonly Color4 fillColour = OsuColour.FromHex(@"005b7c"); + private Color4 normalColour; private Color4 completeColour; @@ -154,13 +157,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables [BackgroundDependencyLoader] private void load(OsuColour colours) { - normalColour = colours.SpinnerBase; + normalColour = baseColour; background.AccentColour = normalColour; completeColour = colours.YellowLight.Opacity(0.75f); - disc.AccentColour = colours.SpinnerFill; + disc.AccentColour = fillColour; circle.Colour = colours.BlueDark; glow.Colour = colours.BlueDark; } diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs index 697f8f4629..3d83668d07 100644 --- a/osu.Game/Graphics/OsuColour.cs +++ b/osu.Game/Graphics/OsuColour.cs @@ -87,8 +87,5 @@ namespace osu.Game.Graphics public readonly Color4 RedDarker = FromHex(@"870000"); public readonly Color4 ChatBlue = FromHex(@"17292e"); - - public readonly Color4 SpinnerBase = FromHex(@"002c3c"); - public readonly Color4 SpinnerFill = FromHex(@"005b7c"); } } From 4ce3a7806690b7672080253bc13caaf7e9fe3813 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Mon, 22 May 2017 10:18:42 +0900 Subject: [PATCH 3/3] Update Pattern.cs --- osu.Game.Rulesets.Mania/Beatmaps/Patterns/Pattern.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Pattern.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Pattern.cs index 331b92f8a4..15d31406e9 100644 --- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Pattern.cs +++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Pattern.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; -using osu.Framework.Extensions.IEnumerableExtensions; using osu.Game.Rulesets.Mania.Objects; namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns