Merge remote-tracking branch 'origin/master' into tournament_drawings

.editorconfig

@@ -7,3 +7,21 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase

osu-framework

@@ -1 +1 @@
-Subproject commit 7cad7cf48b2ae9f16cac503d46bd0ea801e7561f
+Subproject commit 4c0762eec20d2a3063df908a49432326570bea9f

osu.Desktop.Deploy/App.config

@@ -23,6 +23,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

osu.Desktop.Deploy/osu.Desktop.Deploy.csproj

@@ -36,52 +36,52 @@
     <StartupObject>osu.Desktop.Deploy.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DeltaCompressionDotNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+    <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.0.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.1.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.PatchApi.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

osu.Desktop.Deploy/packages.config

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net452" />
+  <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net452" />
-  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net452" />
+  <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
   <package id="NuGet.CommandLine" version="3.5.0" targetFramework="net452" developmentDependency="true" />
-  <package id="Splat" version="1.6.2" targetFramework="net452" />
+  <package id="Splat" version="2.0.0" targetFramework="net452" />
   <package id="squirrel.windows" version="1.5.2" targetFramework="net452" />
 </packages>

osu.Desktop.Tests/osu.Desktop.Tests.csproj

@@ -34,7 +34,7 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -54,9 +54,6 @@
     <Reference Include="SQLite.Net.Platform.Generic">
       <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BenchmarkTest.cs" />

osu.Desktop.VisualTests/Benchmark.cs

@@ -13,7 +13,7 @@ namespace osu.Desktop.VisualTests
         private double timePerTest = 200;
 
         [BackgroundDependencyLoader]
-        private void load(Framework.Game game)
+        private void load()
         {
             Host.MaximumDrawHz = int.MaxValue;
             Host.MaximumUpdateHz = int.MaxValue;

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
@@ -27,9 +28,6 @@ namespace osu.Desktop.VisualTests.Tests
         {
             base.Reset();
 
-            //ensure we are at offset 0
-            Clock = new FramedClock();
-
             List<HitObject> objects = new List<HitObject>();
 
             int time = 500;
@@ -52,33 +50,42 @@ namespace osu.Desktop.VisualTests.Tests
 
             Add(new Drawable[]
             {
-                new OsuHitRenderer
+                new Container
                 {
-                    Beatmap = beatmap,
+                    RelativeSizeAxes = Axes.Both,
-                    Scale = new Vector2(0.5f),
+                    //ensure we are at offset 0
-                    Anchor = Anchor.TopLeft,
+                    Clock = new FramedClock(),
-                    Origin = Anchor.TopLeft
+                    Children = new Drawable[]
-                },
+                    {
-                new TaikoHitRenderer
+                        new OsuHitRenderer
-                {
+                        {
-                    Beatmap = beatmap,
+                            Beatmap = beatmap,
-                    Scale = new Vector2(0.5f),
+                            Scale = new Vector2(0.5f),
-                    Anchor = Anchor.TopRight,
+                            Anchor = Anchor.TopLeft,
-                    Origin = Anchor.TopRight
+                            Origin = Anchor.TopLeft
-                },
+                        },
-                new CatchHitRenderer
+                        new TaikoHitRenderer
-                {
+                        {
-                    Beatmap = beatmap,
+                            Beatmap = beatmap,
-                    Scale = new Vector2(0.5f),
+                            Scale = new Vector2(0.5f),
-                    Anchor = Anchor.BottomLeft,
+                            Anchor = Anchor.TopRight,
-                    Origin = Anchor.BottomLeft
+                            Origin = Anchor.TopRight
-                },
+                        },
-                new ManiaHitRenderer
+                        new CatchHitRenderer
-                {
+                        {
-                    Beatmap = beatmap,
+                            Beatmap = beatmap,
-                    Scale = new Vector2(0.5f),
+                            Scale = new Vector2(0.5f),
-                    Anchor = Anchor.BottomRight,
+                            Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomRight
+                            Origin = Anchor.BottomLeft
+                        },
+                        new ManiaHitRenderer
+                        {
+                            Beatmap = beatmap,
+                            Scale = new Vector2(0.5f),
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight
+                        }
+                    }
                 }
             });
         }

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -82,6 +82,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
@@ -99,9 +103,8 @@
     <Reference Include="SQLite.Net.Platform.Generic">
       <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK">
+    <Reference Include="System.Drawing" />
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="System.Xml" />
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\osu.licenseheader">

osu.Desktop.VisualTests/packages.config

@@ -5,7 +5,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 -->
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />

osu.Desktop/Overlays/VersionManager.cs

@@ -37,7 +37,7 @@ namespace osu.Desktop.Overlays
         [BackgroundDependencyLoader]
         private void load(NotificationManager notification, OsuColour colours, TextureStore textures)
         {
-            this.notificationManager = notification;
+            notificationManager = notification;
 
             AutoSizeAxes = Axes.Both;
             Anchor = Anchor.BottomCentre;

osu.Desktop/app.config

@@ -10,6 +10,10 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

osu.Desktop/osu.Desktop.csproj

@@ -89,61 +89,61 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DeltaCompressionDotNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+    <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.0.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.1.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.PatchApi.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4" />
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />

osu.Desktop/packages.config

@@ -4,9 +4,9 @@ Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>
-  <package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net45" />
+  <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
-  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
+  <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
-  <package id="Splat" version="1.6.2" targetFramework="net45" />
+  <package id="Splat" version="2.0.0" targetFramework="net45" />
   <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
 </packages>

osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj

@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

osu.Game.Modes.Catch/packages.config

@@ -4,5 +4,5 @@ Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
 </packages>

osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj

@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

osu.Game.Modes.Mania/packages.config

@@ -4,5 +4,5 @@ Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
 </packages>

osu.Game.Modes.Osu/Objects/Drawables/Pieces/TrianglesPiece.cs

@@ -14,6 +14,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         public TrianglesPiece()
         {
             TriangleScale = 1.2f;
+            HideAlphaDiscrepancies = false;
         }
 
         protected override void Update()

osu.Game.Modes.Osu/app.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
@@ -7,9 +7,9 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>

osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj

@@ -34,7 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

osu.Game.Modes.Osu/packages.config

@@ -4,5 +4,5 @@ Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net452" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
 </packages>

osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

osu.Game.Modes.Taiko/packages.config

@@ -4,5 +4,5 @@ Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
 </packages>

osu.Game.Tests/osu.Game.Tests.csproj

@@ -33,17 +33,15 @@
       <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="nunit.framework">
       <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
     <Reference Include="SQLite.Net">
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
     </Reference>

osu.Game.Tests/packages.config

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<!--
+<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
+-->
-<packages>
+<packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net45" />
+  <package id="NUnit" version="3.5.0" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
-  <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
+  <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
-  <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
+  <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
-</packages>
+</packages>

osu.Game/Beatmaps/Beatmap.cs

@@ -18,8 +18,8 @@ namespace osu.Game.Beatmaps
         public List<HitObject> HitObjects { get; set; }
         public List<ControlPoint> ControlPoints { get; set; }
         public List<Color4> ComboColors { get; set; }
-        public double BPMMaximum => 60000 / ControlPoints.Where(c => c.BeatLength != 0).OrderBy(c => c.BeatLength).First().BeatLength;
+        public double BPMMaximum => 60000 / (ControlPoints?.Where(c => c.BeatLength != 0).OrderBy(c => c.BeatLength).FirstOrDefault() ?? ControlPoint.Default).BeatLength;
-        public double BPMMinimum => 60000 / ControlPoints.Where(c => c.BeatLength != 0).OrderByDescending(c => c.BeatLength).First().BeatLength;
+        public double BPMMinimum => 60000 / (ControlPoints?.Where(c => c.BeatLength != 0).OrderByDescending(c => c.BeatLength).FirstOrDefault() ?? ControlPoint.Default).BeatLength;
         public double BPMMode => BPMAt(ControlPoints.Where(c => c.BeatLength != 0).GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).First().First().Time);
 
         public double BPMAt(double time)

osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Beatmaps.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game)
+        private void load()
         {
             if (working.Background != null)
                 Texture = working.Background;

osu.Game/Beatmaps/Drawables/BeatmapGroup.cs

@@ -64,7 +64,7 @@ namespace osu.Game.Beatmaps.Drawables
             BeatmapSet = beatmapSet;
             WorkingBeatmap beatmap = database.GetWorkingBeatmap(BeatmapSet.Beatmaps.FirstOrDefault());
             foreach (var b in BeatmapSet.Beatmaps)
-                b.StarDifficulty = (float)database.GetWorkingBeatmap(b).Beatmap.CalculateStarDifficulty();
+                b.StarDifficulty = (float)(database.GetWorkingBeatmap(b).Beatmap?.CalculateStarDifficulty() ?? 0);
 
             Header = new BeatmapSetHeader(beatmap)
             {

osu.Game/Configuration/OsuConfigManager.cs

@@ -27,6 +27,7 @@ namespace osu.Game.Configuration
             Set(OsuConfig.DimLevel, 30, 0, 100);
 
             Set(OsuConfig.MouseDisableButtons, false);
+            Set(OsuConfig.MouseDisableWheel, false);
 
             Set(OsuConfig.SnakingInSliders, true);
             Set(OsuConfig.SnakingOutSliders, false);
@@ -99,7 +100,6 @@ namespace osu.Game.Configuration
             Set(OsuConfig.UsePerBeatmapManiaSpeed, true).Disabled = true;
             Set(OsuConfig.ManiaSpeedBPMScale, true).Disabled = true;
             Set(OsuConfig.MenuTip, 0).Disabled = true;
-            Set(OsuConfig.MouseDisableWheel, false).Disabled = true;
             Set(OsuConfig.MouseSpeed, 1, 0.4, 6).Disabled = true;
             Set(OsuConfig.Offset, 0, -300, 300).Disabled = true;
             Set(OsuConfig.ScoreMeterScale, 1, 0.5, 2).Disabled = true;

osu.Game/Database/BeatmapDatabase.cs

@@ -57,6 +57,18 @@ namespace osu.Game.Database
                 try
                 {
                     storage.Delete(b.Path);
+
+                    GetChildren(b, true);
+
+                    foreach (var i in b.Beatmaps)
+                    {
+                        if (i.Metadata != null) connection.Delete(i.Metadata);
+                        if (i.BaseDifficulty != null) connection.Delete(i.BaseDifficulty);
+
+                        connection.Delete(i);
+                    }
+
+                    if (b.Metadata != null) connection.Delete(b.Metadata);
                     connection.Delete(b);
                 }
                 catch (Exception e)

osu.Game/Graphics/Backgrounds/Triangles.cs

@@ -10,6 +10,7 @@ using osu.Framework.MathUtils;
 using OpenTK;
 using OpenTK.Graphics;
 using System;
+using osu.Framework.Graphics.Colour;
 
 namespace osu.Game.Graphics.Backgrounds
 {
@@ -37,6 +38,13 @@ namespace osu.Game.Graphics.Backgrounds
 
         private float triangleScale = 1;
 
+        /// <summary>
+        /// Whether we should drop-off alpha values of triangles more quickly to improve
+        /// the visual appearance of fading. This defaults to on as it is generally more
+        /// aesthetically pleasing, but should be turned off in <see cref="BufferedContainer{T}"/>s.
+        /// </summary>
+        public bool HideAlphaDiscrepancies = true;
+
         public float TriangleScale
         {
             get { return triangleScale; }
@@ -63,8 +71,14 @@ namespace osu.Game.Graphics.Backgrounds
         {
             base.Update();
 
+            float adjustedAlpha = HideAlphaDiscrepancies ?
+                // Cubically scale alpha to make it drop off more sharply.
+                (float)Math.Pow(DrawInfo.Colour.AverageColour.Linear.A, 3) :
+                1;
+
             foreach (var t in Children)
             {
+                t.Alpha = adjustedAlpha;
                 t.Position -= new Vector2(0, (float)(t.Scale.X * (50 / DrawHeight) * (Time.Elapsed / 950)) / triangleScale);
                 if (ExpireOffScreenTriangles && t.DrawPosition.Y + t.DrawSize.Y * t.Scale.Y < 0)
                     t.Expire();

osu.Game/Graphics/Cursor/OsuCursorContainer.cs

@@ -43,7 +43,7 @@ namespace osu.Game.Graphics.Cursor
         class OsuCursor : Container
         {
             private Container cursorContainer;
-            private BindableDouble cursorScale;
+            private Bindable<double> cursorScale;
 
             public OsuCursor()
             {
@@ -52,9 +52,9 @@ namespace osu.Game.Graphics.Cursor
             }
 
             [BackgroundDependencyLoader]
-            private void load(TextureStore textures, OsuConfigManager config)
+            private void load(OsuConfigManager config)
             {
-                cursorScale = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize);
+                cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
 
                 Children = new Drawable[]
                 {

osu.Game/Graphics/UserInterface/StarCounter.cs

@@ -14,8 +14,6 @@ namespace osu.Game.Graphics.UserInterface
     {
         private readonly Container<Star> stars;
 
-        private double transformStartTime;
-
         /// <summary>
         /// Maximum amount of stars displayed.
         /// </summary>

osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs

@@ -82,9 +82,9 @@ namespace osu.Game.Graphics.UserInterface.Volume
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            volumeMeterMaster.Bindable.Weld(audio.Volume);
+            volumeMeterMaster.Bindable.BindTo(audio.Volume);
-            volumeMeterEffect.Bindable.Weld(audio.VolumeSample);
+            volumeMeterEffect.Bindable.BindTo(audio.VolumeSample);
-            volumeMeterMusic.Bindable.Weld(audio.VolumeTrack);
+            volumeMeterMusic.Bindable.BindTo(audio.VolumeTrack);
         }
 
         ScheduledDelegate popOutDelegate;

osu.Game/Modes/UI/ScoreOverlay.cs

@@ -64,7 +64,7 @@ namespace osu.Game.Modes.UI
             processor.TotalScore.ValueChanged += delegate { ScoreCounter?.Set((ulong)processor.TotalScore.Value); };
             processor.Accuracy.ValueChanged += delegate { AccuracyCounter?.Set((float)processor.Accuracy.Value); };
             processor.Combo.ValueChanged += delegate { ComboCounter?.Set((ulong)processor.Combo.Value); };
-            HealthDisplay?.Current.Weld(processor.Health);
+            HealthDisplay?.Current.BindTo(processor.Health);
         }
     }
 }

osu.Game/OsuGame.cs

@@ -214,7 +214,7 @@ namespace osu.Game
                 }
             }
 
-            return base.OnKeyDown(state, args);
+            return false;
         }
 
         public event Action<Screen> ModeChanged;

osu.Game/Overlays/ChatOverlay.cs

@@ -29,8 +29,6 @@ namespace osu.Game.Overlays
     {
         const float textbox_height = 40;
 
-        private DrawableChannel channelDisplay;
-
         private ScheduledDelegate messageRequest;
 
         private Container content;
@@ -126,7 +124,7 @@ namespace osu.Game.Overlays
 
         private void addChannel(Channel channel)
         {
-            Add(channelDisplay = new DrawableChannel(channel));
+            Add(new DrawableChannel(channel));
             careChannels.Add(channel);
         }
 

osu.Game/Overlays/MusicController.cs

@@ -75,8 +75,7 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, AudioManager audio,
+        private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours)
-            TextureStore textures, OsuColour colours)
         {
             game = osuGame;
 

osu.Game/Overlays/NotificationManager.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Overlays
         private FlowContainer<NotificationSection> sections;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuColour colours)
+        private void load()
         {
             Width = width;
             RelativeSizeAxes = Axes.Y;

osu.Game/Overlays/Notifications/Notification.cs

@@ -256,7 +256,7 @@ namespace osu.Game.Overlays.Notifications
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load()
             {
                 Size = new Vector2(6, 15);
 

osu.Game/Overlays/Options/OptionDropDown.cs

@@ -101,7 +101,7 @@ namespace osu.Game.Overlays.Options
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
-                    Items = this.Items,
+                    Items = Items,
                 }
             };
             dropdown.ValueChanged += dropdown_ValueChanged;

osu.Game/Overlays/Options/OptionTextBox.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Options
                 bindable = value;
                 if (bindable != null)
                 {
-                    base.Text = bindable.Value;
+                    Text = bindable.Value;
                     bindable.ValueChanged += bindableValueChanged;
                 }
 

osu.Game/Overlays/Options/Sections/GameplaySection.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Options.Sections
 
         public GameplaySection()
         {
-            base.Children = new Drawable[]
+            Children = new Drawable[]
             {
                 new GeneralOptions(),
                 new SongSelectOptions(),

osu.Game/Overlays/Pause/QuitButton.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Pause
     public class QuitButton : PauseButton
     {
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuColour colours)
+        private void load(AudioManager audio)
         {
             ButtonColour = new Color4(170, 27, 39, 255); // The red from the design isn't in the palette so it's used directly
             SampleHover = audio.Sample.Get(@"Menu/menuclick");

osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs

@@ -9,7 +9,7 @@ namespace osu.Game.Screens.Backgrounds
     public class BackgroundScreenDefault : BackgroundScreen
     {
         [BackgroundDependencyLoader]
-        private void load(Framework.Game game)
+        private void load()
         {
             Add(new Background(@"Backgrounds/bg1"));
         }

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -117,7 +117,7 @@ namespace osu.Game.Screens.Menu
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, OsuGame game = null)
+        private void load(OsuGame game = null)
         {
             toolbar = game?.Toolbar;
         }

osu.Game/Screens/Menu/Intro.cs

@@ -69,23 +69,20 @@ namespace osu.Game.Screens.Menu
         {
             base.OnEntering(last);
 
-            Scheduler.Add(delegate
+            welcome.Play();
+
+            Scheduler.AddDelayed(delegate
             {
-                welcome.Play();
+                bgm.Start();
+
+                (mainMenu = new MainMenu()).LoadAsync(Game);
 
                 Scheduler.AddDelayed(delegate
                 {
-                    bgm.Start();
+                    DidLoadMenu = true;
-
+                    Push(mainMenu);
-                    (mainMenu = new MainMenu()).LoadAsync(Game);
+                }, 2300);
-
+            }, 600);
-                    Scheduler.AddDelayed(delegate
-                    {
-                        DidLoadMenu = true;
-                        Push(mainMenu);
-                    }, 2300);
-                }, 600);
-            });
 
             logo.ScaleTo(0.4f);
             logo.FadeOut();

osu.Game/Screens/OsuGameScreen.cs

@@ -24,43 +24,20 @@ namespace osu.Game.Screens
 
         protected new OsuGameBase Game => base.Game as OsuGameBase;
 
-        private bool boundToBeatmap;
+        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
-        private Bindable<WorkingBeatmap> beatmap;
 
         public WorkingBeatmap Beatmap
         {
             get
             {
-                bindBeatmap();
                 return beatmap.Value;
             }
             set
             {
-                bindBeatmap();
                 beatmap.Value = value;
             }
         }
 
-        private void bindBeatmap()
-        {
-            if (beatmap == null)
-                beatmap = new Bindable<WorkingBeatmap>();
-
-            if (!boundToBeatmap)
-            {
-                beatmap.ValueChanged += beatmap_ValueChanged;
-                boundToBeatmap = true;
-            }
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            if (boundToBeatmap)
-                beatmap.ValueChanged -= beatmap_ValueChanged;
-
-            base.Dispose(isDisposing);
-        }
-
         private void beatmap_ValueChanged(object sender, EventArgs e)
         {
             OnBeatmapChanged(beatmap.Value);
@@ -69,19 +46,16 @@ namespace osu.Game.Screens
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(OsuGameBase game)
         {
-            if (beatmap == null)
+            if (game != null)
-                beatmap = game?.Beatmap;
-        }
-
-        public override bool Push(Screen screen)
-        {
-            OsuScreen nextOsu = screen as OsuScreen;
-            if (nextOsu != null)
             {
-                nextOsu.beatmap = beatmap;
+                //if we were given a beatmap at ctor time, we want to pass this on to the game-wide beatmap.
+                var localMap = beatmap.Value;
+                beatmap.BindTo(game.Beatmap);
+                if (localMap != null)
+                    beatmap.Value = localMap;
             }
 
-            return base.Push(screen);
+            beatmap.ValueChanged += beatmap_ValueChanged;
         }
 
         protected virtual void OnBeatmapChanged(WorkingBeatmap beatmap)

osu.Game/Screens/Play/Player.cs

@@ -24,6 +24,7 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Logging;
+using osu.Framework.Input;
 
 namespace osu.Game.Screens.Play
 {
@@ -72,6 +73,8 @@ namespace osu.Game.Screens.Play
         private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuGameBase game, OsuConfigManager config)
         {
             dimLevel = config.GetBindable<int>(OsuConfig.DimLevel);
+            mouseWheelDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableWheel);
+
             try
             {
                 if (Beatmap == null)
@@ -325,5 +328,9 @@ namespace osu.Game.Screens.Play
         {
             Background?.FadeTo((100f - dimLevel) / 100, 800);
         }
+
+        private Bindable<bool> mouseWheelDisabled;
+
+        protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !isPaused;
     }
 }

osu.Game/Screens/Play/PlayerLoader.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Backgrounds;
@@ -38,7 +39,6 @@ namespace osu.Game.Screens.Play
                     Interactive = false,
                 },
             };
-
         }
 
         [BackgroundDependencyLoader]
@@ -92,11 +92,6 @@ namespace osu.Game.Screens.Play
             Content.ScaleTo(0.7f, 150, EasingTypes.InQuint);
             FadeOut(150);
 
-            //OsuScreens are currently never finalised due to the Bindable<Beatmap> bindings.
-            //can be removed once we solve that one.
-            if (player != null && player.LoadState != LoadState.Alive)
-                player.Dispose();
-
             return base.OnExiting(next);
         }
 
@@ -131,6 +126,8 @@ namespace osu.Game.Screens.Play
 
             public BeatmapMetadataDisplay(WorkingBeatmap beatmap)
             {
+                var metadata = beatmap?.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
+
                 AutoSizeAxes = Axes.Both;
                 Children = new Drawable[]
                 {
@@ -144,7 +141,7 @@ namespace osu.Game.Screens.Play
                         {
                             new OsuSpriteText
                             {
-                                Text = beatmap.BeatmapInfo.Metadata.Title,
+                                Text = metadata.Title,
                                 TextSize = 36,
                                 Font = @"Exo2.0-MediumItalic",
                                 Origin = Anchor.TopCentre,
@@ -152,7 +149,7 @@ namespace osu.Game.Screens.Play
                             },
                             new OsuSpriteText
                             {
-                                Text = beatmap.BeatmapInfo.Metadata.Artist,
+                                Text = metadata.Artist,
                                 TextSize = 26,
                                 Font = @"Exo2.0-MediumItalic",
                                 Origin = Anchor.TopCentre,
@@ -179,7 +176,7 @@ namespace osu.Game.Screens.Play
                             },
                             new OsuSpriteText
                             {
-                                Text = beatmap.BeatmapInfo.Version,
+                                Text = beatmap.BeatmapInfo?.Version,
                                 TextSize = 26,
                                 Font = @"Exo2.0-MediumItalic",
                                 Origin = Anchor.TopCentre,
@@ -189,7 +186,7 @@ namespace osu.Game.Screens.Play
                                     Bottom = 40
                                 },
                             },
-                            new MetadataLine("Source", beatmap.BeatmapInfo.Metadata.Source)
+                            new MetadataLine("Source", metadata.Source)
                             {
                                 Origin = Anchor.TopCentre,
                                 Anchor = Anchor.TopCentre,
@@ -199,7 +196,7 @@ namespace osu.Game.Screens.Play
                                 Origin = Anchor.TopCentre,
                                 Anchor = Anchor.TopCentre,
                             },
-                            new MetadataLine("Mapper", beatmap.BeatmapInfo.Metadata.Author)
+                            new MetadataLine("Mapper", metadata.Author)
                             {
                                 Origin = Anchor.TopCentre,
                                 Anchor = Anchor.TopCentre,

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Select
     {
         private static readonly Vector2 wedged_container_shear = new Vector2(0.15f, 0);
 
-        private Container beatmapInfoContainer;
+        private BufferedContainer beatmapInfoContainer;
 
         private OsuGameBase game;
 
@@ -61,8 +61,8 @@ namespace osu.Game.Screens.Select
 
             float newDepth = lastContainer?.Depth + 1 ?? 0;
 
-            BeatmapSetInfo beatmapSetInfo = beatmap.BeatmapSetInfo;
             BeatmapInfo beatmapInfo = beatmap.BeatmapInfo;
+            BeatmapMetadata metadata = beatmap.BeatmapInfo?.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
             List<InfoLabel> labels = new List<InfoLabel>();
 
@@ -133,7 +133,7 @@ namespace osu.Game.Screens.Select
                             new OsuSpriteText
                             {
                                 Font = @"Exo2.0-MediumItalic",
-                                Text = beatmapSetInfo.Metadata.Artist + " -- " + beatmapSetInfo.Metadata.Title,
+                                Text = metadata.Artist + " -- " + metadata.Title,
                                 TextSize = 28,
                                 Shadow = true,
                             },
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.Select
                                     new OsuSpriteText
                                     {
                                         Font = @"Exo2.0-Bold",
-                                        Text = beatmapSetInfo.Metadata.Author,
+                                        Text = metadata.Author,
                                         TextSize = 15,
                                         Shadow = true,
                                     },

osu.Game/osu.Game.csproj

@@ -40,19 +40,19 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLite.Net.Platform.Generic, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLite.Net.Platform.Win32, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLite.Net-PCL.3.1.1\lib\net4\SQLite.Net.Platform.Win32.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net4\SQLite.Net.Platform.Win32.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -63,6 +63,8 @@
     <Reference Include="SQLiteNetExtensions">
       <HintPath>$(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll</HintPath>
     </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />

osu.Game/packages.config

@@ -6,7 +6,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 <packages>
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />