Merge branch 'master' into fix-input-handler-disabling

ppy · Sep 28, 2023 · 4a51a13 · 4a51a13
2 parents 9c2e1c0 + ff38299
commit 4a51a13
Show file tree

Hide file tree

Showing 13 changed files with 860 additions and 57 deletions.
diff --git a/...ork.Tests/Clocks/DecoupleableClockTest.cs → ...coupleableInterpolatingFramedClockTest.cs b/...ork.Tests/Clocks/DecoupleableClockTest.cs → ...coupleableInterpolatingFramedClockTest.cs
@@ -9,7 +9,7 @@
 namespace osu.Framework.Tests.Clocks
 {
     [TestFixture]
-    public class DecoupleableClockTest
+    public class DecoupleableInterpolatingFramedClockTest
     {
         private TestClockWithRange source = null!;
         private TestDecoupleableClock decoupleable = null!;
@@ -440,7 +440,9 @@ public void TestStoppingAfterStartingBySourcePreservesState()
             Assert.AreEqual(source.CurrentTime, decoupleable.CurrentTime, decoupleable.AllowableErrorMilliseconds, "Decoupled should match source time.");
         }
 
+#pragma warning disable CS0618
         private class TestDecoupleableClock : DecoupleableInterpolatingFramedClock
+#pragma warning restore CS0618
         {
             public double? CustomAllowableErrorMilliseconds { get; set; }