From 8d610cfd434c573f3ff1389cf1050937280bdf5e Mon Sep 17 00:00:00 2001 From: Shane Woolcock Date: Mon, 6 Nov 2017 16:57:51 +1030 Subject: [PATCH 1/4] Update framework --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 3c074a0981..2de91c4f0c 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 3c074a0981844fbaa9f2ecbf879c542f07e2b94d +Subproject commit 2de91c4f0cce97a4a18229d4d63685111ec06c61 From a7c7f7d690b0c17f009d91c737280883b9baaa0c Mon Sep 17 00:00:00 2001 From: Shane Woolcock Date: Mon, 6 Nov 2017 16:58:17 +1030 Subject: [PATCH 2/4] Add precision values to some of the config bindables --- osu.Game/Configuration/OsuConfigManager.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index b000f08369..9598372d2d 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -16,12 +16,12 @@ namespace osu.Game.Configuration Set(OsuSetting.Ruleset, 0, 0, int.MaxValue); Set(OsuSetting.BeatmapDetailTab, BeatmapDetailTab.Details); - Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10); - Set(OsuSetting.DisplayStarsMaximum, 10.0, 0, 10); + Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1); + Set(OsuSetting.DisplayStarsMaximum, 10.0, 0, 10, 0.1); Set(OsuSetting.SelectionRandomType, SelectionRandomType.RandomPermutation); - Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2, 1); + Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2, 1, 0.01); // Online settings Set(OsuSetting.Username, string.Empty); @@ -41,11 +41,11 @@ namespace osu.Game.Configuration Set(OsuSetting.MenuVoice, true); Set(OsuSetting.MenuMusic, true); - Set(OsuSetting.AudioOffset, 0, -500.0, 500.0); + Set(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1); // Input - Set(OsuSetting.MenuCursorSize, 1.0, 0.5f, 2); - Set(OsuSetting.GameplayCursorSize, 1.0, 0.5f, 2); + Set(OsuSetting.MenuCursorSize, 1.0, 0.5f, 2, 0.01); + Set(OsuSetting.GameplayCursorSize, 1.0, 0.5f, 2, 0.01); Set(OsuSetting.AutoCursorSize, false); Set(OsuSetting.MouseDisableButtons, false); @@ -63,13 +63,13 @@ namespace osu.Game.Configuration Set(OsuSetting.SnakingOutSliders, true); // Gameplay - Set(OsuSetting.DimLevel, 0.3, 0, 1); + Set(OsuSetting.DimLevel, 0.3, 0, 1, 0.01); Set(OsuSetting.ShowInterface, true); Set(OsuSetting.KeyOverlay, false); Set(OsuSetting.FloatingComments, false); - Set(OsuSetting.PlaybackSpeed, 1.0, 0.5f, 2); + Set(OsuSetting.PlaybackSpeed, 1.0, 0.5f, 2, 0.01); // Update Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer); From e2005c44316754c2884e01e2dad2bdcc8d4f2761 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 8 Nov 2017 20:36:18 +0900 Subject: [PATCH 3/4] Add comment explaining necessity of AlwaysPresent for now --- osu.Game/Screens/Menu/OsuLogo.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs index 5a5b90b3fb..3b79749341 100644 --- a/osu.Game/Screens/Menu/OsuLogo.cs +++ b/osu.Game/Screens/Menu/OsuLogo.cs @@ -77,6 +77,7 @@ namespace osu.Game.Screens.Menu public OsuLogo() { + // Required to make Schedule calls run in OsuScreen even when we are not visible. AlwaysPresent = true; EarlyActivationMilliseconds = early_activation; From 4874371dbffa6e568ddaf9aeda94c07c2e40ccac Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 9 Nov 2017 17:38:20 +0900 Subject: [PATCH 4/4] Rename methods back --- osu.Game/Screens/Loader.cs | 4 ++-- osu.Game/Screens/Menu/Intro.cs | 4 ++-- osu.Game/Screens/Menu/MainMenu.cs | 6 +++--- osu.Game/Screens/OsuScreen.cs | 14 +++++++------- osu.Game/Screens/Play/PlayerLoader.cs | 4 ++-- osu.Game/Screens/Select/SongSelect.cs | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs index 8c70e2421b..8fe6b2c5a2 100644 --- a/osu.Game/Screens/Loader.cs +++ b/osu.Game/Screens/Loader.cs @@ -17,9 +17,9 @@ namespace osu.Game.Screens ValidForResume = false; } - protected override void OnArrivedLogo(OsuLogo logo, bool resuming) + protected override void LogoArriving(OsuLogo logo, bool resuming) { - base.OnArrivedLogo(logo, resuming); + base.LogoArriving(logo, resuming); logo.RelativePositionAxes = Axes.Both; logo.Triangles = false; diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 2cd51f05db..70c2430e10 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -109,9 +109,9 @@ namespace osu.Game.Screens.Menu public const int EXIT_DELAY = 3000; - protected override void OnArrivedLogo(OsuLogo logo, bool resuming) + protected override void LogoArriving(OsuLogo logo, bool resuming) { - base.OnArrivedLogo(logo, resuming); + base.LogoArriving(logo, resuming); logo.RelativePositionAxes = Axes.Both; diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 6f01199a60..8b9dd38a7b 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -103,9 +103,9 @@ namespace osu.Game.Screens.Menu Beatmap.ValueChanged += beatmap_ValueChanged; } - protected override void OnArrivedLogo(OsuLogo logo, bool resuming) + protected override void LogoArriving(OsuLogo logo, bool resuming) { - base.OnArrivedLogo(logo, resuming); + base.LogoArriving(logo, resuming); buttons.SetOsuLogo(logo); @@ -119,7 +119,7 @@ namespace osu.Game.Screens.Menu buttons.State = MenuState.TopLevel; } - protected override void OnSuspendingLogo(OsuLogo logo) + protected override void LogoSuspending(OsuLogo logo) { logo.FadeOut(300, Easing.InSine) .ScaleTo(0.2f, 300, Easing.InSine) diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs index 2693ad97fa..3dd175ca88 100644 --- a/osu.Game/Screens/OsuScreen.cs +++ b/osu.Game/Screens/OsuScreen.cs @@ -76,7 +76,7 @@ namespace osu.Game.Screens protected override void OnResuming(Screen last) { base.OnResuming(last); - logo.DelayUntilTransformsFinished().Schedule(() => OnArrivedLogo(logo, true)); + logo.DelayUntilTransformsFinished().Schedule(() => LogoArriving(logo, true)); sampleExit?.Play(); } @@ -122,7 +122,7 @@ namespace osu.Game.Screens base.OnEntering(last); - logo.DelayUntilTransformsFinished().Schedule(() => OnArrivedLogo(logo, false)); + logo.DelayUntilTransformsFinished().Schedule(() => LogoArriving(logo, false)); } protected override bool OnExiting(Screen next) @@ -151,7 +151,7 @@ namespace osu.Game.Screens /// /// Fired when this screen was entered or resumed and the logo state is required to be adjusted. /// - protected virtual void OnArrivedLogo(OsuLogo logo, bool resuming) + protected virtual void LogoArriving(OsuLogo logo, bool resuming) { logo.Action = null; logo.FadeOut(300, Easing.OutQuint); @@ -160,26 +160,26 @@ namespace osu.Game.Screens private void onExitingLogo() { logo.ClearTransforms(); - OnExitingLogo(logo); + LogoExiting(logo); } /// /// Fired when this screen was exited to add any outwards transition to the logo. /// - protected virtual void OnExitingLogo(OsuLogo logo) + protected virtual void LogoExiting(OsuLogo logo) { } private void onSuspendingLogo() { logo.ClearTransforms(); - OnSuspendingLogo(logo); + LogoSuspending(logo); } /// /// Fired when this screen was suspended to add any outwards transition to the logo. /// - protected virtual void OnSuspendingLogo(OsuLogo logo) + protected virtual void LogoSuspending(OsuLogo logo) { } } diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index 6e96fb8b71..53a2dcc41f 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -95,9 +95,9 @@ namespace osu.Game.Screens.Play this.Delay(2150).Schedule(pushWhenLoaded); } - protected override void OnArrivedLogo(OsuLogo logo, bool resuming) + protected override void LogoArriving(OsuLogo logo, bool resuming) { - base.OnArrivedLogo(logo, resuming); + base.LogoArriving(logo, resuming); logo.ClearTransforms(targetMember: nameof(Position)); logo.RelativePositionAxes = Axes.Both; diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs index 11e7d452fa..987fef2541 100644 --- a/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -311,9 +311,9 @@ namespace osu.Game.Screens.Select private const double logo_transition = 250; - protected override void OnArrivedLogo(OsuLogo logo, bool resuming) + protected override void LogoArriving(OsuLogo logo, bool resuming) { - base.OnArrivedLogo(logo, resuming); + base.LogoArriving(logo, resuming); logo.ClearTransforms(); logo.RelativePositionAxes = Axes.Both; @@ -337,9 +337,9 @@ namespace osu.Game.Screens.Select logo.Action = () => carouselRaisedStart(); } - protected override void OnExitingLogo(OsuLogo logo) + protected override void LogoExiting(OsuLogo logo) { - base.OnExitingLogo(logo); + base.LogoExiting(logo); logo.ScaleTo(0.2f, logo_transition, Easing.OutQuint); logo.FadeOut(logo_transition, Easing.OutQuint); }