diff --git a/osu-framework b/osu-framework
index a584706f13..1440ae8538 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit a584706f1303f54cd7f5472240e95b70920ce079
+Subproject commit 1440ae8538560b3c40883ec51ab39108d6a69e3b
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 3cc4e7f943..b0d9ea4e81 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -136,7 +136,7 @@
True
- $(SolutionDir)\packages\ppy.OpenTK.3.0.11\lib\net45\OpenTK.dll
+ $(SolutionDir)\packages\ppy.OpenTK.3.0.13\lib\net45\OpenTK.dll
True
diff --git a/osu.Desktop/packages.config b/osu.Desktop/packages.config
index 37014057a0..b5dc43267d 100644
--- a/osu.Desktop/packages.config
+++ b/osu.Desktop/packages.config
@@ -6,7 +6,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
-
+
diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
index cdce598ce8..31c225288b 100644
--- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
+++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
@@ -41,7 +41,7 @@
True
- $(SolutionDir)\packages\ppy.OpenTK.3.0.11\lib\net45\OpenTK.dll
+ $(SolutionDir)\packages\ppy.OpenTK.3.0.13\lib\net45\OpenTK.dll
True
diff --git a/osu.Game.Rulesets.Catch/packages.config b/osu.Game.Rulesets.Catch/packages.config
index e67d3e9b34..16fae25086 100644
--- a/osu.Game.Rulesets.Catch/packages.config
+++ b/osu.Game.Rulesets.Catch/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
index b9e7f8e60f..38689fb19b 100644
--- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
+++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
@@ -41,7 +41,7 @@
True
- $(SolutionDir)\packages\ppy.OpenTK.3.0.11\lib\net45\OpenTK.dll
+ $(SolutionDir)\packages\ppy.OpenTK.3.0.13\lib\net45\OpenTK.dll
True
diff --git a/osu.Game.Rulesets.Mania/packages.config b/osu.Game.Rulesets.Mania/packages.config
index e67d3e9b34..16fae25086 100644
--- a/osu.Game.Rulesets.Mania/packages.config
+++ b/osu.Game.Rulesets.Mania/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
index 97a003513f..d734fd70a9 100644
--- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
+++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
@@ -42,7 +42,7 @@
True
- $(SolutionDir)\packages\ppy.OpenTK.3.0.11\lib\net45\OpenTK.dll
+ $(SolutionDir)\packages\ppy.OpenTK.3.0.13\lib\net45\OpenTK.dll
True
diff --git a/osu.Game.Rulesets.Osu/packages.config b/osu.Game.Rulesets.Osu/packages.config
index e67d3e9b34..16fae25086 100644
--- a/osu.Game.Rulesets.Osu/packages.config
+++ b/osu.Game.Rulesets.Osu/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
index 5795048322..74859f924d 100644
--- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
+++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
@@ -41,7 +41,7 @@
True
- $(SolutionDir)\packages\ppy.OpenTK.3.0.11\lib\net45\OpenTK.dll
+ $(SolutionDir)\packages\ppy.OpenTK.3.0.13\lib\net45\OpenTK.dll
True
diff --git a/osu.Game.Rulesets.Taiko/packages.config b/osu.Game.Rulesets.Taiko/packages.config
index e67d3e9b34..16fae25086 100644
--- a/osu.Game.Rulesets.Taiko/packages.config
+++ b/osu.Game.Rulesets.Taiko/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 2f8bc5522d..14810abf84 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -42,7 +42,7 @@
True
- $(SolutionDir)\packages\ppy.OpenTK.3.0.11\lib\net45\OpenTK.dll
+ $(SolutionDir)\packages\ppy.OpenTK.3.0.13\lib\net45\OpenTK.dll
True
diff --git a/osu.Game.Tests/packages.config b/osu.Game.Tests/packages.config
index 9b125da215..a3b983e3ef 100644
--- a/osu.Game.Tests/packages.config
+++ b/osu.Game.Tests/packages.config
@@ -7,7 +7,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
-
+
diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index ab501906dc..c368b8fea7 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -33,6 +33,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
LabelText = "Cursor Sensitivity",
Bindable = config.GetBindable(FrameworkSetting.CursorSensitivity)
},
+ new SettingsCheckbox
+ {
+ LabelText = "Map absolute input to window",
+ Bindable = config.GetBindable(FrameworkSetting.MapAbsoluteInputToWindow)
+ },
new SettingsEnumDropdown
{
LabelText = "Confine mouse cursor to window",
@@ -88,6 +93,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
// this bindable will still act as the "interactive" bindable displayed during a drag.
base.Bindable = new BindableDouble(doubleValue.Value)
{
+ Default = doubleValue.Default,
MinValue = doubleValue.MinValue,
MaxValue = doubleValue.MaxValue
};
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4944613828..a5c3fc7f38 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -148,7 +148,7 @@
True
- $(SolutionDir)\packages\ppy.OpenTK.3.0.11\lib\net45\OpenTK.dll
+ $(SolutionDir)\packages\ppy.OpenTK.3.0.13\lib\net45\OpenTK.dll
True
diff --git a/osu.Game/packages.config b/osu.Game/packages.config
index 0216c8ae67..6d46360b99 100644
--- a/osu.Game/packages.config
+++ b/osu.Game/packages.config
@@ -67,7 +67,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
-
+