diff --git a/osu-framework b/osu-framework index c2a20bd8b3..23f971f90e 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit c2a20bd8b31144c6d196ab6ae0e8858acabbe032 +Subproject commit 23f971f90eef75108932c961738bec93a0627e1c diff --git a/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs b/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs index 4d9a0fe9a2..837545b114 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs @@ -57,7 +57,7 @@ namespace osu.Desktop.VisualTests.Tests if (remaining > 0) { - ApplyDelay(80); + AddDelay(80); Schedule(() => sendBarrage(remaining - 1)); } } diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs index 46ad7acb52..434689641f 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs @@ -84,7 +84,7 @@ namespace osu.Desktop.VisualTests.Tests break; case 5: addSwell(1000); - playfieldContainer.ApplyDelay(scroll_time - 100); + playfieldContainer.AddDelay(scroll_time - 100); break; } diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs index 3a32d9765e..be901a5748 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs @@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections fp.MoveTo(pointEndPosition, DrawableOsuHitObject.TIME_FADEIN, EasingTypes.Out); - fp.ApplyDelay(fadeOutTime - fadeInTime); + fp.AddDelay(fadeOutTime - fadeInTime); fp.FadeOut(DrawableOsuHitObject.TIME_FADEIN); } diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs index 63721dee4f..0d2b200c76 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs @@ -158,7 +158,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables { ball.FadeIn(); - ApplyDelay(slider.Duration, true); + AddDelay(slider.Duration, true); body.FadeOut(160); ball.FadeOut(160); diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs index d0e141db6c..92c7ff6f2a 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs @@ -66,10 +66,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables this.ScaleTo(1.2f, animIn); this.FadeIn(animIn); - ApplyDelay(animIn); + AddDelay(animIn); this.ScaleTo(1, 150, EasingTypes.Out); - ApplyDelay(-animIn); + AddDelay(-animIn); } protected override void UpdateCurrentState(ArmedState state) @@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables switch (state) { case ArmedState.Idle: - ApplyDelay(FadeOutTime - sliderTick.StartTime); + AddDelay(FadeOutTime - sliderTick.StartTime); this.FadeOut(); break; case ArmedState.Miss: diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs index 0bb2f718d3..d7fe0e32bf 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs @@ -192,13 +192,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables mainContainer.ScaleTo(0); mainContainer.ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, EasingTypes.OutQuint); - mainContainer.ApplyDelay(TIME_PREEMPT - 150); + mainContainer.AddDelay(TIME_PREEMPT - 150); mainContainer.ScaleTo(1, 500, EasingTypes.OutQuint); } protected override void UpdateCurrentState(ArmedState state) { - ApplyDelay(spinner.Duration, true); + AddDelay(spinner.Duration, true); this.FadeOut(160); diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs index ee2ecfa8b1..d0f953ea1f 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs @@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces { background.Flush(false, nameof(Alpha)); background.FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo); - background.ApplyDelay(60); + background.AddDelay(60); background.FadeTo(tracking_alpha, 250, EasingTypes.OutQuint); } diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs index bd713ec8b7..3b5ecf244d 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs @@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables protected override void LoadComplete() { base.LoadComplete(); - ApplyDelay(BarLine.StartTime - Time.Current); + AddDelay(BarLine.StartTime - Time.Current); this.FadeOut(base_fadeout_time * BarLine.ScrollTime / 1000); } diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs index 31e92e4c70..2e8f9d945b 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs @@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables protected override void UpdateState(ArmedState state) { - ApplyDelay(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true); + AddDelay(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true); var circlePiece = MainPiece as CirclePiece; @@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables switch (State) { case ArmedState.Idle: - ApplyDelay(HitObject.HitWindowMiss); + AddDelay(HitObject.HitWindowMiss); break; case ArmedState.Miss: this.FadeOut(100); @@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables Content.ScaleTo(0.8f, gravity_time * 2, EasingTypes.OutQuad); this.MoveToY(-gravity_travel_height, gravity_time, EasingTypes.Out); - ApplyDelay(gravity_time, true); + AddDelay(gravity_time, true); this.MoveToY(gravity_travel_height * 2, gravity_time * 2, EasingTypes.In); break; } diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs index 4cb5f211e4..5f989579a2 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs @@ -180,13 +180,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables { const float preempt = 100; - ApplyDelay(HitObject.StartTime - Time.Current - preempt, true); + AddDelay(HitObject.StartTime - Time.Current - preempt, true); targetRing.ScaleTo(target_ring_scale, preempt * 4, EasingTypes.OutQuint); - ApplyDelay(preempt, true); + AddDelay(preempt, true); - ApplyDelay(Judgement.TimeOffset + HitObject.Duration, true); + AddDelay(Judgement.TimeOffset + HitObject.Duration, true); const float out_transition_time = 300; diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs index 279092424b..737f5d344e 100644 --- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs +++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs @@ -150,12 +150,12 @@ namespace osu.Game.Rulesets.Taiko.UI const float up_time = 1000; back.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint); - back.ApplyDelay(down_time); + back.AddDelay(down_time); back.ScaleTo(1, up_time, EasingTypes.OutQuint); target.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint); target.FadeTo(Math.Min(target.Alpha + alpha_amount, 1), down_time, EasingTypes.OutQuint); - target.ApplyDelay(down_time); + target.AddDelay(down_time); target.ScaleTo(1, up_time, EasingTypes.OutQuint); target.FadeOut(up_time, EasingTypes.OutQuint); } diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs index bb85c9681d..67202c9e0d 100644 --- a/osu.Game/Graphics/UserInterface/DialogButton.cs +++ b/osu.Game/Graphics/UserInterface/DialogButton.cs @@ -99,7 +99,7 @@ namespace osu.Game.Graphics.UserInterface colourContainer.ResizeTo(new Vector2(1.5f, 1f), click_duration, EasingTypes.In); flash(); - ApplyDelay(click_duration); + AddDelay(click_duration); Schedule(delegate { colourContainer.ResizeTo(new Vector2(0.8f, 1f)); spriteText.Spacing = Vector2.Zero; diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs index 19af0991f5..8c5347bd23 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs @@ -106,7 +106,7 @@ namespace osu.Game.Graphics.UserInterface.Volume private void schedulePopOut() { popOutDelegate?.Cancel(); - ApplyDelay(1000); + AddDelay(1000); popOutDelegate = Schedule(Hide); } } diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 7f9ddb685d..e45f030fd1 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -119,7 +119,7 @@ namespace osu.Game if (!menu.IsCurrentScreen) { menu.MakeCurrent(); - ApplyDelay(500); + AddDelay(500); scoreLoad = Schedule(() => LoadScore(s)); return; } diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs index 5580287276..c558ac5933 100644 --- a/osu.Game/Overlays/DialogOverlay.cs +++ b/osu.Game/Overlays/DialogOverlay.cs @@ -35,7 +35,7 @@ namespace osu.Game.Overlays if (v != Visibility.Hidden) return; //handle the dialog being dismissed. - dialog.ApplyDelay(PopupDialog.EXIT_DURATION); + dialog.AddDelay(PopupDialog.EXIT_DURATION); dialog.Expire(); if (dialog == currentDialog) diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs index 1d76990859..098088191f 100644 --- a/osu.Game/Overlays/Notifications/ProgressNotification.cs +++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs @@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Notifications NotificationContent.MoveToY(-DrawSize.Y / 2, 200, EasingTypes.OutQuint); this.FadeTo(0.01f, 200); //don't completely fade out or our scheduled task won't run. - ApplyDelay(100); + AddDelay(100); Schedule(Completed); break; } diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs index d5075ec400..5d471cb700 100644 --- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs +++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs @@ -75,14 +75,14 @@ namespace osu.Game.Rulesets.Judgements this.MoveToOffset(new Vector2(0, 100), 800, EasingTypes.InQuint); this.RotateTo(40, 800, EasingTypes.InQuint); - ApplyDelay(600); + AddDelay(600); this.FadeOut(200); break; case HitResult.Hit: this.ScaleTo(0.9f); this.ScaleTo(1, 500, EasingTypes.OutElastic); - ApplyDelay(100); + AddDelay(100); this.FadeOut(400); break; } diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs index 718fe5d8be..908b64a3aa 100644 --- a/osu.Game/Screens/Menu/Disclaimer.cs +++ b/osu.Game/Screens/Menu/Disclaimer.cs @@ -100,14 +100,14 @@ namespace osu.Game.Screens.Menu Content.FadeInFromZero(500); - icon.ApplyDelay(1500); + icon.AddDelay(1500); icon.FadeColour(iconColour, 200); - ApplyDelay(6000, true); + AddDelay(6000, true); Content.FadeOut(250); - ApplyDelay(250); + AddDelay(250); Schedule(() => Push(intro)); } diff --git a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs index a5c4f262f8..229c05859f 100644 --- a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs +++ b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs @@ -98,7 +98,7 @@ namespace osu.Game.Screens.Play.HUD return; fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, EasingTypes.OutQuint); - fill.ApplyDelay(glow_fade_delay); + fill.AddDelay(glow_fade_delay); fill.FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, EasingTypes.OutQuint); } diff --git a/osu.Game/Screens/Play/PauseContainer.cs b/osu.Game/Screens/Play/PauseContainer.cs index 7a257a4b6d..6683ba8fd5 100644 --- a/osu.Game/Screens/Play/PauseContainer.cs +++ b/osu.Game/Screens/Play/PauseContainer.cs @@ -58,7 +58,7 @@ namespace osu.Game.Screens.Play { OnResume = delegate { - ApplyDelay(400); + AddDelay(400); Schedule(Resume); }, OnRetry = () => OnRetry(), diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index ba92fb095d..50287ebe7d 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -77,7 +77,7 @@ namespace osu.Game.Screens.Play Beatmap = player.Beatmap, }); - ApplyDelay(400); + AddDelay(400); Schedule(pushWhenLoaded); } @@ -104,14 +104,14 @@ namespace osu.Game.Screens.Play contentIn(); - ApplyDelay(500, true); + AddDelay(500, true); logo.MoveToOffset(new Vector2(0, -180), 500, EasingTypes.InOutExpo); - ApplyDelay(250, true); + AddDelay(250, true); info.FadeIn(500); - ApplyDelay(1400, true); + AddDelay(1400, true); Schedule(pushWhenLoaded); } @@ -123,7 +123,7 @@ namespace osu.Game.Screens.Play contentOut(); - ApplyDelay(250); + AddDelay(250); Schedule(() => { diff --git a/osu.Game/Screens/Ranking/ResultsPage.cs b/osu.Game/Screens/Ranking/ResultsPage.cs index 55e71cfcc4..b88e993886 100644 --- a/osu.Game/Screens/Ranking/ResultsPage.cs +++ b/osu.Game/Screens/Ranking/ResultsPage.cs @@ -33,7 +33,7 @@ namespace osu.Game.Screens.Ranking protected override void LoadComplete() { base.LoadComplete(); - fill.ApplyDelay(400); + fill.AddDelay(400); fill.FadeInFromZero(600); } diff --git a/osu.Game/Screens/Ranking/ResultsPageScore.cs b/osu.Game/Screens/Ranking/ResultsPageScore.cs index 6f96ef500e..4e3458e522 100644 --- a/osu.Game/Screens/Ranking/ResultsPageScore.cs +++ b/osu.Game/Screens/Ranking/ResultsPageScore.cs @@ -179,7 +179,7 @@ namespace osu.Game.Screens.Ranking foreach (var s in statisticsContainer.Children) { s.FadeOut(); - s.ApplyDelay(delay += 200); + s.AddDelay(delay += 200); s.FadeIn(300 + delay, EasingTypes.Out); } }); diff --git a/osu.Game/Screens/ScreenWhiteBox.cs b/osu.Game/Screens/ScreenWhiteBox.cs index e6c25ff6f4..2ec721f0c0 100644 --- a/osu.Game/Screens/ScreenWhiteBox.cs +++ b/osu.Game/Screens/ScreenWhiteBox.cs @@ -44,7 +44,7 @@ namespace osu.Game.Screens boxContainer.ScaleTo(0.2f); boxContainer.RotateTo(-20); - Content.ApplyDelay(300, true); + Content.AddDelay(300, true); boxContainer.ScaleTo(1, transition_time, EasingTypes.OutElastic); boxContainer.RotateTo(0, transition_time / 2, EasingTypes.OutQuint); diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs index dcf39a7880..4a00ef71a0 100644 --- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs +++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs @@ -63,7 +63,7 @@ namespace osu.Game.Screens.Select.Leaderboards }; scrollFlow.Add(ls); - ls.ApplyDelay(i++ * 50, true); + ls.AddDelay(i++ * 50, true); ls.Show(); } diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs index 02d6833d3f..3867d4e379 100644 --- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs +++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs @@ -64,18 +64,18 @@ namespace osu.Game.Screens.Select.Leaderboards this.FadeIn(200); content.MoveToY(0, 800, EasingTypes.OutQuint); - ApplyDelay(100, true); + AddDelay(100, true); avatar.FadeIn(300, EasingTypes.OutQuint); nameLabel.FadeIn(350, EasingTypes.OutQuint); avatar.MoveToX(0, 300, EasingTypes.OutQuint); nameLabel.MoveToX(0, 350, EasingTypes.OutQuint); - ApplyDelay(250, true); + AddDelay(250, true); scoreLabel.FadeIn(200); scoreRank.FadeIn(200); - ApplyDelay(50, true); + AddDelay(50, true); var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, }; for (int i = 0; i < drawables.Length; i++)