From a7dc8a892b66eeb29f3dd9a7fe50b7a5f028fbf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 21 Jul 2017 17:24:09 +0200 Subject: [PATCH] Update framework --- osu-framework | 2 +- .../Objects/Drawables/DrawableOsuHitObject.cs | 2 +- osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs | 2 +- osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs | 2 +- osu.Game/Graphics/UserInterface/RollingCounter.cs | 2 +- osu.Game/Overlays/MedalOverlay.cs | 2 +- osu.Game/Overlays/Music/PlaylistItem.cs | 2 +- osu.Game/Overlays/OnScreenDisplay.cs | 2 +- osu.Game/Overlays/Profile/ProfileHeader.cs | 4 ++-- osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 2 +- osu.Game/Screens/Menu/ButtonSystem.cs | 2 +- osu.Game/Screens/Play/HUD/ComboCounter.cs | 2 +- osu.Game/Screens/Play/HUD/ModDisplay.cs | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/osu-framework b/osu-framework index 8204403880..d09246eeb0 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 82044038805e640ae4602be2fe4772bf09d23e94 +Subproject commit d09246eeb0e7e30bc31cc017af3847ee09b4df08 diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs index e09b6bd997..ca1b44e1c7 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs @@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables protected sealed override void UpdateState(ArmedState state) { - Flush(); + FinishTransforms(); using (BeginAbsoluteSequence(HitObject.StartTime - TIME_PREEMPT, true)) { diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs index 68bf1cbcdb..4c5aa36640 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs @@ -127,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces if (Complete && updateCompleteTick()) { - background.Flush(false, nameof(Alpha)); + background.FinishTransforms(false, nameof(Alpha)); background .FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo) .Then() diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs index b9d67d8d6a..1d614b4adb 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs @@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables protected override void UpdateState(ArmedState state) { var circlePiece = MainPiece as CirclePiece; - circlePiece?.FlashBox.Flush(); + circlePiece?.FlashBox.FinishTransforms(); using (BeginDelayedSequence(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true)) { diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index bc7b49ab6a..1ca25491e9 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -127,7 +127,7 @@ namespace osu.Game.Graphics.UserInterface /// public virtual void StopRolling() { - Flush(false, nameof(DisplayedCount)); + FinishTransforms(false, nameof(DisplayedCount)); DisplayedCount = Current; } diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs index c3825e32b8..a8974866a7 100644 --- a/osu.Game/Overlays/MedalOverlay.cs +++ b/osu.Game/Overlays/MedalOverlay.cs @@ -247,7 +247,7 @@ namespace osu.Game.Overlays { // if we haven't yet, play out the animation fully drawableMedal.State = DisplayState.Full; - Flush(true); + FinishTransforms(true); return; } diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs index 2b658e0c54..128dddbce5 100644 --- a/osu.Game/Overlays/Music/PlaylistItem.cs +++ b/osu.Game/Overlays/Music/PlaylistItem.cs @@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Music if (value == selected) return; selected = value; - Flush(true); + FinishTransforms(true); foreach (SpriteText s in titleSprites) s.FadeColour(Selected ? hoverColour : Color4.White, fade_duration); } diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs index e6a55800ef..65bef22295 100644 --- a/osu.Game/Overlays/OnScreenDisplay.cs +++ b/osu.Game/Overlays/OnScreenDisplay.cs @@ -260,7 +260,7 @@ namespace osu.Game.Overlays }; updateGlow(); - Flush(true); + FinishTransforms(true); } } } diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs index 21bfd5afd6..aa57816701 100644 --- a/osu.Game/Overlays/Profile/ProfileHeader.cs +++ b/osu.Game/Overlays/Profile/ProfileHeader.cs @@ -517,13 +517,13 @@ namespace osu.Game.Overlays.Profile protected override bool OnHover(InputState state) { - FadeColour(hoverColour, 500, EasingTypes.OutQuint); + this.FadeColour(hoverColour, 500, EasingTypes.OutQuint); return base.OnHover(state); } protected override void OnHoverLost(InputState state) { - FadeColour(Color4.White, 500, EasingTypes.OutQuint); + this.FadeColour(Color4.White, 500, EasingTypes.OutQuint); base.OnHoverLost(state); } diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs index 7e2c0305a9..ac5ea04ecc 100644 --- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs @@ -40,7 +40,7 @@ namespace osu.Game.Screens.Backgrounds if (background != null) { newDepth = background.Depth + 1; - background.Flush(); + background.FinishTransforms(); background.FadeOut(250); background.Expire(); } diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs index cd0d51b15e..65ba555630 100644 --- a/osu.Game/Screens/Menu/ButtonSystem.cs +++ b/osu.Game/Screens/Menu/ButtonSystem.cs @@ -216,7 +216,7 @@ namespace osu.Game.Screens.Menu bool fromInitial = lastState == MenuState.Initial; if (state == MenuState.TopLevel) - buttonArea.Flush(true); + buttonArea.FinishTransforms(true); using (buttonArea.BeginDelayedSequence(fromInitial ? 150 : 0, true)) { diff --git a/osu.Game/Screens/Play/HUD/ComboCounter.cs b/osu.Game/Screens/Play/HUD/ComboCounter.cs index 1bfc7599f7..f37b8fc434 100644 --- a/osu.Game/Screens/Play/HUD/ComboCounter.cs +++ b/osu.Game/Screens/Play/HUD/ComboCounter.cs @@ -169,7 +169,7 @@ namespace osu.Game.Screens.Play.HUD if (!rolling) { - Flush(false, nameof(DisplayedCount)); + FinishTransforms(false, nameof(DisplayedCount)); IsRolling = false; DisplayedCount = prev; diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs index f8235e5bcf..e72310f1fe 100644 --- a/osu.Game/Screens/Play/HUD/ModDisplay.cs +++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs @@ -80,7 +80,7 @@ namespace osu.Game.Screens.Play.HUD else unrankedText.Hide(); - iconsContainer.Flush(); + iconsContainer.FinishTransforms(); iconsContainer.FadeInFromZero(fade_duration, EasingTypes.OutQuint); expand(); using (iconsContainer.BeginDelayedSequence(1200))