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 01/13] 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 02/13] 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 03/13] 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 04/13] 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 05/13] 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 06/13] 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 07/13] 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 08/13] 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 09/13] 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 10/13] 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 11/13] 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 12/13] 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 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 13/13] 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