From 862c4c408f9acc2b0c7e4d8202e19c1b9b2d4584 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 17 Mar 2017 14:24:46 +0900
Subject: [PATCH 01/21] Add legacy beatmap flag.

---
 osu.Game/Beatmaps/Beatmap.cs                  |  9 +++++++++
 osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs | 11 +++++++++++
 osu.Game/Beatmaps/Legacy/IIsLegacy.cs         |  9 +++++++++
 osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs     | 17 +++++++++++++++++
 osu.Game/osu.Game.csproj                      |  2 ++
 5 files changed, 48 insertions(+)
 create mode 100644 osu.Game/Beatmaps/Legacy/IIsLegacy.cs
 create mode 100644 osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index fc8bb751f9..feeaa5617a 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -70,5 +70,14 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <returns>The star difficulty.</returns>
         public double CalculateStarDifficulty() => Ruleset.GetRuleset(BeatmapInfo.Mode).CreateDifficultyCalculator(this).Calculate();
+
+        /// <summary>
+        /// Constructs a new beatmap.
+        /// </summary>
+        /// <param name="original">The original beatmap to use the parameters of.</param>
+        public Beatmap(Beatmap original = null)
+            : base(original)
+        {
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
index e7ede36b4b..979156ac96 100644
--- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps.Samples;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Modes;
 using osu.Game.Modes.Objects;
+using osu.Game.Beatmaps.Legacy;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -242,6 +243,16 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
+        protected override Beatmap ParseFile(TextReader stream)
+        {
+            return new LegacyBeatmap(base.ParseFile(stream));
+        }
+
+        public override Beatmap Decode(TextReader stream)
+        {
+            return new LegacyBeatmap(base.Decode(stream));
+        }
+
         protected override void ParseFile(TextReader stream, Beatmap beatmap)
         {
             HitObjectParser parser = null;
diff --git a/osu.Game/Beatmaps/Legacy/IIsLegacy.cs b/osu.Game/Beatmaps/Legacy/IIsLegacy.cs
new file mode 100644
index 0000000000..23ab9f4bc4
--- /dev/null
+++ b/osu.Game/Beatmaps/Legacy/IIsLegacy.cs
@@ -0,0 +1,9 @@
+namespace osu.Game.Beatmaps.Legacy
+{
+    /// <summary>
+    /// A Beatmap that was loaded from a legacy .osu beatmap file (version &lt;=15).
+    /// </summary>
+    public interface IIsLegacy
+    {
+    }
+}
diff --git a/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
new file mode 100644
index 0000000000..00aeeb2b49
--- /dev/null
+++ b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
@@ -0,0 +1,17 @@
+namespace osu.Game.Beatmaps.Legacy
+{
+    /// <summary>
+    /// A type of Beatmap loaded from a legacy .osu beatmap file (version &lt;=15).
+    /// </summary>
+    internal class LegacyBeatmap : Beatmap, IIsLegacy
+    {
+        /// <summary>
+        /// Constructs a new beatmap.
+        /// </summary>
+        /// <param name="original">The original beatmap to use the parameters of.</param>
+        public LegacyBeatmap(Beatmap original = null)
+            : base(original)
+        {
+        }
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 80d5c906e0..c0f11dbcb9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -75,7 +75,9 @@
     <Compile Include="Beatmaps\DifficultyCalculator.cs" />
     <Compile Include="Beatmaps\IBeatmapCoverter.cs" />
     <Compile Include="Beatmaps\IBeatmapProcessor.cs" />
+    <Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
     <Compile Include="Beatmaps\Timing\TimingInfo.cs" />
+    <Compile Include="Beatmaps\Legacy\IIsLegacy.cs" />
     <Compile Include="Database\ScoreDatabase.cs" />
     <Compile Include="Graphics\Backgrounds\Triangles.cs" />
     <Compile Include="Graphics\Cursor\CursorTrail.cs" />

From 67c9bb37fd8294a5f6229e856c00cfecf5335cd9 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 17 Mar 2017 14:51:09 +0900
Subject: [PATCH 02/21] Add license headers.

---
 osu.Game/Beatmaps/Legacy/IIsLegacy.cs     | 5 ++++-
 osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Legacy/IIsLegacy.cs b/osu.Game/Beatmaps/Legacy/IIsLegacy.cs
index 23ab9f4bc4..3babd3e66f 100644
--- a/osu.Game/Beatmaps/Legacy/IIsLegacy.cs
+++ b/osu.Game/Beatmaps/Legacy/IIsLegacy.cs
@@ -1,4 +1,7 @@
-namespace osu.Game.Beatmaps.Legacy
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Beatmaps.Legacy
 {
     /// <summary>
     /// A Beatmap that was loaded from a legacy .osu beatmap file (version &lt;=15).
diff --git a/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
index 00aeeb2b49..d0386e7560 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
@@ -1,4 +1,7 @@
-namespace osu.Game.Beatmaps.Legacy
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Beatmaps.Legacy
 {
     /// <summary>
     /// A type of Beatmap loaded from a legacy .osu beatmap file (version &lt;=15).

From 74a1837a05f71d6a5f90bf681e4fd8b68b9fc535 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 17 Mar 2017 14:56:50 +0900
Subject: [PATCH 03/21] Fix nullref.

---
 osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
index d0386e7560..45c5665494 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Beatmaps.Legacy
         public LegacyBeatmap(Beatmap original = null)
             : base(original)
         {
+            HitObjects = original?.HitObjects ?? null;
         }
     }
 }

From cce1ae055fc979a57642e48434ec40894e9c9d95 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 17 Mar 2017 15:30:19 +0900
Subject: [PATCH 04/21] Make DrawableHitObject expires explicit.

---
 osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs | 3 +++
 osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs    | 2 ++
 osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs   | 2 ++
 osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs     | 7 ++-----
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
index c0ff0e520a..20bb937b76 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -128,9 +128,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 case ArmedState.Idle:
                     Delay(duration + TIME_PREEMPT);
                     FadeOut(TIME_FADEOUT);
+                    Expire(true);
                     break;
                 case ArmedState.Miss:
                     FadeOut(TIME_FADEOUT / 5);
+                    Expire();
                     break;
                 case ArmedState.Hit:
                     const double flash_in = 40;
@@ -150,6 +152,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
                     FadeOut(800);
                     ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad);
+                    Expire();
                     break;
             }
         }
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
index 5df2e26bc3..a2a52c7d94 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
@@ -168,6 +168,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             ball.FadeOut(160);
 
             FadeOut(800);
+
+            Expire();
         }
 
         public Drawable ProxiedLayer => initialCircle.ApproachCircle;
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
index 97df378f86..77bfb97ad4 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -146,9 +146,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             {
                 case ArmedState.Hit:
                     ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
+                    Expire();
                     break;
                 case ArmedState.Miss:
                     ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
+                    Expire();
                     break;
             }
         }
diff --git a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
index 41c807ba9e..3ff30bd90e 100644
--- a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
@@ -34,12 +34,11 @@ namespace osu.Game.Modes.Objects.Drawables
 
             set
             {
-                if (state == value) return;
+                if (state == value)
+                    return;
                 state = value;
 
                 UpdateState(state);
-                if (IsLoaded)
-                    Expire();
 
                 if (State == ArmedState.Hit)
                     PlaySample();
@@ -63,8 +62,6 @@ namespace osu.Game.Modes.Objects.Drawables
 
             //force application of the state that was set before we loaded.
             UpdateState(State);
-
-            Expire(true);
         }
     }
 

From 26b0bb02d80dfb49ac00435d029f0693bd15aa75 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sat, 18 Mar 2017 18:32:54 +0900
Subject: [PATCH 05/21] Remove IIsLegacy, expose LegacyBeatmap without a public
 constructor.

---
 osu.Game/Beatmaps/Legacy/IIsLegacy.cs     | 12 ------------
 osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs |  4 ++--
 osu.Game/osu.Game.csproj                  |  1 -
 3 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 osu.Game/Beatmaps/Legacy/IIsLegacy.cs

diff --git a/osu.Game/Beatmaps/Legacy/IIsLegacy.cs b/osu.Game/Beatmaps/Legacy/IIsLegacy.cs
deleted file mode 100644
index 3babd3e66f..0000000000
--- a/osu.Game/Beatmaps/Legacy/IIsLegacy.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-namespace osu.Game.Beatmaps.Legacy
-{
-    /// <summary>
-    /// A Beatmap that was loaded from a legacy .osu beatmap file (version &lt;=15).
-    /// </summary>
-    public interface IIsLegacy
-    {
-    }
-}
diff --git a/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
index 45c5665494..dd40af925a 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
@@ -6,13 +6,13 @@ namespace osu.Game.Beatmaps.Legacy
     /// <summary>
     /// A type of Beatmap loaded from a legacy .osu beatmap file (version &lt;=15).
     /// </summary>
-    internal class LegacyBeatmap : Beatmap, IIsLegacy
+    public class LegacyBeatmap : Beatmap
     {
         /// <summary>
         /// Constructs a new beatmap.
         /// </summary>
         /// <param name="original">The original beatmap to use the parameters of.</param>
-        public LegacyBeatmap(Beatmap original = null)
+        internal LegacyBeatmap(Beatmap original = null)
             : base(original)
         {
             HitObjects = original?.HitObjects ?? null;
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c0f11dbcb9..1f14615b62 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -77,7 +77,6 @@
     <Compile Include="Beatmaps\IBeatmapProcessor.cs" />
     <Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
     <Compile Include="Beatmaps\Timing\TimingInfo.cs" />
-    <Compile Include="Beatmaps\Legacy\IIsLegacy.cs" />
     <Compile Include="Database\ScoreDatabase.cs" />
     <Compile Include="Graphics\Backgrounds\Triangles.cs" />
     <Compile Include="Graphics\Cursor\CursorTrail.cs" />

From b68b017a49e2b4a70a5bdbdc9cf9485d9638d1ce Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sat, 18 Mar 2017 18:38:51 +0900
Subject: [PATCH 06/21] What even was this lol.

---
 osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
index dd40af925a..0b8b13f902 100644
--- a/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
+++ b/osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Beatmaps.Legacy
         internal LegacyBeatmap(Beatmap original = null)
             : base(original)
         {
-            HitObjects = original?.HitObjects ?? null;
+            HitObjects = original?.HitObjects;
         }
     }
 }

From 3ee2b68215d73eb2a519de775045601aae59fca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 18 Mar 2017 12:00:31 +0100
Subject: [PATCH 07/21] Hide the OS cursor in OsuGameBase

---
 osu-framework           | 2 +-
 osu.Game/OsuGameBase.cs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 169cb6485e..40a23b9921 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 169cb6485e7ae740a71cbcb7d0d9d08052eb8848
+Subproject commit 40a23b992159327b1d044bdd05b4feb13ff55a3e
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index f454956de7..299c47ce8a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -132,6 +132,8 @@ namespace osu.Game
         {
             base.LoadComplete();
 
+            Host.Window.CursorState = CursorState.Hidden;
+
             AddInternal(ratioContainer = new RatioAdjust
             {
                 Children = new[]

From 341f36be5f7015559e3becf0ea5a3b079caee6fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 18 Mar 2017 12:00:44 +0100
Subject: [PATCH 08/21] Add tests service reference

---
 osu.Desktop.Tests/osu.Desktop.Tests.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Desktop.Tests/osu.Desktop.Tests.csproj b/osu.Desktop.Tests/osu.Desktop.Tests.csproj
index e89308bbb9..ad69994592 100644
--- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj
+++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj
@@ -105,6 +105,9 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

From 3649b432a19269b475de30878ee1db76bc994ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 18 Mar 2017 12:04:42 +0100
Subject: [PATCH 09/21] Update framework

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 40a23b9921..716767cc1c 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 40a23b992159327b1d044bdd05b4feb13ff55a3e
+Subproject commit 716767cc1c4aab8768295fd38cac69795e93d669

From 9af0104e3ea780564fa172bd7d3ed4c8d230a607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 18 Mar 2017 12:46:12 +0100
Subject: [PATCH 10/21] Fix NaN when dragging music controller

When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
---
 osu.Game/Overlays/MusicController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 5c9adb6b20..32061974ad 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Overlays
             Vector2 change = state.Mouse.Position - state.Mouse.PositionMouseDown.Value;
 
             // Diminish the drag distance as we go further to simulate "rubber band" feeling.
-            change *= (float)Math.Pow(change.Length, 0.7f) / change.Length;
+            change *= change.Length <= 0 ? 0 : (float)Math.Pow(change.Length, 0.7f) / change.Length;
 
             dragContainer.MoveTo(change);
             return base.OnDrag(state);

From f636f592897a54881d5f52aa0134d7d5a30195ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 18 Mar 2017 12:47:49 +0100
Subject: [PATCH 11/21] Nicer cursor orientation when dragging

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 28 +++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 1447fa9417..697736a79f 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -20,6 +20,26 @@ namespace osu.Game.Graphics.Cursor
     {
         protected override Drawable CreateCursor() => new Cursor();
 
+        protected override bool OnMouseMove(InputState state)
+        {
+            if (state.Mouse.HasMainButtonPressed)
+            {
+                Vector2 offset = state.Mouse.Delta;
+                offset = state.Mouse.Position - state.Mouse.PositionMouseDown ?? state.Mouse.Delta;
+                float degrees = (float)MathHelper.RadiansToDegrees(Math.Atan2(-offset.X, offset.Y)) + 24.3f;
+
+                // Always rotate in the direction of least distance
+                float diff = (degrees - ActiveCursor.Rotation) % 360;
+                if (diff < -180) diff += 360;
+                if (diff > 180) diff -= 360;
+                degrees = ActiveCursor.Rotation + diff;
+
+                ActiveCursor.RotateTo(degrees, 600, EasingTypes.OutQuint);
+            }
+
+            return base.OnMouseMove(state);
+        }
+
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {
             ActiveCursor.Scale = new Vector2(1);
@@ -35,7 +55,7 @@ namespace osu.Game.Graphics.Cursor
             if (!state.Mouse.HasMainButtonPressed)
             {
                 ((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, EasingTypes.OutQuint);
-                ActiveCursor.RotateTo(0, 200, EasingTypes.OutQuint);
+                ActiveCursor.RotateTo(0, 600, EasingTypes.OutElasticHalf);
                 ActiveCursor.ScaleTo(1, 500, EasingTypes.OutElastic);
             }
 
@@ -49,12 +69,6 @@ namespace osu.Game.Graphics.Cursor
             return base.OnClick(state);
         }
 
-        protected override bool OnDragStart(InputState state)
-        {
-            ActiveCursor.RotateTo(-30, 600, EasingTypes.OutElastic);
-            return base.OnDragStart(state);
-        }
-
         protected override void PopIn()
         {
             ActiveCursor.FadeTo(1, 250, EasingTypes.OutQuint);

From 6f079301109cd7a4095ca80232da4981fe3f0622 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Mar 2017 21:46:58 +0900
Subject: [PATCH 12/21] Move cursor hiding to OsuGameDesktop (fixes headless).

---
 osu.Desktop/OsuGameDesktop.cs | 2 ++
 osu.Game/OsuGameBase.cs       | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 27f58c27e1..da3e7b704a 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -43,6 +43,8 @@ namespace osu.Desktop
             var desktopWindow = host.Window as DesktopGameWindow;
             if (desktopWindow != null)
             {
+                desktopWindow.CursorState = CursorState.Hidden;
+
                 desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
                 desktopWindow.Title = Name;
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 299c47ce8a..f454956de7 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -132,8 +132,6 @@ namespace osu.Game
         {
             base.LoadComplete();
 
-            Host.Window.CursorState = CursorState.Hidden;
-
             AddInternal(ratioContainer = new RatioAdjust
             {
                 Children = new[]

From 919ec2d3a53edc38a91e7069e261664fba46b7a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Mar 2017 22:17:23 +0900
Subject: [PATCH 13/21] Spend more when wound up.

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 697736a79f..105303de04 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Graphics.Cursor
             if (!state.Mouse.HasMainButtonPressed)
             {
                 ((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, EasingTypes.OutQuint);
-                ActiveCursor.RotateTo(0, 600, EasingTypes.OutElasticHalf);
+                ActiveCursor.RotateTo(0, 600 * Math.Abs(ActiveCursor.Rotation / 720 + 1), EasingTypes.OutElasticHalf);
                 ActiveCursor.ScaleTo(1, 500, EasingTypes.OutElastic);
             }
 

From 87622f93495a037a04cbac4082f05cd01c5012fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Mar 2017 22:21:51 +0900
Subject: [PATCH 14/21] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 716767cc1c..c4b310f590 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 716767cc1c4aab8768295fd38cac69795e93d669
+Subproject commit c4b310f590d38d18e417cc2e4ccb9cef990c332f

From 125936bad0cb0c60f501753d811a4ed5ad5ab44f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Mar 2017 22:23:53 +0900
Subject: [PATCH 15/21] Fix double-assignment.

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 105303de04..3d4d9d8e4e 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -24,8 +24,7 @@ namespace osu.Game.Graphics.Cursor
         {
             if (state.Mouse.HasMainButtonPressed)
             {
-                Vector2 offset = state.Mouse.Delta;
-                offset = state.Mouse.Position - state.Mouse.PositionMouseDown ?? state.Mouse.Delta;
+                Vector2 offset = state.Mouse.Position - state.Mouse.PositionMouseDown ?? state.Mouse.Delta;
                 float degrees = (float)MathHelper.RadiansToDegrees(Math.Atan2(-offset.X, offset.Y)) + 24.3f;
 
                 // Always rotate in the direction of least distance

From 8f75032b64012e8e160e89aa4d3dde076bea8371 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Mar 2017 22:37:50 +0900
Subject: [PATCH 16/21] Fix incorrect abs.

---
 osu.Game/Graphics/Cursor/MenuCursor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 3d4d9d8e4e..1a21875cae 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Graphics.Cursor
             if (!state.Mouse.HasMainButtonPressed)
             {
                 ((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, EasingTypes.OutQuint);
-                ActiveCursor.RotateTo(0, 600 * Math.Abs(ActiveCursor.Rotation / 720 + 1), EasingTypes.OutElasticHalf);
+                ActiveCursor.RotateTo(0, 600 * (1 + Math.Abs(ActiveCursor.Rotation / 720)), EasingTypes.OutElasticHalf);
                 ActiveCursor.ScaleTo(1, 500, EasingTypes.OutElastic);
             }
 

From 3c7b4a8ffae9ae82870faae0b6648e35f8eccb8b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 01:59:13 +0900
Subject: [PATCH 17/21] Fix cursor being displayed during disclaimer.

---
 osu.Game/Screens/Menu/Disclaimer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 6ae237f66c..d242010b23 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Menu
 
         internal override bool ShowOverlays => false;
 
-        internal override bool HasLocalCursorDisplayed => false;
+        internal override bool HasLocalCursorDisplayed => true;
 
         public Disclaimer()
         {

From f56b84a1ca697fbe55bb2a1c12f65bb7348e38c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 02:32:21 +0900
Subject: [PATCH 18/21] Fix mouse cursor in VisualTestGame.

---
 osu.Desktop.VisualTests/VisualTestGame.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Desktop.VisualTests/VisualTestGame.cs b/osu.Desktop.VisualTests/VisualTestGame.cs
index 6a51a892ad..c41bdeef66 100644
--- a/osu.Desktop.VisualTests/VisualTestGame.cs
+++ b/osu.Desktop.VisualTests/VisualTestGame.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Platform;
 using osu.Framework.Screens.Testing;
 using osu.Game;
 using osu.Game.Screens.Backgrounds;
@@ -19,5 +20,11 @@ namespace osu.Desktop.VisualTests
             // we depend on some dependencies to be loaded within OsuGameBase.load().
             Add(new TestBrowser());
         }
+
+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+            host.Window.CursorState = CursorState.Hidden;
+        }
     }
 }

From 3d8ec4fa0514c42614dcf42dfbde6d91f7a5e1ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 02:31:14 +0900
Subject: [PATCH 19/21] FIx transition not always being correct.

---
 .../Select/Options/BeatmapOptionsOverlay.cs   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index 690669ffc1..656e0e51c6 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -19,7 +19,8 @@ namespace osu.Game.Screens.Select.Options
     public class BeatmapOptionsOverlay : FocusedOverlayContainer
     {
         private const float transition_duration = 500;
-        private const float x_position = 290;
+        private const float x_position = 0.2f;
+        private const float x_movement = 0.8f;
 
         private const float height = 100;
 
@@ -30,10 +31,10 @@ namespace osu.Game.Screens.Select.Options
         {
             base.PopIn();
 
-            if (buttonsContainer.Position.X >= DrawWidth || buttonsContainer.Alpha <= 0)
-                buttonsContainer.MoveToX(-buttonsContainer.DrawWidth);
+            FadeIn(transition_duration, EasingTypes.OutQuint);
 
-            buttonsContainer.Alpha = 1;
+            if (buttonsContainer.Position.X == 1 || Alpha == 0)
+                buttonsContainer.MoveToX(x_position - x_movement);
 
             holder.ScaleTo(new Vector2(1, 1), transition_duration / 2, EasingTypes.OutQuint);
 
@@ -47,15 +48,10 @@ namespace osu.Game.Screens.Select.Options
 
             holder.ScaleTo(new Vector2(1, 0), transition_duration / 2, EasingTypes.InSine);
 
-            buttonsContainer.MoveToX(DrawWidth, transition_duration, EasingTypes.InSine);
+            buttonsContainer.MoveToX(x_position + x_movement, transition_duration, EasingTypes.InSine);
             buttonsContainer.TransformSpacingTo(new Vector2(200f, 0f), transition_duration, EasingTypes.InSine);
 
-            Delay(transition_duration);
-            Schedule(() =>
-            {
-                if (State == Visibility.Hidden)
-                    buttonsContainer.Alpha = 0;
-            });
+            FadeOut(transition_duration, EasingTypes.InQuint);
         }
 
         public BeatmapOptionsOverlay()
@@ -79,6 +75,7 @@ namespace osu.Game.Screens.Select.Options
                 buttonsContainer = new ButtonFlow
                 {
                     Height = height,
+                    RelativePositionAxes = Axes.X,
                     AutoSizeAxes = Axes.X,
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.BottomLeft,

From af82a491274bb2964996a4fb1acb6072a9b10715 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 02:31:27 +0900
Subject: [PATCH 20/21] Fix test case not containing any buttons.

---
 .../Tests/TestCaseBeatmapOptionsOverlay.cs                | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs
index fea9eec6f8..a13f6005bf 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs
@@ -1,7 +1,10 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using OpenTK.Graphics;
+using OpenTK.Input;
 using osu.Framework.Screens.Testing;
+using osu.Game.Graphics;
 using osu.Game.Screens.Select.Options;
 
 namespace osu.Desktop.VisualTests.Tests
@@ -16,6 +19,11 @@ namespace osu.Desktop.VisualTests.Tests
 
             var overlay = new BeatmapOptionsOverlay();
 
+            overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.fa_times_circle_o, Color4.Purple, null, Key.Number1);
+            overlay.AddButton(@"Clear", @"local scores", FontAwesome.fa_eraser, Color4.Purple, null, Key.Number2);
+            overlay.AddButton(@"Edit", @"Beatmap", FontAwesome.fa_pencil, Color4.Yellow, null, Key.Number3);
+            overlay.AddButton(@"Delete", @"Beatmap", FontAwesome.fa_trash, Color4.Pink, null, Key.Number4, float.MaxValue);
+
             Add(overlay);
 
             AddButton(@"Toggle", overlay.ToggleVisibility);

From 034d8184274342fc57bf6d978930ad4434710365 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 17:22:47 +0900
Subject: [PATCH 21/21] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index c4b310f590..e6394035d4 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit c4b310f590d38d18e417cc2e4ccb9cef990c332f
+Subproject commit e6394035d443d4498b71e845e5763dd3faf98c7c