From ef9d2b5b3c10c5a093eed7a7a2a1f97d6c5f0865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adonais=20Romero=20Gonz=C3=A1lez?= Date: Sat, 29 Oct 2016 18:26:12 -0500 Subject: [PATCH 1/6] Minor improvements to combo counters --- osu.Game/GameModes/Play/ComboCounter.cs | 5 +++-- osu.Game/GameModes/Play/Osu/OsuComboCounter.cs | 11 ++++++++++- osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/osu.Game/GameModes/Play/ComboCounter.cs b/osu.Game/GameModes/Play/ComboCounter.cs index ebc89c102e..ffeed048f0 100644 --- a/osu.Game/GameModes/Play/ComboCounter.cs +++ b/osu.Game/GameModes/Play/ComboCounter.cs @@ -31,6 +31,8 @@ namespace osu.Game.GameModes.Play protected virtual EasingTypes PopOutEasing => EasingTypes.None; protected virtual float PopOutInitialAlpha => 0.75f; + protected virtual double FadeOutDuration => 100; + /// /// Duration in milliseconds for the counter roll-up animation for each element. /// @@ -60,7 +62,6 @@ namespace osu.Game.GameModes.Play } } - protected ulong prevCount; protected ulong count; /// @@ -204,7 +205,7 @@ namespace osu.Game.GameModes.Play private void updateCount(ulong value, bool rolling = false) { - prevCount = count; + ulong prevCount = count; count = value; if (!rolling) { diff --git a/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs b/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs index 253d1c7f8e..c1f76b2632 100644 --- a/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs +++ b/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs @@ -92,6 +92,11 @@ namespace osu.Game.GameModes.Play.Osu protected override void OnCountRolling(ulong currentValue, ulong newValue) { ScheduledPopOutCurrentId++; + + // Hides displayed count if was increasing from 0 to 1 but didn't finish + if (currentValue == 0 && newValue == 0) + DisplayedCountSpriteText.FadeOut(FadeOutDuration); + base.OnCountRolling(currentValue, newValue); } @@ -116,13 +121,17 @@ namespace osu.Game.GameModes.Play.Osu protected override void OnCountChange(ulong currentValue, ulong newValue) { ScheduledPopOutCurrentId++; + + if (newValue == 0) + DisplayedCountSpriteText.FadeOut(); + base.OnCountChange(currentValue, newValue); } protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue) { if (newValue == 0) - DisplayedCountSpriteText.FadeOut(PopOutDuration); + DisplayedCountSpriteText.FadeOut(FadeOutDuration); else DisplayedCountSpriteText.Show(); diff --git a/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs b/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs index bd12d35315..70afd31988 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs +++ b/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs @@ -43,7 +43,7 @@ namespace osu.Game.GameModes.Play.Taiko protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue) { if (newValue == 0) - DisplayedCountSpriteText.FadeOut(AnimationDuration); + DisplayedCountSpriteText.FadeOut(FadeOutDuration); else DisplayedCountSpriteText.Show(); From fd0900eb3cd0880782d75dd0f2163785578fe1ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adonais=20Romero=20Gonz=C3=A1lez?= Date: Sat, 29 Oct 2016 18:42:40 -0500 Subject: [PATCH 2/6] I knew I forgot something >:( --- osu.Game/GameModes/Play/Catch/CatchComboCounter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs b/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs index dc87e65eec..cf6f153ea1 100644 --- a/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs +++ b/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs @@ -19,7 +19,7 @@ namespace osu.Game.GameModes.Play.Catch protected override bool CanPopOutWhileRolling => true; protected virtual double FadeOutDelay => 1000; - protected virtual double FadeOutDuration => 300; + protected override double FadeOutDuration => 300; protected override string FormatCount(ulong count) { From d544fba9020dab4df01d06531cb8860732f10977 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 31 Oct 2016 13:44:31 +0900 Subject: [PATCH 3/6] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index dd9faf4609..059520c918 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit dd9faf46095a761558abc6cb11ecd0e7498dba4e +Subproject commit 059520c91803855835c734bb6d9b56e90238fe78 From e5f948dccc4d68e13d3fe6de6f62ed698037768f Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 31 Oct 2016 16:16:11 -0600 Subject: [PATCH 4/6] Fade song select wedges in --- osu.Game/GameModes/Play/PlaySongSelect.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs index 309cd3119b..fd552971a7 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/GameModes/Play/PlaySongSelect.cs @@ -35,6 +35,7 @@ namespace osu.Game.GameModes.Play private ScrollContainer scrollContainer; private FlowContainer beatmapSetFlow; private TrackManager trackManager; + private Container wedgeContainer; /// Optionally provide a database to use instead of the OsuGame one. public PlaySongSelect(BeatmapDatabase database = null) @@ -45,7 +46,7 @@ namespace osu.Game.GameModes.Play const float bottomToolHeight = 50; Children = new Drawable[] { - new Container + wedgeContainer = new Container { RelativeSizeAxes = Axes.Both, Size = Vector2.One, @@ -141,6 +142,8 @@ namespace osu.Game.GameModes.Play trackManager = game.Audio.Track; Task.Factory.StartNew(addBeatmapSets); + + wedgeContainer.FadeInFromZero(250); } protected override void OnEntering(GameMode last) From 0edfeaaff928dd843807cd376cd1ce9a2bf0f396 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 1 Nov 2016 09:22:49 -0600 Subject: [PATCH 5/6] Move wedgeContainer transition to OnEntering --- osu.Game/GameModes/Play/PlaySongSelect.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs index fd552971a7..b7f61f9f8a 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/GameModes/Play/PlaySongSelect.cs @@ -142,14 +142,13 @@ namespace osu.Game.GameModes.Play trackManager = game.Audio.Track; Task.Factory.StartNew(addBeatmapSets); - - wedgeContainer.FadeInFromZero(250); } protected override void OnEntering(GameMode last) { base.OnEntering(last); ensurePlayingSelected(); + wedgeContainer.FadeInFromZero(250); } protected override void OnResuming(GameMode last) From 128ec8f7673e78c3e18d0f625ce59b7097648306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 1 Nov 2016 22:21:09 +0100 Subject: [PATCH 6/6] Fix beatmap panel border alpha being way too large. --- osu.Game/Beatmaps/Drawable/Panel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Beatmaps/Drawable/Panel.cs b/osu.Game/Beatmaps/Drawable/Panel.cs index b0c0821197..befcab40e8 100644 --- a/osu.Game/Beatmaps/Drawable/Panel.cs +++ b/osu.Game/Beatmaps/Drawable/Panel.cs @@ -53,7 +53,7 @@ namespace osu.Game.Beatmaps.Drawable protected virtual void Selected() { - BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 255); + BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 1f); GlowRadius = 10; BorderThickness = 2.5f; }