diff --git a/osu.Android.props b/osu.Android.props
index 2a08cb7867..fc01f9bf1d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
-
+
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
index 9684cbb167..5d662c18d3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -5,11 +5,11 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Animations;
using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.Scoring;
using osu.Game.Skinning;
-using osuTK;
namespace osu.Game.Rulesets.Mania.Skinning.Legacy
{
@@ -56,31 +56,30 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
(animation as IFramedAnimation)?.GotoFrame(0);
+ this.FadeInFromZero(20, Easing.Out)
+ .Then().Delay(160)
+ .FadeOutFromOne(40, Easing.In);
+
switch (result)
{
case HitResult.None:
break;
case HitResult.Miss:
- animation.ScaleTo(1.6f);
- animation.ScaleTo(1, 100, Easing.In);
-
- animation.MoveTo(Vector2.Zero);
- animation.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+ animation.ScaleTo(1.2f).Then().ScaleTo(1, 100, Easing.Out);
animation.RotateTo(0);
- animation.RotateTo(40, 800, Easing.InQuint);
-
- this.FadeOutFromOne(800);
+ animation.RotateTo(RNG.NextSingle(-5.73f, 5.73f), 100, Easing.Out);
break;
default:
- animation.ScaleTo(0.8f);
- animation.ScaleTo(1, 250, Easing.OutElastic);
-
- animation.Delay(50).ScaleTo(0.75f, 250);
-
- this.Delay(50).FadeOut(200);
+ animation.ScaleTo(0.8f)
+ .Then().ScaleTo(1, 40)
+ // this is actually correct to match stable; there were overlapping transforms.
+ .Then().ScaleTo(0.85f)
+ .Then().ScaleTo(0.7f, 40)
+ .Then().Delay(100)
+ .Then().ScaleTo(0.4f, 40, Easing.In);
break;
}
}
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index ff3b580c7e..6ec5d1f03a 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -66,8 +66,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
windowModeDropdown = new SettingsDropdown
{
LabelText = "Screen mode",
- Current = config.GetBindable(FrameworkSetting.WindowMode),
ItemSource = windowModes,
+ Current = config.GetBindable(FrameworkSetting.WindowMode),
},
resolutionDropdown = new ResolutionSettingsDropdown
{
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 598b666642..95e2e9da30 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-using System;
-using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Configuration;
@@ -28,23 +26,20 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
LabelText = "osu! music theme",
Current = config.GetBindable(OsuSetting.MenuMusic)
},
- new SettingsDropdown
+ new SettingsEnumDropdown
{
LabelText = "Intro sequence",
Current = config.GetBindable(OsuSetting.IntroSequence),
- Items = Enum.GetValues(typeof(IntroSequence)).Cast()
},
- new SettingsDropdown
+ new SettingsEnumDropdown
{
LabelText = "Background source",
Current = config.GetBindable(OsuSetting.MenuBackgroundSource),
- Items = Enum.GetValues(typeof(BackgroundSource)).Cast()
},
- new SettingsDropdown
+ new SettingsEnumDropdown
{
LabelText = "Seasonal backgrounds",
Current = config.GetBindable(OsuSetting.SeasonalBackgroundMode),
- Items = Enum.GetValues(typeof(SeasonalBackgroundMode)).Cast()
}
};
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 960959f367..cbf9f6f1bd 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index a5bcb91c74..adbcc0ef1c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
-
+
@@ -88,7 +88,7 @@
-
+