h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 14:12:56 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into first-run-screen-button-ux

Browse Source
This commit is contained in:
Bartłomiej Dach 2022-05-17 22:27:49 +02:00 committed by GitHub
commit 10b881dbf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -56,6 +56,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup Label="Transitive Dependencies"> <ItemGroup Label="Transitive Dependencies">
<!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. --> <!-- 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> </ItemGroup>
</Project> </Project>

7
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -428,9 +428,8 @@ namespace osu.Game.Overlays.Mods
base.PopIn(); base.PopIn();
multiplierDisplay? multiplierDisplay?
.Delay(fade_in_duration * 0.65f) .FadeIn(fade_in_duration, Easing.OutQuint)
.FadeIn(fade_in_duration / 2, Easing.OutQuint) .MoveToY(0, fade_in_duration, Easing.OutQuint);
.ScaleTo(1, fade_in_duration, Easing.OutElastic);
int nonFilteredColumnCount = 0; int nonFilteredColumnCount = 0;
@ -465,7 +464,7 @@ namespace osu.Game.Overlays.Mods
multiplierDisplay? multiplierDisplay?
.FadeOut(fade_out_duration / 2, Easing.OutQuint) .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; int nonFilteredColumnCount = 0;

2
osu.Game/osu.Game.csproj
View File

@ -34,7 +34,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </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.Framework" Version="2022.511.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.513.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.513.0" />
<PackageReference Include="Sentry" Version="3.17.1" /> <PackageReference Include="Sentry" Version="3.17.1" />

2
osu.iOS.props
View File

@ -89,6 +89,6 @@
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2022.429.0" ExcludeAssets="all" /> <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> </ItemGroup>
</Project> </Project>