From 170df01b4615b2aa73d6ec67c61b4e7b1101654b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 May 2022 20:10:53 +0200
Subject: [PATCH 1/3] Adjust difficulty multiplier scale transition on mod
overlay
The previous transition was supposed to be a center-anchored elastic
scale-in, but this didn't work as intended - because the multiplier
ended up inside of an auto-sized right-aligned container, the animation
itself would end up being anchored right.
Attempts to remove the scale transition resulted in a rather
jarring-looking result, so swap out the elastic scale-in for a sweep-in
effect from the top, to match the header and avoid introducing too many
directions of movement.
Delay values tweaked "to taste" - can be adjusted further if there is an
alternative set of values that feels better.
---
osu.Game/Overlays/Mods/ModSelectOverlay.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1dad185b78..8d72855217 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -428,9 +428,9 @@ namespace osu.Game.Overlays.Mods
base.PopIn();
multiplierDisplay?
- .Delay(fade_in_duration * 0.65f)
- .FadeIn(fade_in_duration / 2, Easing.OutQuint)
- .ScaleTo(1, fade_in_duration, Easing.OutElastic);
+ .Delay(fade_in_duration / 5)
+ .FadeIn(fade_in_duration, Easing.OutQuint)
+ .MoveToY(0, fade_in_duration, Easing.OutQuint);
int nonFilteredColumnCount = 0;
@@ -465,7 +465,7 @@ namespace osu.Game.Overlays.Mods
multiplierDisplay?
.FadeOut(fade_out_duration / 2, Easing.OutQuint)
- .ScaleTo(0.75f, fade_out_duration, Easing.OutQuint);
+ .MoveToY(-distance, fade_out_duration / 2, Easing.OutQuint);
int nonFilteredColumnCount = 0;
From 31137bebf8d414cdbcacce62e0365bc271999e6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 May 2022 14:52:27 +0900
Subject: [PATCH 2/3] Revert realm to previous release to fix iOS crashes
---
osu.Android.props | 2 +-
osu.Game/osu.Game.csproj | 2 +-
osu.iOS.props | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/osu.Android.props b/osu.Android.props
index b984f528fe..e867de73f3 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -56,6 +56,6 @@
</ItemGroup>
<ItemGroup Label="Transitive Dependencies">
<!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
- <PackageReference Include="Realm" Version="10.12.0" />
+ <PackageReference Include="Realm" Version="10.11.2" />
</ItemGroup>
</Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7f149b4e35..cd3a84a504 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -34,7 +34,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Realm" Version="10.12.0" />
+ <PackageReference Include="Realm" Version="10.11.2" />
<PackageReference Include="ppy.osu.Framework" Version="2022.511.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.513.0" />
<PackageReference Include="Sentry" Version="3.17.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 932421a705..1f677e54fd 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -89,6 +89,6 @@
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2022.429.0" ExcludeAssets="all" />
- <PackageReference Include="Realm" Version="10.12.0" />
+ <PackageReference Include="Realm" Version="10.11.2" />
</ItemGroup>
</Project>
From 062ffe64acf700d295d22585af9a8d1c95362684 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 May 2022 18:21:19 +0900
Subject: [PATCH 3/3] Remove delay on pop in
---
osu.Game/Overlays/Mods/ModSelectOverlay.cs | 1 -
1 file changed, 1 deletion(-)
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 8d72855217..f1a998bd3c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -428,7 +428,6 @@ namespace osu.Game.Overlays.Mods
base.PopIn();
multiplierDisplay?
- .Delay(fade_in_duration / 5)
.FadeIn(fade_in_duration, Easing.OutQuint)
.MoveToY(0, fade_in_duration, Easing.OutQuint);