diff --git a/osu-framework b/osu-framework index 8dbc789266..1b0d7a584c 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 8dbc789266c1bc3e46e364be824d69bcfac74e83 +Subproject commit 1b0d7a584cad85efcdf25c5155e6e62a4ccb5758 diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs index 14c44bbb43..3841420dad 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs @@ -85,11 +85,5 @@ namespace osu.Desktop.VisualTests.Tests } }); } - - protected override void Update() - { - base.Update(); - Clock.ProcessFrame(); - } } } diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs index 1e18ae4117..83ce89148c 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs @@ -58,11 +58,5 @@ namespace osu.Desktop.VisualTests.Tests Add(d); } } - - protected override void Update() - { - base.Update(); - Clock.ProcessFrame(); - } } } diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs index 2be742580a..833cefc3d8 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs @@ -32,11 +32,5 @@ namespace osu.Desktop.VisualTests.Tests Add(mc); AddToggle(@"Show", mc.ToggleVisibility); } - - protected override void Update() - { - base.Update(); - Clock.ProcessFrame(); - } } } diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index 89bacb9b97..9e3ad1bbc8 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -82,11 +82,5 @@ namespace osu.Desktop.VisualTests.Tests Beatmap = beatmap }); } - - protected override void Update() - { - base.Update(); - Clock.ProcessFrame(); - } } } diff --git a/osu.Game.Mode.Osu/UI/OsuComboCounter.cs b/osu.Game.Mode.Osu/UI/OsuComboCounter.cs index dc90ee2779..8a6e9a30e2 100644 --- a/osu.Game.Mode.Osu/UI/OsuComboCounter.cs +++ b/osu.Game.Mode.Osu/UI/OsuComboCounter.cs @@ -17,7 +17,7 @@ namespace osu.Game.Modes.Osu.UI protected virtual float PopOutSmallScale => 1.1f; protected virtual bool CanPopOutWhileRolling => false; - public Vector2 PopOutScale = new Vector2(2.5f); + public Vector2 PopOutScale = new Vector2(1.6f); protected override void LoadComplete() { diff --git a/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs b/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs index 0c967999b3..36a1f1c100 100644 --- a/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs +++ b/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs @@ -12,18 +12,20 @@ namespace osu.Game.Modes.Osu.UI { public class OsuScoreOverlay : ScoreOverlay { - protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter() - { - Anchor = Anchor.TopRight, - Origin = Anchor.TopRight, - Position = new Vector2(0, 45) - }; - protected override ScoreCounter CreateScoreCounter() => new ScoreCounter() { Anchor = Anchor.TopRight, Origin = Anchor.TopRight, - TextSize = 60 + TextSize = 60, + Margin = new MarginPadding { Right = 5 }, + }; + + protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter() + { + Anchor = Anchor.TopRight, + Origin = Anchor.TopRight, + Position = new Vector2(0, 55), + Margin = new MarginPadding { Right = 5 }, }; protected override ComboCounter CreateComboCounter() => new OsuComboCounter() diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs index b045089dcd..63c15553d5 100644 --- a/osu.Game/Graphics/UserInterface/PercentageCounter.cs +++ b/osu.Game/Graphics/UserInterface/PercentageCounter.cs @@ -20,7 +20,7 @@ namespace osu.Game.Graphics.UserInterface { protected override Type TransformType => typeof(TransformAccuracy); - protected override double RollingDuration => 20; + protected override double RollingDuration => 150; protected override bool IsRollingProportional => true; private float epsilon => 1e-10f; diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index fd60a8ca8e..6a21da9bce 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -42,7 +42,7 @@ namespace osu.Game.Graphics.UserInterface /// /// Easing for the counter rollover animation. /// - protected virtual EasingTypes RollingEasing => EasingTypes.None; + protected virtual EasingTypes RollingEasing => EasingTypes.Out; private T displayedCount; diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs index 5976f64c41..80b2fcdb42 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs @@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Toolbar Direction = FlowDirection.HorizontalOnly, Anchor = Anchor.TopCentre, Origin = Anchor.TopCentre, - Padding = new MarginPadding { Left = 15, Right = 15 }, + Padding = new MarginPadding { Left = 20, Right = 20 }, Spacing = new Vector2(5), RelativeSizeAxes = Axes.Y, AutoSizeAxes = Axes.X, diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 2f35f1b5d5..8b1e18ac00 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -67,12 +67,10 @@ namespace osu.Game.Screens.Play } sourceClock = (IAdjustableClock)track ?? new StopwatchClock(); - Clock = new InterpolatingFramedClock(sourceClock); Schedule(() => { sourceClock.Reset(); - sourceClock.Start(); }); var beatmap = Beatmap.Beatmap; @@ -103,6 +101,7 @@ namespace osu.Game.Screens.Play { new PlayerInputManager(game.Host) { + Clock = new InterpolatingFramedClock(sourceClock), PassThrough = false, Children = new Drawable[] { @@ -113,6 +112,21 @@ namespace osu.Game.Screens.Play }; } + protected override void LoadComplete() + { + base.LoadComplete(); + + Delay(250, true); + Content.FadeIn(250); + + Delay(500, true); + + Schedule(() => + { + sourceClock.Start(); + }); + } + private void hitRenderer_OnAllJudged() { Delay(1000); @@ -130,12 +144,8 @@ namespace osu.Game.Screens.Play base.OnEntering(last); (Background as BackgroundModeBeatmap)?.BlurTo(Vector2.Zero, 1000); - } - protected override void Update() - { - base.Update(); - Clock.ProcessFrame(); + Content.Alpha = 0; } class PlayerInputManager : UserInputManager diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs index 81cd55d429..e4aa8f27b9 100644 --- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs +++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs @@ -61,7 +61,6 @@ namespace osu.Game.Screens.Select (beatmapInfoContainer = new BufferedContainer { Depth = newDepth, - PixelSnapping = true, CacheDrawnFrameBuffer = true, Shear = -Shear, RelativeSizeAxes = Axes.Both, diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 729bf3aede..9d2debb8aa 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -25,6 +25,7 @@ using OpenTK.Graphics; using osu.Game.Screens.Play; using osu.Framework; using osu.Framework.Audio.Sample; +using osu.Framework.Graphics.Transformations; using osu.Game.Beatmaps.Drawables; using osu.Game.Graphics.Containers; @@ -188,6 +189,12 @@ namespace osu.Game.Screens.Select changeBackground(Beatmap); Content.FadeInFromZero(250); + + beatmapInfoWedge.MoveTo(wedged_container_start_position + new Vector2(-100, 50)); + beatmapInfoWedge.RotateTo(10); + + beatmapInfoWedge.MoveTo(wedged_container_start_position, 800, EasingTypes.OutQuint); + beatmapInfoWedge.RotateTo(0, 800, EasingTypes.OutQuint); } protected override void OnResuming(GameMode last) @@ -197,16 +204,23 @@ namespace osu.Game.Screens.Select base.OnResuming(last); Content.FadeIn(250); + + Content.ScaleTo(1, 250, EasingTypes.OutSine); } protected override void OnSuspending(GameMode next) { + Content.ScaleTo(1.1f, 250, EasingTypes.InSine); + Content.FadeOut(250); base.OnSuspending(next); } protected override bool OnExiting(GameMode next) { + beatmapInfoWedge.MoveTo(wedged_container_start_position + new Vector2(-100, 50), 800, EasingTypes.InQuint); + beatmapInfoWedge.RotateTo(10, 800, EasingTypes.InQuint); + Content.FadeOut(100); return base.OnExiting(next); }