Merge remote-tracking branch 'upstream'

MingxuanGame · Apr 17, 2021 · 1e56f14 · 1e56f14
2 parents 6773162 + 1832f62
commit 1e56f14
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
@@ -30,6 +31,8 @@ public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawabl
         public override string Description => "The whole playfield is on a wheel!";
         public override double ScoreMultiplier => 1;
 
+        public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
+
         public void Update(Playfield playfield)
         {
             playfield.Rotation = (Direction.Value == RotationDirection.CounterClockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -85,6 +85,13 @@ public void TestNudge()
         [Test]
         public void TestMovement()
         {
+            checkIdleStatus(1, false);
+            checkIdleStatus(2, false);
+            checkIdleStatus(3, false);
+            checkIdleStatus(4, false);
+
+            waitForAllIdle();
+
             AddStep("move to top right", () => InputManager.MoveMouseTo(box2));
 
             checkIdleStatus(1, true);
@@ -106,6 +113,8 @@ public void TestMovement()
         [Test]
         public void TestTimings()
         {
+            waitForAllIdle();
+
             AddStep("move to centre", () => InputManager.MoveMouseTo(Content));
 
             checkIdleStatus(1, false);

diff --git a/osu.Game/Input/IdleTracker.cs b/osu.Game/Input/IdleTracker.cs
@@ -42,6 +42,12 @@ public IdleTracker(double timeToIdle)
             RelativeSizeAxes = Axes.Both;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateLastInteractionTime();
+        }
+
         protected override void Update()
         {
             base.Update();