Merge pull request #1075 from peppy/import-from-stable-part-two

Tidy up osu-stable import process

.vscode/launch.json

@@ -2,35 +2,60 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch VisualTests",
+            "name": "VisualTests (debug)",
+            "windows": {
+                "type": "clr"
+            },
             "type": "mono",
             "request": "launch",
             "program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Debug/osu!.exe",
-            "args": [],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "build",
+            "preLaunchTask": "Build (Debug)",
             "runtimeExecutable": null,
             "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
         },
         {
-            "name": "Launch Desktop",
+            "name": "VisualTests (release)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Release/osu!.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "osu! (debug)",
+            "windows": {
+                "type": "clr"
+            },
             "type": "mono",
             "request": "launch",
             "program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe",
-            "args": [],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "build",
+            "preLaunchTask": "Build (Debug)",
             "runtimeExecutable": null,
             "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
         },
         {
-            "name": "Attach",
+            "name": "osu! (release)",
+            "windows": {
+                "type": "clr"
+            },
             "type": "mono",
-            "request": "attach",
-            "address": "localhost",
-            "port": 55555
+            "request": "launch",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Release/osu!.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
         }
     ]
 }

.vscode/tasks.json

@@ -1,26 +1,44 @@
 {
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
-    "version": "0.1.0",
-    "windows": {
-        "command": "msbuild"
-    },
-    "linux": {
-        "command": "xbuild"
-    },
-    "args": [
-        // Ask msbuild to generate full paths for file names.
-        "/property:GenerateFullPaths=true"
-    ],
-    "taskSelector": "/t:",
+    "version": "2.0.0",
+    "problemMatcher": "$msCompile",
+    "isShellCommand": true,
+    "command": "msbuild",
+    "suppressTaskName": true,
     "showOutput": "silent",
+    "args": [
+        "/property:GenerateFullPaths=true",
+        "/property:DebugType=portable",
+        "/m" //parallel compiling support.
+    ],
     "tasks": [
         {
-            "taskName": "build",
-            // Show the output window only if unrecognized errors occur.
-            "showOutput": "silent",
-            // Use the standard MS compiler pattern to detect errors, warnings and infos
-            "problemMatcher": "$msCompile"
+            "taskName": "Build (Debug)",
+            "isBuildCommand": true
+        },
+        {
+            "taskName": "Build (Release)",
+            "args": [
+                "/property:Configuration=Release"
+            ]
+        },
+        {
+            "taskName": "Clean All",
+            "dependsOn": ["Clean (Debug)", "Clean (Release)"]
+        },
+        {
+            "taskName": "Clean (Debug)",
+            "args": [
+                "/target:Clean"
+            ]
+        },
+        {
+            "taskName": "Clean (Release)",
+            "args": [
+                "/target:Clean",
+                "/property:Configuration=Release"
+            ]
         }
     ]
 }

README.md

@@ -1,10 +1,6 @@
-# osu! [![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu)
+# osu! [![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu)  [![CodeFactor](https://www.codefactor.io/repository/github/ppy/osu/badge)](https://www.codefactor.io/repository/github/ppy/osu) [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
 
-
-
-[osu! on the web](https://osu.ppy.sh) | [dev chat](https://discord.gg/ppy)
-
-Rhythm is just a *click* away. The future of osu! and the beginning of an open era!
+Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the beginning of an open era!
 
 # Status
 
@@ -12,14 +8,14 @@ This is still heavily under development and is not intended for end-user use. Th
 
 # Requirements
 
-- A desktop platform which can compile .NET 4.5.
-- Visual Studio or MonoDevelop is recommended.
+- A desktop platform which can compile .NET 4.5 (tested on macOS, linux and windows). We recommend using [Visual Studio Code](https://code.visualstudio.com/) (all platforms) or [Visual Studio Community Edition](https://www.visualstudio.com/) (windows only), both of which are free.
+- Make sure you initialise and keep submodules up-to-date.
 
 # Contributing
 
 We welcome all contributions, but keep in mind that we already have a lot of the UI designed. If you wish to work on something with the intention on having it included in the official distribution, please open an issue for discussion and we will give you what you need from a design perspective to proceed. If you want to make *changes* to the design, we recommend you open an issue with your intentions before spending too much time, to ensure no effort is wasted.
 
-Contributions can be made via pull requests to this repository. We hope to credit and reward larger contributions via a [bounty system](https://goo.gl/nFdoyI). If you're unsure of what you can help with, check out the [list](https://github.com/ppy/osu/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Abounty) of available issues with bounty.
+Contributions can be made via pull requests to this repository. We hope to credit and reward larger contributions via a [bounty system](https://www.bountysource.com/teams/ppy). If you're unsure of what you can help with, check out the [list of open issues](https://github.com/ppy/osu-framework/issues).
 
 Note that while we already have certain standards in place, nothing is set in stone. If you have an issue with the way code is structured; with any libraries we are using; with any processes involved with contributing, *please* bring it up. I welcome all feedback so we can make contributing to this project as pain-free as possible.
 

appveyor.yml

@@ -0,0 +1,23 @@
+clone_depth: 1
+version: '{branch}-{build}'
+configuration: Debug
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - inspectcode -> appveyor.yml
+  - packages -> **\packages.config
+install:
+  - cmd: git submodule update --init --recursive
+  - cmd: choco install resharper-clt -y
+  - cmd: choco install nvika -y
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.2/CodeFileSanity.exe
+before_build:
+  - cmd: CodeFileSanity.exe
+  - cmd: nuget restore
+build:
+  project: osu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+  - cmd: inspectcode /o="inspectcodereport.xml" /caches-home="inspectcode" osu.sln
+  - cmd: NVika parsereport "inspectcodereport.xml" --treatwarningsaserrors

osu.Desktop.Deploy/App.config

@@ -1,4 +1,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
+-->
 <configuration>
   <appSettings>
     <add key="StagingFolder" value="Staging" />
@@ -19,14 +23,18 @@
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <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>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.17.1.0" newVersion="0.17.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

osu.Desktop.Deploy/GitHubObject.cs

@@ -1,8 +1,11 @@
-using Newtonsoft.Json;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using Newtonsoft.Json;
 
 namespace osu.Desktop.Deploy
 {
-    internal class GitHubObject
+    public class GitHubObject
     {
         [JsonProperty(@"id")]
         public int Id;

osu.Desktop.Deploy/GitHubRelease.cs

@@ -1,8 +1,11 @@
-using Newtonsoft.Json;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using Newtonsoft.Json;
 
 namespace osu.Desktop.Deploy
 {
-    internal class GitHubRelease
+    public class GitHubRelease
     {
         [JsonProperty(@"id")]
         public int Id;

osu.Desktop.Deploy/Program.cs

@@ -1,5 +1,5 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.GitHubusercontent.com/ppy/osu-framework/master/LICENCE
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
 using System.Collections.Generic;
@@ -40,7 +40,7 @@ namespace osu.Desktop.Deploy
         /// <summary>
         /// How many previous build deltas we want to keep when publishing.
         /// </summary>
-        const int keep_delta_count = 3;
+        private const int keep_delta_count = 3;
 
         private static string codeSigningCmd => string.IsNullOrEmpty(codeSigningPassword) ? "" : $"-n \"/a /f {codeSigningCertPath} /p {codeSigningPassword} /t http://timestamp.comodoca.com/authenticode\"";
 
@@ -53,7 +53,7 @@ namespace osu.Desktop.Deploy
         private static string nupkgFilename(string ver) => $"{PackageName}.{ver}.nupkg";
         private static string nupkgDistroFilename(string ver) => $"{PackageName}-{ver}-full.nupkg";
 
-        private static Stopwatch sw = new Stopwatch();
+        private static readonly Stopwatch sw = new Stopwatch();
 
         private static string codeSigningPassword;
 
@@ -172,10 +172,10 @@ namespace osu.Desktop.Deploy
             }
 
             //remove excess deltas
-            var deltas = releaseLines.Where(l => l.Filename.Contains("-delta"));
-            if (deltas.Count() > keep_delta_count)
+            var deltas = releaseLines.Where(l => l.Filename.Contains("-delta")).ToArray();
+            if (deltas.Length > keep_delta_count)
             {
-                foreach (var l in deltas.Take(deltas.Count() - keep_delta_count))
+                foreach (var l in deltas.Take(deltas.Length - keep_delta_count))
                 {
                     write($"- Removing old delta {l.Filename}", ConsoleColor.Yellow);
                     File.Delete(Path.Combine(ReleasesFolder, l.Filename));
@@ -198,7 +198,7 @@ namespace osu.Desktop.Deploy
             write($"- Creating release {version}...", ConsoleColor.Yellow);
             var req = new JsonWebRequest<GitHubRelease>($"{GitHubApiEndpoint}")
             {
-                Method = HttpMethod.POST
+                Method = HttpMethod.POST,
             };
             req.AddRaw(JsonConvert.SerializeObject(new GitHubRelease
             {
@@ -215,6 +215,7 @@ namespace osu.Desktop.Deploy
                 var upload = new WebRequest(assetUploadUrl, Path.GetFileName(a))
                 {
                     Method = HttpMethod.POST,
+                    Timeout = 240000,
                     ContentType = "application/octet-stream",
                 };
 
@@ -261,7 +262,7 @@ namespace osu.Desktop.Deploy
 
             if (!File.Exists(Path.Combine(ReleasesFolder, nupkgDistroFilename(lastRelease.Name))))
             {
-                write("Last verion's package not found locally.", ConsoleColor.Red);
+                write("Last version's package not found locally.", ConsoleColor.Red);
                 requireDownload = true;
             }
             else
@@ -282,6 +283,8 @@ namespace osu.Desktop.Deploy
 
             foreach (var a in assets)
             {
+                if (a.Name.EndsWith(".exe")) continue;
+
                 write($"- Downloading {a.Name}...", ConsoleColor.Yellow);
                 new FileWebRequest(Path.Combine(ReleasesFolder, a.Name), $"{GitHubApiEndpoint}/assets/{a.Id}").AuthenticatedBlockingPerform();
             }
@@ -337,12 +340,17 @@ namespace osu.Desktop.Deploy
                 WorkingDirectory = solutionPath,
                 CreateNoWindow = true,
                 RedirectStandardOutput = true,
+                RedirectStandardError = true,
                 UseShellExecute = false,
                 WindowStyle = ProcessWindowStyle.Hidden
             };
 
             Process p = Process.Start(psi);
+            if (p == null) return false;
+
             string output = p.StandardOutput.ReadToEnd();
+            output += p.StandardError.ReadToEnd();
+
             if (p.ExitCode == 0) return true;
 
             write(output);

osu.Desktop.Deploy/Properties/AssemblyInfo.cs

@@ -1,7 +1,10 @@
-using System.Reflection;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Desktop.Deploy")]
@@ -13,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -24,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

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

@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,10 +49,6 @@
       <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>$(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>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
       <Private>True</Private>
@@ -68,20 +65,23 @@
       <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>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <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>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+    <Reference Include="Squirrel, Version=1.7.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -101,7 +101,12 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
+    <None Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -115,7 +120,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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.
   <Target Name="BeforeBuild">
   </Target>

osu.Desktop.Deploy/packages.config

@@ -1,9 +1,14 @@
 <?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
+-->
 <packages>
   <package id="DeltaCompressionDotNet" version="1.1.0" 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="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
+  <package id="NuGet.CommandLine" version="4.1.0" targetFramework="net452" developmentDependency="true" />
+  <package id="SharpCompress" version="0.17.1" targetFramework="net452" />
   <package id="Splat" version="2.0.0" targetFramework="net452" />
-  <package id="squirrel.windows" version="1.5.2" targetFramework="net452" />
+  <package id="squirrel.windows" version="1.7.5" targetFramework="net452" />
 </packages>

osu.Desktop.Tests/BenchmarkTest.cs

@@ -1,32 +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
-
-using NUnit.Framework;
-using osu.Desktop.VisualTests;
-using osu.Framework.Desktop.Platform;
-using osu.Game.Modes;
-using osu.Game.Modes.Catch;
-using osu.Game.Modes.Mania;
-using osu.Game.Modes.Osu;
-using osu.Game.Modes.Taiko;
-
-namespace osu.Desktop.Tests
-{
-    [TestFixture]
-    public class BenchmarkTest
-    {
-        [Test]
-        public void TestBenchmark()
-        {
-            using (var host = new HeadlessGameHost())
-            {
-                Ruleset.Register(new OsuRuleset());
-                Ruleset.Register(new TaikoRuleset());
-                Ruleset.Register(new ManiaRuleset());
-                Ruleset.Register(new CatchRuleset());
-
-                host.Run(new Benchmark());
-            }
-        }
-    }
-}

osu.Desktop.Tests/VisualTests.cs

@@ -0,0 +1,22 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+using osu.Desktop.VisualTests;
+using osu.Framework.Desktop.Platform;
+
+namespace osu.Desktop.Tests
+{
+    [TestFixture]
+    public class VisualTests
+    {
+        [Test]
+        public void TestVisualTests()
+        {
+            using (var host = new HeadlessGameHost())
+            {
+                host.Run(new AutomatedVisualTestGame());
+            }
+        }
+    }
+}

osu.Desktop.Tests/app.config

@@ -1,14 +1,10 @@
 <?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
--->
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <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-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

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

@@ -21,6 +21,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,8 +34,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -42,9 +46,6 @@
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="SQLiteNetExtensions">
       <HintPath>$(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll</HintPath>
     </Reference>
@@ -56,7 +57,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BenchmarkTest.cs" />
+    <Compile Include="VisualTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework.Desktop\osu.Framework.Desktop.csproj">
@@ -75,21 +76,21 @@
       <Project>{69051C69-12AE-4E7D-A3E6-460D2E282312}</Project>
       <Name>osu.Desktop.VisualTests</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Catch\osu.Game.Modes.Catch.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj">
       <Project>{58F6C80C-1253-4A0E-A465-B8C85EBEADF3}</Project>
-      <Name>osu.Game.Modes.Catch</Name>
+      <Name>osu.Game.Rulesets.Catch</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Mania\osu.Game.Modes.Mania.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj">
       <Project>{48F4582B-7687-4621-9CBE-5C24197CB536}</Project>
-      <Name>osu.Game.Modes.Mania</Name>
+      <Name>osu.Game.Rulesets.Mania</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj">
       <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
-      <Name>osu.Game.Modes.Osu</Name>
+      <Name>osu.Game.Rulesets.Osu</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Taiko\osu.Game.Modes.Taiko.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj">
       <Project>{F167E17A-7DE6-4AF5-B920-A5112296C695}</Project>
-      <Name>osu.Game.Modes.Taiko</Name>
+      <Name>osu.Game.Rulesets.Taiko</Name>
     </ProjectReference>
     <ProjectReference Include="..\osu.Game\osu.Game.csproj">
       <Project>{0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D}</Project>
@@ -106,6 +107,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.

osu.Desktop.Tests/packages.config

@@ -4,8 +4,8 @@ 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="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NUnit" version="3.5.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="NUnit" version="3.7.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="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />

osu.Desktop.VisualTests/AutomatedVisualTestGame.cs

@@ -0,0 +1,20 @@
+// 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.Testing;
+using osu.Game;
+
+namespace osu.Desktop.VisualTests
+{
+    public class AutomatedVisualTestGame : OsuGameBase
+    {
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // Have to construct this here, rather than in the constructor, because
+            // we depend on some dependencies to be loaded within OsuGameBase.load().
+            Add(new TestRunner(new TestBrowser()));
+        }
+    }
+}

osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs

@@ -0,0 +1,24 @@
+// 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.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+
+namespace osu.Desktop.VisualTests.Beatmaps
+{
+    public class TestWorkingBeatmap : WorkingBeatmap
+    {
+        public TestWorkingBeatmap(Beatmap beatmap)
+            : base(beatmap.BeatmapInfo)
+        {
+            this.beatmap = beatmap;
+        }
+
+        private readonly Beatmap beatmap;
+
+        protected override Beatmap GetBeatmap() => beatmap;
+        protected override Texture GetBackground() => null;
+        protected override Track GetTrack() => null;
+    }
+}

osu.Desktop.VisualTests/Benchmark.cs

@@ -1,45 +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
-
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Screens.Testing;
-using osu.Game;
-
-namespace osu.Desktop.VisualTests
-{
-    public class Benchmark : OsuGameBase
-    {
-        private double timePerTest = 200;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Host.MaximumDrawHz = int.MaxValue;
-            Host.MaximumUpdateHz = int.MaxValue;
-            Host.MaximumInactiveHz = int.MaxValue;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            TestBrowser f = new TestBrowser();
-            Add(f);
-
-            Console.WriteLine($@"{Time}: Running {f.TestCount} tests for {timePerTest}ms each...");
-
-            for (int i = 1; i < f.TestCount; i++)
-            {
-                int loadableCase = i;
-                Scheduler.AddDelayed(delegate
-                {
-                    f.LoadTest(loadableCase);
-                    Console.WriteLine($@"{Time}: Switching to test #{loadableCase}");
-                }, loadableCase * timePerTest);
-            }
-
-            Scheduler.AddDelayed(Host.Exit, f.TestCount * timePerTest);
-        }
-    }
-}

osu.Desktop.VisualTests/Platform/TestStorage.cs

@@ -15,7 +15,7 @@ namespace osu.Desktop.VisualTests.Platform
         public TestStorage(string baseName) : base(baseName)
         {
         }
-        
+
         public override SQLiteConnection GetDatabase(string name)
         {
             ISQLitePlatform platform;
@@ -23,7 +23,7 @@ namespace osu.Desktop.VisualTests.Platform
                 platform = new SQLitePlatformWin32();
             else
                 platform = new SQLitePlatformGeneric();
-            return new SQLiteConnection(platform, $@":memory:");
+            return new SQLiteConnection(platform, @":memory:");
         }
     }
 }

osu.Desktop.VisualTests/Program.cs

@@ -4,11 +4,6 @@
 using System;
 using osu.Framework.Desktop;
 using osu.Framework.Platform;
-using osu.Game.Modes;
-using osu.Game.Modes.Catch;
-using osu.Game.Modes.Mania;
-using osu.Game.Modes.Osu;
-using osu.Game.Modes.Taiko;
 
 namespace osu.Desktop.VisualTests
 {
@@ -21,13 +16,8 @@ namespace osu.Desktop.VisualTests
 
             using (GameHost host = Host.GetSuitableHost(@"osu"))
             {
-                Ruleset.Register(new OsuRuleset());
-                Ruleset.Register(new TaikoRuleset());
-                Ruleset.Register(new ManiaRuleset());
-                Ruleset.Register(new CatchRuleset());
-
                 if (benchmark)
-                    host.Run(new Benchmark());
+                    host.Run(new AutomatedVisualTestGame());
                 else
                     host.Run(new VisualTestGame());
             }

osu.Desktop.VisualTests/Tests/TestCaseBeatSyncedContainer.cs

@@ -0,0 +1,206 @@
+// 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.Testing;
+using osu.Framework.Graphics;
+using osu.Framework.Timing;
+using osu.Game.Overlays;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+using osu.Framework.Audio.Track;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Framework.Graphics.Shapes;
+using OpenTK.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Framework.Lists;
+using System;
+using osu.Framework.Extensions.Color4Extensions;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBeatSyncedContainer : TestCase
+    {
+        public override string Description => @"Tests beat synced containers.";
+
+        private readonly MusicController mc;
+
+        public TestCaseBeatSyncedContainer()
+        {
+            Clock = new FramedClock();
+            Clock.ProcessFrame();
+
+            Add(new BeatContainer
+            {
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+            });
+
+            Add(mc = new MusicController
+            {
+                Origin = Anchor.TopRight,
+                Anchor = Anchor.TopRight,
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            mc.ToggleVisibility();
+        }
+
+        private class BeatContainer : BeatSyncedContainer
+        {
+            private const int flash_layer_heigth = 150;
+
+            private readonly InfoString timingPointCount;
+            private readonly InfoString currentTimingPoint;
+            private readonly InfoString beatCount;
+            private readonly InfoString currentBeat;
+            private readonly InfoString beatsPerMinute;
+            private readonly InfoString adjustedBeatLength;
+            private readonly InfoString timeUntilNextBeat;
+            private readonly InfoString timeSinceLastBeat;
+
+            private readonly Box flashLayer;
+
+            public BeatContainer()
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        Name = @"Info Layer",
+                        Anchor = Anchor.BottomLeft,
+                        Origin = Anchor.BottomLeft,
+                        AutoSizeAxes = Axes.Both,
+                        Margin = new MarginPadding { Bottom = flash_layer_heigth },
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4.Black.Opacity(150),
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.BottomLeft,
+                                Origin = Anchor.BottomLeft,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Vertical,
+                                Children = new Drawable[]
+                                {
+                                    timingPointCount = new InfoString(@"Timing points amount"),
+                                    currentTimingPoint = new InfoString(@"Current timing point"),
+                                    beatCount = new InfoString(@"Beats amount (in the current timing point)"),
+                                    currentBeat = new InfoString(@"Current beat"),
+                                    beatsPerMinute = new InfoString(@"BPM"),
+                                    adjustedBeatLength = new InfoString(@"Adjusted beat length"),
+                                    timeUntilNextBeat = new InfoString(@"Time until next beat"),
+                                    timeSinceLastBeat = new InfoString(@"Time since last beat"),
+                                }
+                            }
+                        }
+                    },
+                    new Container
+                    {
+                        Name = @"Color indicator",
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        RelativeSizeAxes = Axes.X,
+                        Height = flash_layer_heigth,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4.Black,
+                            },
+                            flashLayer = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4.White,
+                                Alpha = 0,
+                            }
+                        }
+                    }
+                };
+
+                Beatmap.ValueChanged += delegate
+                {
+                    timingPointCount.Value = 0;
+                    currentTimingPoint.Value = 0;
+                    beatCount.Value = 0;
+                    currentBeat.Value = 0;
+                    beatsPerMinute.Value = 0;
+                    adjustedBeatLength.Value = 0;
+                    timeUntilNextBeat.Value = 0;
+                    timeSinceLastBeat.Value = 0;
+                };
+            }
+
+            private SortedList<TimingControlPoint> timingPoints => Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints;
+            private TimingControlPoint getNextTimingPoint(TimingControlPoint current)
+            {
+                if (timingPoints[timingPoints.Count - 1] == current)
+                    return current;
+
+                return timingPoints[timingPoints.IndexOf(current) + 1];
+            }
+
+            private int calculateBeatCount(TimingControlPoint current)
+            {
+                if (timingPoints.Count == 0) return 0;
+
+                if (timingPoints[timingPoints.Count - 1] == current)
+                    return (int)Math.Ceiling((Beatmap.Value.Track.Length - current.Time) / current.BeatLength);
+
+                return (int)Math.Ceiling((getNextTimingPoint(current).Time - current.Time) / current.BeatLength);
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                timeUntilNextBeat.Value = TimeUntilNextBeat;
+                timeSinceLastBeat.Value = TimeSinceLastBeat;
+            }
+
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+            {
+                base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
+
+                timingPointCount.Value = timingPoints.Count;
+                currentTimingPoint.Value = timingPoints.IndexOf(timingPoint);
+                beatCount.Value = calculateBeatCount(timingPoint);
+                currentBeat.Value = beatIndex;
+                beatsPerMinute.Value = 60000 / timingPoint.BeatLength;
+                adjustedBeatLength.Value = timingPoint.BeatLength;
+
+                flashLayer.FadeOutFromOne(timingPoint.BeatLength);
+            }
+        }
+
+        private class InfoString : FillFlowContainer
+        {
+            private const int text_size = 20;
+            private const int margin = 7;
+
+            private readonly OsuSpriteText valueText;
+
+            public double Value
+            {
+                set { valueText.Text = $"{value:G}"; }
+            }
+
+            public InfoString(string header)
+            {
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Horizontal;
+                Add(new OsuSpriteText { Text = header + @": ", TextSize = text_size });
+                Add(valueText = new OsuSpriteText { TextSize = text_size });
+                Margin = new MarginPadding(margin);
+            }
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetailArea.cs

@@ -0,0 +1,25 @@
+// 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;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Screens.Select;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBeatmapDetailArea : TestCase
+    {
+        public override string Description => @"Beatmap details in song select";
+
+        public TestCaseBeatmapDetailArea()
+        {
+            Add(new BeatmapDetailArea
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(550f, 450f),
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs

@@ -0,0 +1,62 @@
+// 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.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Screens.Select;
+using System.Linq;
+using osu.Game.Beatmaps;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBeatmapDetails : TestCase
+    {
+        public override string Description => "BeatmapDetails tab of BeatmapDetailArea";
+
+        private readonly BeatmapDetails details;
+
+        public TestCaseBeatmapDetails()
+        {
+            Add(details = new BeatmapDetails
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(150),
+                Beatmap = new BeatmapInfo
+                {
+                    Version = "VisualTest",
+                    Metadata = new BeatmapMetadata
+                    {
+                        Source = "Some guy",
+                        Tags = "beatmap metadata example with a very very long list of tags and not much creativity",
+                    },
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        CircleSize = 7,
+                        ApproachRate = 3.5f,
+                        OverallDifficulty = 5.7f,
+                        DrainRate = 1,
+                    },
+                    StarDifficulty = 5.3f,
+                    Metrics = new BeatmapMetrics
+                    {
+                        Ratings = Enumerable.Range(0, 10),
+                        Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6),
+                        Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6),
+                    },
+                },
+            });
+
+            AddRepeatStep("fail values", newRetryAndFailValues, 10);
+        }
+
+        private int lastRange = 1;
+
+        private void newRetryAndFailValues()
+        {
+            details.Beatmap.Metrics.Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6);
+            details.Beatmap.Metrics.Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6);
+            details.Beatmap = details.Beatmap;
+            lastRange += 100;
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs

@@ -1,28 +1,30 @@
 // 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.Graphics;
-using osu.Framework.Screens.Testing;
+using OpenTK.Graphics;
+using OpenTK.Input;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
-using osu.Game.Overlays;
 using osu.Game.Screens.Select.Options;
 
-namespace osu.Desktop.VisualTests
+namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseBeatmapOptionsOverlay : TestCase
+    internal class TestCaseBeatmapOptionsOverlay : TestCase
     {
-        public override string Name => @"Beatmap Options";
         public override string Description => @"Beatmap options in song select";
 
-        public override void Reset()
+        public TestCaseBeatmapOptionsOverlay()
         {
-            base.Reset();
-
             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);
+            AddStep(@"Toggle", overlay.ToggleVisibility);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseBreadcrumbs.cs

@@ -0,0 +1,37 @@
+// 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.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Framework.Graphics;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBreadcrumbs : TestCase
+    {
+        public override string Description => @"breadcrumb > control";
+
+        public TestCaseBreadcrumbs()
+        {
+            BreadcrumbControl<BreadcrumbTab> c;
+            Add(c = new BreadcrumbControl<BreadcrumbTab>
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                Width = 0.5f,
+            });
+
+            AddStep(@"first", () => c.Current.Value = BreadcrumbTab.Click);
+            AddStep(@"second", () => c.Current.Value = BreadcrumbTab.The);
+            AddStep(@"third", () => c.Current.Value = BreadcrumbTab.Circles);
+        }
+
+        private enum BreadcrumbTab
+        {
+            Click,
+            The,
+            Circles,
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs

@@ -1,25 +1,19 @@
 // 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.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Threading;
 using osu.Game.Overlays;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseChatDisplay : TestCase
+    internal class TestCaseChatDisplay : TestCase
     {
-        private ScheduledDelegate messageRequest;
-
-        public override string Name => @"Chat";
         public override string Description => @"Testing chat api and overlay";
 
-        public override void Reset()
+        public TestCaseChatDisplay()
         {
-            base.Reset();
-
-            Add(new ChatOverlay()
+            Add(new ChatOverlay
             {
                 State = Visibility.Visible
             });

osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs

@@ -0,0 +1,98 @@
+// 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;
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseContextMenu : TestCase
+    {
+        public override string Description => @"Menu visible on right click";
+
+        private const int start_time = 0;
+        private const int duration = 1000;
+
+        private readonly Container container;
+
+        public TestCaseContextMenu()
+        {
+            Add(container = new MyContextMenuContainer
+            {
+                Size = new Vector2(200),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Green,
+                    }
+                }
+            });
+
+            Add(new AnotherContextMenuContainer
+            {
+                Size = new Vector2(200),
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Red,
+                    }
+                }
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // Move box along a square trajectory
+            container.Loop(c => c
+                .MoveTo(new Vector2(0, 100), duration).Then()
+                .MoveTo(new Vector2(100, 100), duration).Then()
+                .MoveTo(new Vector2(100, 0), duration).Then()
+                .MoveTo(Vector2.Zero, duration)
+            );
+        }
+
+        private class MyContextMenuContainer : Container, IHasContextMenu
+        {
+            public ContextMenuItem[] ContextMenuItems => new ContextMenuItem[]
+            {
+                new OsuContextMenuItem(@"Some option"),
+                new OsuContextMenuItem(@"Highlighted option", MenuItemType.Highlighted),
+                new OsuContextMenuItem(@"Another option"),
+                new OsuContextMenuItem(@"Choose me please"),
+                new OsuContextMenuItem(@"And me too"),
+                new OsuContextMenuItem(@"Trying to fill"),
+                new OsuContextMenuItem(@"Destructive option", MenuItemType.Destructive),
+            };
+        }
+
+        private class AnotherContextMenuContainer : Container, IHasContextMenu
+        {
+            public ContextMenuItem[] ContextMenuItems => new ContextMenuItem[]
+            {
+                new OsuContextMenuItem(@"Simple option"),
+                new OsuContextMenuItem(@"Simple very very long option"),
+                new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted) { Action = () => this.ResizeWidthTo(Width * 2, 100, Easing.OutQuint) },
+                new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => this.ResizeHeightTo(Height * 2, 100, Easing.OutQuint) },
+                new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive) { Action = () => this.ResizeWidthTo(Width / 2, 100, Easing.OutQuint) },
+                new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => this.ResizeHeightTo(Height / 2, 100, Easing.OutQuint) },
+            };
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs

@@ -1,28 +1,24 @@
 // 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.Graphics;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseDialogOverlay : TestCase
+    internal class TestCaseDialogOverlay : TestCase
     {
-        public override string Name => @"Dialog Overlay";
         public override string Description => @"Display dialogs";
 
-        DialogOverlay overlay;
-
-        public override void Reset()
+        public TestCaseDialogOverlay()
         {
-            base.Reset();
+            DialogOverlay overlay;
 
             Add(overlay = new DialogOverlay());
 
-            AddButton("dialog #1", () => overlay.Push(new PopupDialog
+            AddStep("dialog #1", () => overlay.Push(new PopupDialog
             {
                 Icon = FontAwesome.fa_trash_o,
                 HeaderText = @"Confirm deletion of",
@@ -42,7 +38,7 @@ namespace osu.Desktop.VisualTests.Tests
                 },
             }));
 
-            AddButton("dialog #2", () => overlay.Push(new PopupDialog
+            AddStep("dialog #2", () => overlay.Push(new PopupDialog
             {
                 Icon = FontAwesome.fa_gear,
                 HeaderText = @"What do you want to do with",

osu.Desktop.VisualTests/Tests/TestCaseDirect.cs

@@ -0,0 +1,216 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
+using osu.Game.Rulesets;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    public class TestCaseDirect : TestCase
+    {
+        public override string Description => @"osu!direct overlay";
+
+        private DirectOverlay direct;
+        private RulesetStore rulesets;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Add(direct = new DirectOverlay());
+            newBeatmaps();
+
+            AddStep(@"toggle", direct.ToggleVisibility);
+            AddStep(@"result counts", () => direct.ResultAmounts = new DirectOverlay.ResultCounts(1, 4, 13));
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            this.rulesets = rulesets;
+        }
+
+        private void newBeatmaps()
+        {
+            var ruleset = rulesets.GetRuleset(0);
+
+            direct.BeatmapSets = new[]
+            {
+                new BeatmapSetInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = @"OrVid",
+                        Artist = @"An",
+                        Author = @"RLC",
+                        Source = @"",
+                    },
+                    OnlineInfo = new BeatmapSetOnlineInfo
+                    {
+                        Covers = new BeatmapSetOnlineCovers
+                        {
+                            Card = @"https://assets.ppy.sh/beatmaps/578332/covers/card.jpg?1494591390",
+                            Cover = @"https://assets.ppy.sh/beatmaps/578332/covers/cover.jpg?1494591390",
+                        },
+                        Preview = @"https://b.ppy.sh/preview/578332.mp3",
+                        PlayCount = 97,
+                        FavouriteCount = 72,
+                    },
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 5.35f,
+                            Metadata = new BeatmapMetadata(),
+                        },
+                    },
+                },
+                new BeatmapSetInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = @"tiny lamp",
+                        Artist = @"fhana",
+                        Author = @"Sotarks",
+                        Source = @"ぎんぎつね",
+                    },
+                    OnlineInfo = new BeatmapSetOnlineInfo
+                    {
+                        Covers = new BeatmapSetOnlineCovers
+                        {
+                            Card = @"https://assets.ppy.sh/beatmaps/599627/covers/card.jpg?1494539318",
+                            Cover = @"https://assets.ppy.sh/beatmaps/599627/covers/cover.jpg?1494539318",
+                        },
+                        Preview = @"https//b.ppy.sh/preview/599627.mp3",
+                        PlayCount = 3082,
+                        FavouriteCount = 14,
+                    },
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 5.81f,
+                            Metadata = new BeatmapMetadata(),
+                        },
+                    },
+                },
+                new BeatmapSetInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = @"At Gwanghwamun",
+                        Artist = @"KYUHYUN",
+                        Author = @"Cerulean Veyron",
+                        Source = @"",
+                    },
+                    OnlineInfo = new BeatmapSetOnlineInfo
+                    {
+                        Covers = new BeatmapSetOnlineCovers
+                        {
+                            Card = @"https://assets.ppy.sh/beatmaps/513268/covers/card.jpg?1494502863",
+                            Cover = @"https://assets.ppy.sh/beatmaps/513268/covers/cover.jpg?1494502863",
+                        },
+                        Preview = @"https//b.ppy.sh/preview/513268.mp3",
+                        PlayCount = 2762,
+                        FavouriteCount = 15,
+                    },
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 0.9f,
+                            Metadata = new BeatmapMetadata(),
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 1.1f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 2.02f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 3.49f,
+                        },
+                    },
+                },
+                new BeatmapSetInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = @"RHAPSODY OF BLUE SKY",
+                        Artist = @"fhana",
+                        Author = @"[Kamiya]",
+                        Source = @"小林さんちのメイドラゴン",
+                    },
+                    OnlineInfo = new BeatmapSetOnlineInfo
+                    {
+                        Covers = new BeatmapSetOnlineCovers
+                        {
+                            Card = @"https://assets.ppy.sh/beatmaps/586841/covers/card.jpg?1494052741",
+                            Cover = @"https://assets.ppy.sh/beatmaps/586841/covers/cover.jpg?1494052741",
+                        },
+                        Preview = @"https//b.ppy.sh/preview/586841.mp3",
+                        PlayCount = 62317,
+                        FavouriteCount = 161,
+                    },
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 1.26f,
+                            Metadata = new BeatmapMetadata(),
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 2.01f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 2.87f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 3.76f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 3.93f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 4.37f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 5.13f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 5.42f,
+                        },
+                    },
+                },
+            };
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs

@@ -0,0 +1,133 @@
+// 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.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Screens.Multiplayer;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Users;
+using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseDrawableRoom : TestCase
+    {
+        public override string Description => @"Select your favourite room";
+
+        private RulesetStore rulesets;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            DrawableRoom first;
+            Add(new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Y,
+                Width = 580f,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    first = new DrawableRoom(new Room
+                    {
+                        Name = { Value = @"Great Room Right Here" },
+                        Host = { Value = new User { Username = @"Naeferith", Id = 9492835, Country = new Country { FlagName = @"FR" } } },
+                        Status = { Value = new RoomStatusOpen() },
+                        Type = { Value = new GameTypeTeamVersus() },
+                        Beatmap =
+                        {
+                            Value = new BeatmapInfo
+                            {
+                                StarDifficulty = 4.65,
+                                Ruleset = rulesets.GetRuleset(3),
+                                Metadata = new BeatmapMetadata
+                                {
+                                    Title = @"Critical Crystal",
+                                    Artist = @"Seiryu",
+                                },
+                                BeatmapSet = new BeatmapSetInfo
+                                {
+                                    OnlineInfo = new BeatmapSetOnlineInfo
+                                    {
+                                        Covers = new BeatmapSetOnlineCovers
+                                        {
+                                            Cover = @"https://assets.ppy.sh//beatmaps/376340/covers/cover.jpg?1456478455",
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                        Participants =
+                        {
+                            Value = new[]
+                            {
+                                new User { GlobalRank = 1355 },
+                                new User { GlobalRank = 8756 },
+                            },
+                        },
+                    }),
+                    new DrawableRoom(new Room
+                    {
+                        Name = { Value = @"Relax It's The Weekend" },
+                        Host = { Value = new User { Username = @"peppy", Id = 2, Country = new Country { FlagName = @"AU" } } },
+                        Status = { Value = new RoomStatusPlaying() },
+                        Type = { Value = new GameTypeTagTeam() },
+                        Beatmap =
+                        {
+                            Value = new BeatmapInfo
+                            {
+                                StarDifficulty = 1.96,
+                                Ruleset = rulesets.GetRuleset(0),
+                                Metadata = new BeatmapMetadata
+                                {
+                                    Title = @"Serendipity",
+                                    Artist = @"ZAQ",
+                                },
+                                BeatmapSet = new BeatmapSetInfo
+                                {
+                                    OnlineInfo = new BeatmapSetOnlineInfo
+                                    {
+                                        Covers = new BeatmapSetOnlineCovers
+                                        {
+                                            Cover = @"https://assets.ppy.sh//beatmaps/526839/covers/cover.jpg?1493815706",
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                        Participants =
+                        {
+                            Value =  new[]
+                            {
+                                new User { GlobalRank = 578975 },
+                                new User { GlobalRank = 24554 },
+                            },
+                        },
+                    }),
+                }
+            });
+
+            AddStep(@"change title", () => first.Room.Name.Value = @"I Changed Name");
+            AddStep(@"change host", () => first.Room.Host.Value = new User { Username = @"DrabWeb", Id = 6946022, Country = new Country { FlagName = @"CA" } });
+            AddStep(@"change status", () => first.Room.Status.Value = new RoomStatusPlaying());
+            AddStep(@"change type", () => first.Room.Type.Value = new GameTypeVersus());
+            AddStep(@"change beatmap", () => first.Room.Beatmap.Value = null);
+            AddStep(@"change participants", () => first.Room.Participants.Value = new[]
+            {
+                new User { GlobalRank = 1254 },
+                new User { GlobalRank = 123189 },
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            this.rulesets = rulesets;
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs

@@ -1,88 +1,78 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Framework.Allocation;
-using osu.Framework.Platform;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Screens.Tournament;
 using osu.Game.Screens.Tournament.Teams;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseDrawings : TestCase
+    internal class TestCaseDrawings : TestCase
     {
-        public override string Name => @"Drawings";
         public override string Description => "Tournament drawings";
 
-        [BackgroundDependencyLoader]
-        private void load(Storage storage)
+        public TestCaseDrawings()
         {
-        }
-
-        public override void Reset()
-        {
-            base.Reset();
-
             Add(new Drawings
             {
                 TeamList = new TestTeamList(),
             });
         }
 
-        class TestTeamList : ITeamList
+        private class TestTeamList : ITeamList
         {
-            public IEnumerable<Team> Teams { get; } = new[]
+            public IEnumerable<DrawingsTeam> Teams { get; } = new[]
             {
-                new Team
+                new DrawingsTeam
                 {
                     FlagName = "GB",
                     FullName = "United Kingdom",
                     Acronym = "UK"
                 },
-                new Team
+                new DrawingsTeam
                 {
                     FlagName = "FR",
                     FullName = "France",
                     Acronym = "FRA"
                 },
-                new Team
+                new DrawingsTeam
                 {
                     FlagName = "CN",
                     FullName = "China",
                     Acronym = "CHN"
                 },
-                new Team
+                new DrawingsTeam
                 {
                     FlagName = "AU",
                     FullName = "Australia",
                     Acronym = "AUS"
                 },
-                new Team
+                new DrawingsTeam
                 {
                     FlagName = "JP",
                     FullName = "Japan",
                     Acronym = "JPN"
                 },
-                new Team
+                new DrawingsTeam
                 {
                     FlagName = "RO",
                     FullName = "Romania",
                     Acronym = "ROM"
                 },
-                new Team
+                new DrawingsTeam
                 {
                     FlagName = "IT",
                     FullName = "Italy",
                     Acronym = "PIZZA"
                 },
-                new Team
+                new DrawingsTeam
                 {
                     FlagName = "VE",
                     FullName = "Venezuela",
                     Acronym = "VNZ"
                 },
-                new Team
+                new DrawingsTeam
                 {
                     FlagName = "US",
                     FullName = "United States of America",

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -1,54 +1,82 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Framework.Screens.Testing;
+using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
+using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Modes.Catch.UI;
-using osu.Game.Modes.Mania.UI;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.Taiko.UI;
-using OpenTK;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Taiko.UI;
+using System.Collections.Generic;
+using osu.Desktop.VisualTests.Beatmaps;
+using osu.Framework.Allocation;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseGamefield : TestCase
+    internal class TestCaseGamefield : TestCase
     {
-        public override string Name => @"Gamefield";
+        private RulesetStore rulesets;
 
         public override string Description => @"Showing hitobjects and what not.";
 
-        public override void Reset()
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
         {
-            base.Reset();
+            this.rulesets = rulesets;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             List<HitObject> objects = new List<HitObject>();
 
             int time = 500;
             for (int i = 0; i < 100; i++)
             {
-                objects.Add(new HitCircle()
+                objects.Add(new HitCircle
                 {
                     StartTime = time,
-                    Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)),
+                    Position = new Vector2(RNG.Next(0, (int)OsuPlayfield.BASE_SIZE.X), RNG.Next(0, (int)OsuPlayfield.BASE_SIZE.Y)),
                     Scale = RNG.NextSingle(0.5f, 1.0f),
                 });
 
                 time += RNG.Next(50, 500);
             }
 
-            Beatmap beatmap = new Beatmap
+            var controlPointInfo = new ControlPointInfo();
+            controlPointInfo.TimingPoints.Add(new TimingControlPoint
             {
-                HitObjects = objects
-            };
+                BeatLength = 200
+            });
 
-            Add(new Drawable[]
+            WorkingBeatmap beatmap = new TestWorkingBeatmap(new Beatmap
+            {
+                HitObjects = objects,
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Difficulty = new BeatmapDifficulty(),
+                    Ruleset = rulesets.Query<RulesetInfo>().First(),
+                    Metadata = new BeatmapMetadata
+                    {
+                        Artist = @"Unknown",
+                        Title = @"Sample Beatmap",
+                        Author = @"peppy",
+                    },
+                },
+                ControlPointInfo = controlPointInfo
+            });
+
+            AddRange(new Drawable[]
             {
                 new Container
                 {
@@ -57,30 +85,26 @@ namespace osu.Desktop.VisualTests.Tests
                     Clock = new FramedClock(),
                     Children = new Drawable[]
                     {
-                        new OsuHitRenderer
+                        new OsuHitRenderer(beatmap, false)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.TopLeft,
                             Origin = Anchor.TopLeft
                         },
-                        new TaikoHitRenderer
+                        new TaikoHitRenderer(beatmap, false)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.TopRight,
                             Origin = Anchor.TopRight
                         },
-                        new CatchHitRenderer
+                        new CatchHitRenderer(beatmap, false)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft
                         },
-                        new ManiaHitRenderer
+                        new ManiaHitRenderer(beatmap, false)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight

osu.Desktop.VisualTests/Tests/TestCaseGraph.cs

@@ -0,0 +1,40 @@
+// 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;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using System.Linq;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseGraph : TestCase
+    {
+        public override string Description => "graph";
+
+        public TestCaseGraph()
+        {
+            BarGraph graph;
+
+            Children = new[]
+            {
+                graph = new BarGraph
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(0.5f),
+                },
+            };
+
+            AddStep("values from 1-10", () => graph.Values = Enumerable.Range(1, 10).Select(i => (float)i));
+            AddStep("values from 1-100", () => graph.Values = Enumerable.Range(1, 100).Select(i => (float)i));
+            AddStep("reversed values from 1-10", () => graph.Values = Enumerable.Range(1, 10).Reverse().Select(i => (float)i));
+            AddStep("Bottom to top", () => graph.Direction = BarDirection.BottomToTop);
+            AddStep("Top to bottom", () => graph.Direction = BarDirection.TopToBottom);
+            AddStep("Left to right", () => graph.Direction = BarDirection.LeftToRight);
+            AddStep("Right to left", () => graph.Direction = BarDirection.RightToLeft);
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -1,45 +1,86 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Framework.Screens.Testing;
-using osu.Framework.Graphics;
-using osu.Framework.Timing;
 using OpenTK;
+using OpenTK.Graphics;
 using osu.Framework.Configuration;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Modes.Osu.Objects.Drawables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using OpenTK.Graphics;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using System.Collections.Generic;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseHitObjects : TestCase
+    internal class TestCaseHitObjects : TestCase
     {
-        public override string Name => @"Hit Objects";
+        private readonly FramedClock framedClock;
 
-        private StopwatchClock rateAdjustClock;
-        private FramedClock framedClock;
-
-        bool auto = false;
+        private bool auto;
 
         public TestCaseHitObjects()
         {
-            rateAdjustClock = new StopwatchClock(true);
+            var rateAdjustClock = new StopwatchClock(true);
             framedClock = new FramedClock(rateAdjustClock);
             playbackSpeed.ValueChanged += delegate { rateAdjustClock.Rate = playbackSpeed.Value; };
+
+            playbackSpeed.TriggerChange();
+
+            AddStep(@"circles", () => loadHitobjects(HitObjectType.Circle));
+            AddStep(@"slider", () => loadHitobjects(HitObjectType.Slider));
+            AddStep(@"spinner", () => loadHitobjects(HitObjectType.Spinner));
+
+            AddToggleStep(@"auto", state => { auto = state; loadHitobjects(mode); });
+
+            BasicSliderBar<double> sliderBar;
+            Add(new Container
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new SpriteText { Text = "Playback Speed" },
+                    sliderBar = new BasicSliderBar<double>
+                    {
+                        Width = 150,
+                        Height = 10,
+                        SelectionColor = Color4.Orange,
+                    }
+                }
+            });
+
+            sliderBar.Current.BindTo(playbackSpeed);
+
+            framedClock.ProcessFrame();
+
+            var clockAdjustContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Clock = framedClock,
+                Children = new[]
+                {
+                    playfieldContainer = new Container { RelativeSizeAxes = Axes.Both },
+                    approachContainer = new Container { RelativeSizeAxes = Axes.Both }
+                }
+            };
+
+            Add(clockAdjustContainer);
         }
 
-        HitObjectType mode = HitObjectType.Slider;
+        private HitObjectType mode = HitObjectType.Slider;
 
-        BindableNumber<double> playbackSpeed = new BindableDouble(0.5) { MinValue = 0, MaxValue = 1 };
-        private Container playfieldContainer;
-        private Container approachContainer;
+        private readonly BindableNumber<double> playbackSpeed = new BindableDouble(0.5) { MinValue = 0, MaxValue = 1 };
+        private readonly Container playfieldContainer;
+        private readonly Container approachContainer;
 
-        private void load(HitObjectType mode)
+        private void loadHitobjects(HitObjectType mode)
         {
             this.mode = mode;
 
@@ -63,12 +104,12 @@ namespace osu.Desktop.VisualTests.Tests
                     add(new DrawableSlider(new Slider
                     {
                         StartTime = framedClock.CurrentTime + 600,
-                        ControlPoints = new List<Vector2>()
+                        ControlPoints = new List<Vector2>
                         {
                             new Vector2(-200, 0),
                             new Vector2(400, 0),
                         },
-                        Length = 400,
+                        Distance = 400,
                         Position = new Vector2(-200, 0),
                         Velocity = 1,
                         TickDistance = 100,
@@ -78,54 +119,16 @@ namespace osu.Desktop.VisualTests.Tests
                     add(new DrawableSpinner(new Spinner
                     {
                         StartTime = framedClock.CurrentTime + 600,
-                        Length = 1000,
+                        EndTime = framedClock.CurrentTime + 1600,
                         Position = new Vector2(0, 0),
                     }));
                     break;
             }
         }
 
-        public override void Reset()
-        {
-            base.Reset();
+        private int depth;
 
-            playbackSpeed.TriggerChange();
-
-            AddButton(@"circles", () => load(HitObjectType.Circle));
-            AddButton(@"slider", () => load(HitObjectType.Slider));
-            AddButton(@"spinner", () => load(HitObjectType.Spinner));
-
-            AddToggle(@"auto", (state) => { auto = state; load(mode); });
-
-            ButtonsContainer.Add(new SpriteText { Text = "Playback Speed" });
-            ButtonsContainer.Add(new BasicSliderBar<double>
-            {
-                Width = 150,
-                Height = 10,
-                SelectionColor = Color4.Orange,
-                Bindable = playbackSpeed
-            });
-
-            framedClock.ProcessFrame();
-
-            var clockAdjustContainer = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Clock = framedClock,
-                Children = new[]
-                {
-                    playfieldContainer = new Container { RelativeSizeAxes = Axes.Both },
-                    approachContainer = new Container { RelativeSizeAxes = Axes.Both }
-                }
-            };
-
-            Add(clockAdjustContainer);
-
-            load(mode);
-        }
-
-        int depth;
-        void add(DrawableHitObject h)
+        private void add(DrawableOsuHitObject h)
         {
             h.Anchor = Anchor.Centre;
             h.Depth = depth++;
@@ -133,7 +136,7 @@ namespace osu.Desktop.VisualTests.Tests
             if (auto)
             {
                 h.State = ArmedState.Hit;
-                h.Judgement = new OsuJudgementInfo { Result = HitResult.Hit };
+                h.Judgement = new OsuJudgement { Result = HitResult.Hit };
             }
 
             playfieldContainer.Add(h);
@@ -141,5 +144,12 @@ namespace osu.Desktop.VisualTests.Tests
             if (proxyable != null)
                 approachContainer.Add(proxyable.ProxiedLayer.CreateProxy());
         }
+
+        private enum HitObjectType
+        {
+            Circle,
+            Slider,
+            Spinner
+        }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -1,30 +1,27 @@
 // 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.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Graphics;
 using OpenTK.Input;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Configuration;
+using osu.Framework.Graphics.Containers;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.MathUtils;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseKeyCounter : TestCase
+    internal class TestCaseKeyCounter : TestCase
     {
-        public override string Name => @"KeyCounter";
-
         public override string Description => @"Tests key counter";
 
-        public override void Reset()
+        public TestCaseKeyCounter()
         {
-            base.Reset();
-
             KeyCounterCollection kc = new KeyCounterCollection
             {
                 Origin = Anchor.Centre,
@@ -32,27 +29,41 @@ namespace osu.Desktop.VisualTests.Tests
                 IsCounting = true,
                 Children = new KeyCounter[]
                 {
-                    new KeyCounterKeyboard(@"Z", Key.Z),
-                    new KeyCounterKeyboard(@"X", Key.X),
-                    new KeyCounterMouse(@"M1", MouseButton.Left),
-                    new KeyCounterMouse(@"M2", MouseButton.Right),
+                    new KeyCounterKeyboard(Key.Z),
+                    new KeyCounterKeyboard(Key.X),
+                    new KeyCounterMouse(MouseButton.Left),
+                    new KeyCounterMouse(MouseButton.Right),
                 },
             };
             BindableInt bindable = new BindableInt { MinValue = 0, MaxValue = 200, Default = 50 };
             bindable.ValueChanged += delegate { kc.FadeTime = bindable.Value; };
-            AddButton("Add Random", () =>
+            AddStep("Add Random", () =>
             {
                 Key key = (Key)((int)Key.A + RNG.Next(26));
-                kc.Add(new KeyCounterKeyboard(key.ToString(), key));
+                kc.Add(new KeyCounterKeyboard(key));
             });
-            ButtonsContainer.Add(new SpriteText { Text = "FadeTime" });
-            ButtonsContainer.Add(new TestSliderBar<int>
+
+            TestSliderBar<int> sliderBar;
+
+            Add(new Container
             {
-                Width = 150,
-                Height = 10,
-                SelectionColor = Color4.Orange,
-                Bindable = bindable
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new SpriteText { Text = "FadeTime" },
+                    sliderBar = new TestSliderBar<int>
+                    {
+                        Width = 150,
+                        Height = 10,
+                        SelectionColor = Color4.Orange,
+                    }
+                }
             });
+
+            sliderBar.Current.BindTo(bindable);
+
             Add(kc);
         }
         private class TestSliderBar<T> : SliderBar<T> where T : struct
@@ -85,7 +96,7 @@ namespace osu.Desktop.VisualTests.Tests
             {
                 SelectionBox.ScaleTo(
                     new Vector2(value, 1),
-                    300, EasingTypes.OutQuint);
+                    300, Easing.OutQuint);
             }
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs

@@ -0,0 +1,223 @@
+// 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;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Select.Leaderboards;
+using osu.Game.Users;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseLeaderboard : TestCase
+    {
+        public override string Description => @"From song select";
+
+        private readonly Leaderboard leaderboard;
+
+        private void newScores()
+        {
+            var scores = new[]
+            {
+                new Score
+                {
+                    Rank = ScoreRank.XH,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 6602580,
+                        Username = @"waaiiru",
+                        Country = new Country
+                        {
+                            FullName = @"Spain",
+                            FlagName = @"ES",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.X,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 4608074,
+                        Username = @"Skycries",
+                        Country = new Country
+                        {
+                            FullName = @"Brazil",
+                            FlagName = @"BR",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.SH,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 1014222,
+                        Username = @"eLy",
+                        Country = new Country
+                        {
+                            FullName = @"Japan",
+                            FlagName = @"JP",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.S,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 1541390,
+                        Username = @"Toukai",
+                        Country = new Country
+                        {
+                            FullName = @"Canada",
+                            FlagName = @"CA",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.A,
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 2243452,
+                        Username = @"Satoruu",
+                        Country = new Country
+                        {
+                            FullName = @"Venezuela",
+                            FlagName = @"VE",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.B,
+                    Accuracy = 98.26,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 2705430,
+                        Username = @"Mooha",
+                        Country = new Country
+                        {
+                            FullName = @"France",
+                            FlagName = @"FR",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.C,
+                    Accuracy = 96.54,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 7151382,
+                        Username = @"Mayuri Hana",
+                        Country = new Country
+                        {
+                            FullName = @"Thailand",
+                            FlagName = @"TH",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.F,
+                    Accuracy = 60.25,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 2051389,
+                        Username = @"FunOrange",
+                        Country = new Country
+                        {
+                            FullName = @"Canada",
+                            FlagName = @"CA",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.F,
+                    Accuracy = 51.40,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 6169483,
+                        Username = @"-Hebel-",
+                        Country = new Country
+                        {
+                            FullName = @"Mexico",
+                            FlagName = @"MX",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Rank = ScoreRank.F,
+                    Accuracy = 42.22,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 6702666,
+                        Username = @"prhtnsm",
+                        Country = new Country
+                        {
+                            FullName = @"Germany",
+                            FlagName = @"DE",
+                        },
+                    },
+                },
+            };
+
+            leaderboard.Scores = scores;
+        }
+
+        public TestCaseLeaderboard()
+        {
+            Add(leaderboard = new Leaderboard
+            {
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                Size = new Vector2(550f, 450f),
+            });
+
+            AddStep(@"New Scores", newScores);
+            newScores();
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseManiaHitObjects.cs

@@ -0,0 +1,79 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using OpenTK.Graphics;
+using OpenTK;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseManiaHitObjects : TestCase
+    {
+        public TestCaseManiaHitObjects()
+        {
+            Add(new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Y,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(10, 0),
+                // Imagine that the containers containing the drawable notes are the "columns"
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        Name = "Normal note column",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 50,
+                        Children = new[]
+                        {
+                            new Container
+                            {
+                                Name = "Timing section",
+                                RelativeSizeAxes = Axes.Both,
+                                RelativeChildSize = new Vector2(1, 10000),
+                                Children = new[]
+                                {
+                                    new DrawableNote(new Note { StartTime = 5000 }) { AccentColour = Color4.Red },
+                                    new DrawableNote(new Note { StartTime = 6000 }) { AccentColour = Color4.Red }
+                                }
+                            }
+                        }
+                    },
+                    new Container
+                    {
+                        Name = "Hold note column",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 50,
+                        Children = new[]
+                        {
+                            new Container
+                            {
+                                Name = "Timing section",
+                                RelativeSizeAxes = Axes.Both,
+                                RelativeChildSize = new Vector2(1, 10000),
+                                Children = new[]
+                                {
+                                    new DrawableHoldNote(new HoldNote
+                                    {
+                                        StartTime = 5000,
+                                        Duration = 1000
+                                    }) { AccentColour = Color4.Red }
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs

@@ -0,0 +1,143 @@
+// 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.Input;
+using osu.Framework.Testing;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.UI;
+using System;
+using OpenTK;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Framework.Configuration;
+using OpenTK.Input;
+using osu.Framework.Timing;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using System.Linq;
+using osu.Game.Rulesets.Mania.Timing;
+using osu.Game.Rulesets.Timing;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseManiaPlayfield : TestCase
+    {
+        public override string Description => @"Mania playfield";
+
+        protected override double TimePerAction => 200;
+
+        public TestCaseManiaPlayfield()
+        {
+            Action<int, SpecialColumnPosition> createPlayfield = (cols, pos) =>
+            {
+                Clear();
+                Add(new ManiaPlayfield(cols)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    SpecialColumnPosition = pos,
+                    Scale = new Vector2(1, -1)
+                });
+            };
+
+            const double start_time = 500;
+            const double duration = 500;
+
+            Func<double, bool, SpeedAdjustmentContainer> createTimingChange = (time, gravity) => new ManiaSpeedAdjustmentContainer(new MultiplierControlPoint(time)
+            {
+                TimingPoint = { BeatLength = 1000 }
+            }, gravity ? ScrollingAlgorithm.Gravity : ScrollingAlgorithm.Basic);
+
+            Action<bool> createPlayfieldWithNotes = gravity =>
+            {
+                Clear();
+
+                var rateAdjustClock = new StopwatchClock(true) { Rate = 1 };
+
+                ManiaPlayfield playField;
+                Add(playField = new ManiaPlayfield(4)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(1, -1),
+                    Clock = new FramedClock(rateAdjustClock)
+                });
+
+                if (!gravity)
+                    playField.Columns.ForEach(c => c.Add(createTimingChange(0, false)));
+
+                for (double t = start_time; t <= start_time + duration; t += 100)
+                {
+                    if (gravity)
+                        playField.Columns.ElementAt(0).Add(createTimingChange(t, true));
+
+                    playField.Add(new DrawableNote(new Note
+                    {
+                        StartTime = t,
+                        Column = 0
+                    }, new Bindable<Key>(Key.D)));
+
+                    if (gravity)
+                        playField.Columns.ElementAt(3).Add(createTimingChange(t, true));
+
+                    playField.Add(new DrawableNote(new Note
+                    {
+                        StartTime = t,
+                        Column = 3
+                    }, new Bindable<Key>(Key.K)));
+                }
+
+                if (gravity)
+                    playField.Columns.ElementAt(1).Add(createTimingChange(start_time, true));
+
+                playField.Add(new DrawableHoldNote(new HoldNote
+                {
+                    StartTime = start_time,
+                    Duration = duration,
+                    Column = 1
+                }, new Bindable<Key>(Key.F)));
+
+                if (gravity)
+                    playField.Columns.ElementAt(2).Add(createTimingChange(start_time, true));
+
+                playField.Add(new DrawableHoldNote(new HoldNote
+                {
+                    StartTime = start_time,
+                    Duration = duration,
+                    Column = 2
+                }, new Bindable<Key>(Key.J)));
+            };
+
+            AddStep("1 column", () => createPlayfield(1, SpecialColumnPosition.Normal));
+            AddStep("4 columns", () => createPlayfield(4, SpecialColumnPosition.Normal));
+            AddStep("Left special style", () => createPlayfield(4, SpecialColumnPosition.Left));
+            AddStep("Right special style", () => createPlayfield(4, SpecialColumnPosition.Right));
+            AddStep("5 columns", () => createPlayfield(5, SpecialColumnPosition.Normal));
+            AddStep("8 columns", () => createPlayfield(8, SpecialColumnPosition.Normal));
+            AddStep("Left special style", () => createPlayfield(8, SpecialColumnPosition.Left));
+            AddStep("Right special style", () => createPlayfield(8, SpecialColumnPosition.Right));
+
+            AddStep("Notes with input", () => createPlayfieldWithNotes(false));
+            AddWaitStep((int)Math.Ceiling((start_time + duration) / TimePerAction));
+
+            AddStep("Notes with gravity", () => createPlayfieldWithNotes(true));
+            AddWaitStep((int)Math.Ceiling((start_time + duration) / TimePerAction));
+        }
+
+        private void triggerKeyDown(Column column)
+        {
+            column.TriggerOnKeyDown(new InputState(), new KeyDownEventArgs
+            {
+                Key = column.Key,
+                Repeat = false
+            });
+        }
+
+        private void triggerKeyUp(Column column)
+        {
+            column.TriggerOnKeyUp(new InputState(), new KeyUpEventArgs
+            {
+                Key = column.Key
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs

@@ -0,0 +1,27 @@
+// 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.Testing;
+using osu.Game.Overlays;
+using osu.Game.Users;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseMedalOverlay : TestCase
+    {
+        public override string Description => @"medal get!";
+
+        public TestCaseMedalOverlay()
+        {
+            AddStep(@"display", () =>
+            {
+                LoadComponentAsync(new MedalOverlay(new Medal
+                {
+                    Name = @"Animations",
+                    InternalName = @"all-intro-doubletime",
+                    Description = @"More complex than you think.",
+                }), Add);
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs

@@ -1,26 +1,23 @@
 // 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.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Menu;
 using OpenTK.Graphics;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseMenuButtonSystem : TestCase
+    internal class TestCaseMenuButtonSystem : TestCase
     {
-        public override string Name => @"ButtonSystem";
         public override string Description => @"Main menu button system";
 
-        public override void Reset()
+        public TestCaseMenuButtonSystem()
         {
-            base.Reset();
-
             Add(new Box
             {
-                ColourInfo = ColourInfo.GradientVertical(Color4.Gray, Color4.WhiteSmoke),
+                Colour = ColourInfo.GradientVertical(Color4.Gray, Color4.WhiteSmoke),
                 RelativeSizeAxes = Framework.Graphics.Axes.Both,
             });
             Add(new ButtonSystem());

osu.Desktop.VisualTests/Tests/TestCaseMenuOverlays.cs

@@ -0,0 +1,58 @@
+// 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.Graphics.Containers;
+using osu.Framework.Logging;
+using osu.Framework.Testing;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseMenuOverlays : TestCase
+    {
+        public override string Description => @"Tests pause and fail overlays";
+
+        public TestCaseMenuOverlays()
+        {
+            FailOverlay failOverlay;
+            PauseContainer.PauseOverlay pauseOverlay;
+
+            var retryCount = 0;
+
+            Add(pauseOverlay = new PauseContainer.PauseOverlay
+            {
+                OnResume = () => Logger.Log(@"Resume"),
+                OnRetry = () => Logger.Log(@"Retry"),
+                OnQuit = () => Logger.Log(@"Quit"),
+            });
+            Add(failOverlay = new FailOverlay
+            {
+                OnRetry = () => Logger.Log(@"Retry"),
+                OnQuit = () => Logger.Log(@"Quit"),
+            });
+
+            AddStep(@"Pause", delegate
+            {
+                if (failOverlay.State == Visibility.Visible)
+                {
+                    failOverlay.Hide();
+                }
+                pauseOverlay.Show();
+            });
+            AddStep("Fail", delegate
+            {
+                if (pauseOverlay.State == Visibility.Visible)
+                {
+                    pauseOverlay.Hide();
+                }
+                failOverlay.Show();
+            });
+            AddStep("Add Retry", delegate
+            {
+                retryCount++;
+                pauseOverlay.Retries = retryCount;
+                failOverlay.Retries = retryCount;
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseModSelectOverlay.cs

@@ -1,40 +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
-
-using osu.Framework.Graphics;
-using osu.Game.Overlays.Mods;
-using osu.Framework.Screens.Testing;
-using osu.Game.Modes;
-using osu.Game.Graphics;
-using osu.Framework.Allocation;
-using osu.Game.Overlays;
-
-namespace osu.Desktop.VisualTests.Tests
-{
-    class TestCaseModSelectOverlay : TestCase
-    {
-        public override string Name => @"Mod Select";
-
-        public override string Description => @"Tests the mod select overlay";
-
-        private ModSelectOverlay modSelect;
-
-        public override void Reset()
-        {
-            base.Reset();
-
-            Add(modSelect = new ModSelectOverlay
-            {
-                RelativeSizeAxes = Axes.X,
-                Origin = Anchor.BottomCentre,
-                Anchor = Anchor.BottomCentre,
-            });
-
-            AddButton("Toggle", modSelect.ToggleVisibility);
-            AddButton("osu!", () => modSelect.PlayMode.Value = PlayMode.Osu);
-            AddButton("osu!taiko", () => modSelect.PlayMode.Value = PlayMode.Taiko);
-            AddButton("osu!catch", () => modSelect.PlayMode.Value = PlayMode.Catch);
-            AddButton("osu!mania", () => modSelect.PlayMode.Value = PlayMode.Mania);
-        }
-    }
-}

osu.Desktop.VisualTests/Tests/TestCaseMods.cs

@@ -0,0 +1,57 @@
+// 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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Overlays.Mods;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Play.HUD;
+using OpenTK;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseMods : TestCase
+    {
+        public override string Description => @"Mod select overlay and in-game display";
+
+        private ModSelectOverlay modSelect;
+        private ModDisplay modDisplay;
+
+        private RulesetStore rulesets;
+
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            this.rulesets = rulesets;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Add(modSelect = new ModSelectOverlay
+            {
+                RelativeSizeAxes = Axes.X,
+                Origin = Anchor.BottomCentre,
+                Anchor = Anchor.BottomCentre,
+            });
+
+            Add(modDisplay = new ModDisplay
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                AutoSizeAxes = Axes.Both,
+                Position = new Vector2(0, 25),
+            });
+
+            modDisplay.Current.BindTo(modSelect.SelectedMods);
+
+            AddStep("Toggle", modSelect.ToggleVisibility);
+
+            foreach (var ruleset in rulesets.AllRulesets)
+                AddStep(ruleset.CreateInstance().Description, () => modSelect.Ruleset.Value = ruleset);
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs

@@ -1,37 +1,44 @@
 // 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.Screens.Testing;
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Framework.Timing;
-using osu.Game.Overlays;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseMusicController : TestCase
+    internal class TestCaseMusicController : TestCase
     {
-        public override string Name => @"Music Controller";
         public override string Description => @"Tests music controller ui.";
 
-        private MusicController mc;
+        private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
 
         public TestCaseMusicController()
         {
             Clock = new FramedClock();
-        }
 
-        public override void Reset()
-        {
-            base.Reset();
-            Clock.ProcessFrame();
-            mc = new MusicController
+            var mc = new MusicController
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre
             };
             Add(mc);
-            AddToggle(@"Show", (state) => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+
+            AddToggleStep(@"toggle visibility", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+            AddStep(@"show", () => mc.State = Visibility.Visible);
+            AddToggleStep(@"toggle beatmap lock", state => beatmapBacking.Disabled = state);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuGameBase game)
+        {
+            beatmapBacking.BindTo(game.Beatmap);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseNotificationOverlay.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.MathUtils;
 using osu.Game.Overlays;
 using System.Linq;
@@ -12,32 +12,29 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseNotificationManager : TestCase
+    internal class TestCaseNotificationOverlay : TestCase
     {
-        public override string Name => @"Notification Manager";
         public override string Description => @"I handle notifications";
 
-        NotificationManager manager;
+        private readonly NotificationOverlay manager;
 
-        public override void Reset()
+        public TestCaseNotificationOverlay()
         {
-            base.Reset();
-
             progressingNotifications.Clear();
 
-            Content.Add(manager = new NotificationManager
+            Content.Add(manager = new NotificationOverlay
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
             });
 
-            AddToggle(@"show", (state) => manager.State = state ? Visibility.Visible : Visibility.Hidden);
+            AddToggleStep(@"show", state => manager.State = state ? Visibility.Visible : Visibility.Hidden);
 
-            AddButton(@"simple #1", sendNotification1);
-            AddButton(@"simple #2", sendNotification2);
-            AddButton(@"progress #1", sendProgress1);
-            AddButton(@"progress #2", sendProgress2);
-            AddButton(@"barrage", () => sendBarrage());
+            AddStep(@"simple #1", sendNotification1);
+            AddStep(@"simple #2", sendNotification2);
+            AddStep(@"progress #1", sendProgress1);
+            AddStep(@"progress #2", sendProgress2);
+            AddStep(@"barrage", () => sendBarrage());
         }
 
         private void sendBarrage(int remaining = 100)
@@ -59,10 +56,7 @@ namespace osu.Desktop.VisualTests.Tests
             }
 
             if (remaining > 0)
-            {
-                Delay(80);
-                Schedule(() => sendBarrage(remaining - 1));
-            }
+                Scheduler.AddDelayed(() => sendBarrage(remaining - 1), 80);
         }
 
         protected override void Update()
@@ -96,7 +90,7 @@ namespace osu.Desktop.VisualTests.Tests
             progressingNotifications.Add(n);
         }
 
-        List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
+        private readonly List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
 
         private void sendProgress1()
         {

osu.Desktop.VisualTests/Tests/TestCaseOnScreenDisplay.cs

@@ -0,0 +1,47 @@
+// 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.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Testing;
+using osu.Game.Overlays;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseOnScreenDisplay : TestCase
+    {
+        private FrameworkConfigManager config;
+        private Bindable<FrameSync> frameSyncMode;
+
+        public override string Description => @"Make it easier to see setting changes";
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Add(new OnScreenDisplay());
+
+            frameSyncMode = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync);
+
+            FrameSync initial = frameSyncMode.Value;
+
+            AddRepeatStep(@"Change frame limiter", setNextMode, 3);
+
+            AddStep(@"Restore frame limiter", () => frameSyncMode.Value = initial);
+        }
+
+        private void setNextMode()
+        {
+            var nextMode = frameSyncMode.Value + 1;
+            if (nextMode > FrameSync.Unlimited)
+                nextMode = FrameSync.VSync;
+            frameSyncMode.Value = nextMode;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(FrameworkConfigManager config)
+        {
+            this.config = config;
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseOptions.cs

@@ -1,25 +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
-
-using osu.Framework.Screens.Testing;
-using osu.Game.Overlays;
-
-namespace osu.Desktop.VisualTests.Tests
-{
-    class TestCaseOptions : TestCase
-    {
-        public override string Name => @"Options";
-
-        public override string Description => @"Tests the options overlay";
-
-        private OptionsOverlay options;
-
-        public override void Reset()
-        {
-            base.Reset();
-
-            Children = new[] { options = new OptionsOverlay() };
-            options.ToggleVisibility();
-        }
-    }
-}

osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs

@@ -1,40 +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
-
-using osu.Framework.Logging;
-using osu.Framework.Screens.Testing;
-using osu.Game.Screens.Play;
-
-namespace osu.Desktop.VisualTests.Tests
-{
-    class TestCasePauseOverlay : TestCase
-    {
-        public override string Name => @"PauseOverlay";
-
-        public override string Description => @"Tests the pause overlay";
-
-        private PauseOverlay pauseOverlay;
-        private int retryCount;
-
-        public override void Reset()
-        {
-            base.Reset();
-
-            Add(pauseOverlay = new PauseOverlay
-            {
-                Depth = -1,
-                OnResume = () => Logger.Log(@"Resume"),
-                OnRetry = () => Logger.Log(@"Retry"),
-                OnQuit = () => Logger.Log(@"Quit")
-            });
-            AddButton("Pause", pauseOverlay.Show);
-            AddButton("Add Retry", delegate
-            {
-                retryCount++;
-                pauseOverlay.Retries = retryCount;
-            });
-
-            retryCount = 0;
-        }
-    }
-}

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -1,61 +1,50 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System; 
 using System.Collections.Generic;
 using osu.Desktop.VisualTests.Platform;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.MathUtils;
+using osu.Game.Beatmaps;
 using osu.Game.Database;
-using osu.Game.Modes;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCasePlaySongSelect : TestCase
+    internal class TestCasePlaySongSelect : TestCase
     {
-        private BeatmapDatabase db, oldDb;
-        private TestStorage storage;
-        private PlaySongSelect songSelect;
+        private readonly BeatmapManager manager;
 
-        public override string Name => @"Song Select";
         public override string Description => @"with fake data";
 
-        public override void Reset()
-        {
-            base.Reset();
-            oldDb = Dependencies.Get<BeatmapDatabase>();
-            if (db == null)
-            {
-                storage = new TestStorage(@"TestCasePlaySongSelect");
-                db = new BeatmapDatabase(storage);
-                Dependencies.Cache(db, true);
+        private readonly RulesetStore rulesets;
 
-                var sets = new List<BeatmapSetInfo>();
+        public TestCasePlaySongSelect()
+        {
+            PlaySongSelect songSelect;
+
+            if (manager == null)
+            {
+                var storage = new TestStorage(@"TestCasePlaySongSelect");
+
+                var backingDatabase = storage.GetDatabase(@"client");
+                backingDatabase.CreateTable<StoreVersion>();
+
+                rulesets = new RulesetStore(backingDatabase);
+                manager = new BeatmapManager(storage, null, backingDatabase, rulesets);
 
                 for (int i = 0; i < 100; i += 10)
-                    sets.Add(createTestBeatmapSet(i));
-
-                db.Import(sets);
+                    manager.Import(createTestBeatmapSet(i));
             }
 
             Add(songSelect = new PlaySongSelect());
 
-            AddButton(@"Sort by Artist", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Artist; });
-            AddButton(@"Sort by Title", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Title; });
-            AddButton(@"Sort by Author", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Author; });
-            AddButton(@"Sort by Difficulty", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Difficulty; });
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            if (oldDb != null)
-            {
-                Dependencies.Cache(oldDb, true);
-                db = null;
-            }
-
-            base.Dispose(isDisposing);
+            AddStep(@"Sort by Artist", delegate { songSelect.FilterControl.Sort = SortMode.Artist; });
+            AddStep(@"Sort by Title", delegate { songSelect.FilterControl.Sort = SortMode.Title; });
+            AddStep(@"Sort by Author", delegate { songSelect.FilterControl.Sort = SortMode.Author; });
+            AddStep(@"Sort by Difficulty", delegate { songSelect.FilterControl.Sort = SortMode.Difficulty; });
         }
 
         private BeatmapSetInfo createTestBeatmapSet(int i)
@@ -64,7 +53,6 @@ namespace osu.Desktop.VisualTests.Tests
             {
                 OnlineBeatmapSetID = 1234 + i,
                 Hash = "d8e8fca2dc0f896fd7cb4cb0031ba249",
-                Path = string.Empty,
                 Metadata = new BeatmapMetadata
                 {
                     OnlineBeatmapSetID = 1234 + i,
@@ -78,10 +66,10 @@ namespace osu.Desktop.VisualTests.Tests
                     new BeatmapInfo
                     {
                         OnlineBeatmapID = 1234 + i,
-                        Mode = PlayMode.Osu,
+                        Ruleset = rulesets.Query<RulesetInfo>().First(),
                         Path = "normal.osu",
                         Version = "Normal",
-                        BaseDifficulty = new BaseDifficulty
+                        Difficulty = new BeatmapDifficulty
                         {
                             OverallDifficulty = 3.5f,
                         }
@@ -89,10 +77,10 @@ namespace osu.Desktop.VisualTests.Tests
                     new BeatmapInfo
                     {
                         OnlineBeatmapID = 1235 + i,
-                        Mode = PlayMode.Osu,
+                        Ruleset = rulesets.Query<RulesetInfo>().First(),
                         Path = "hard.osu",
                         Version = "Hard",
-                        BaseDifficulty = new BaseDifficulty
+                        Difficulty = new BeatmapDifficulty
                         {
                             OverallDifficulty = 5,
                         }
@@ -100,10 +88,10 @@ namespace osu.Desktop.VisualTests.Tests
                     new BeatmapInfo
                     {
                         OnlineBeatmapID = 1236 + i,
-                        Mode = PlayMode.Osu,
+                        Ruleset = rulesets.Query<RulesetInfo>().First(),
                         Path = "insane.osu",
                         Version = "Insane",
-                        BaseDifficulty = new BaseDifficulty
+                        Difficulty = new BeatmapDifficulty
                         {
                             OverallDifficulty = 7,
                         }

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -3,104 +3,86 @@
 
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Formats;
 using OpenTK;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps.IO;
-using osu.Game.Database;
-using osu.Game.Modes;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Play;
 using OpenTK.Graphics;
+using osu.Desktop.VisualTests.Beatmaps;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCasePlayer : TestCase
+    internal class TestCasePlayer : TestCase
     {
-        private WorkingBeatmap beatmap;
-        public override string Name => @"Player";
+        protected Player Player;
+        private RulesetStore rulesets;
 
         public override string Description => @"Showing everything to play the game.";
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDatabase db)
+        private void load(RulesetStore rulesets)
         {
-            var beatmapInfo = db.Query<BeatmapInfo>().Where(b => b.Mode == PlayMode.Osu).FirstOrDefault();
-            if (beatmapInfo != null)
-                beatmap = db.GetWorkingBeatmap(beatmapInfo);
+            this.rulesets = rulesets;
         }
 
-        public override void Reset()
+        protected override void LoadComplete()
         {
-            base.Reset();
+            base.LoadComplete();
 
-            if (beatmap?.Track == null)
+            var objects = new List<HitObject>();
+
+            int time = 1500;
+            for (int i = 0; i < 50; i++)
             {
-                var objects = new List<HitObject>();
-
-                int time = 1500;
-                for (int i = 0; i < 50; i++)
+                objects.Add(new HitCircle
                 {
-                    objects.Add(new HitCircle()
-                    {
-                        StartTime = time,
-                        Position = new Vector2(i % 4 == 0 || i % 4 == 2 ? 0 : 512,
-                        i % 4 < 2 ? 0 : 384),
-                        NewCombo = i % 4 == 0
-                    });
+                    StartTime = time,
+                    Position = new Vector2(i % 4 == 0 || i % 4 == 2 ? 0 : OsuPlayfield.BASE_SIZE.X,
+                    i % 4 < 2 ? 0 : OsuPlayfield.BASE_SIZE.Y),
+                    NewCombo = i % 4 == 0
+                });
 
-                    time += 500;
-                }
-
-                var decoder = new ConstructableBeatmapDecoder();
-
-                Beatmap b = new Beatmap
-                {
-                    HitObjects = objects,
-                    BeatmapInfo = new BeatmapInfo
-                    {
-                        Metadata = new BeatmapMetadata
-                        {
-                            Artist = @"Unknown",
-                            Title = @"Sample Beatmap",
-                            Author = @"peppy",
-                        }
-                    }
-                };
-
-                decoder.Process(b);
-
-                beatmap = new TestWorkingBeatmap(b);
+                time += 500;
             }
 
+            Beatmap b = new Beatmap
+            {
+                HitObjects = objects,
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Difficulty = new BeatmapDifficulty(),
+                    Ruleset = rulesets.Query<RulesetInfo>().First(),
+                    Metadata = new BeatmapMetadata
+                    {
+                        Artist = @"Unknown",
+                        Title = @"Sample Beatmap",
+                        Author = @"peppy",
+                    }
+                }
+            };
+
+            WorkingBeatmap beatmap = new TestWorkingBeatmap(b);
+
             Add(new Box
             {
                 RelativeSizeAxes = Framework.Graphics.Axes.Both,
                 Colour = Color4.Black,
             });
 
-            Add(new PlayerLoader(new Player
-            {
-                PreferredPlayMode = PlayMode.Osu,
-                Beatmap = beatmap
-            })
-            {
-                Beatmap = beatmap
-            });
+            Add(Player = CreatePlayer(beatmap));
         }
 
-        class TestWorkingBeatmap : WorkingBeatmap
+        protected virtual Player CreatePlayer(WorkingBeatmap beatmap)
         {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+            return new Player
             {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
+                InitialBeatmap = beatmap
+            };
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseReplay.cs

@@ -0,0 +1,22 @@
+// 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.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseReplay : TestCasePlayer
+    {
+        public override string Description => @"Testing replay playback.";
+
+        protected override Player CreatePlayer(WorkingBeatmap beatmap)
+        {
+            beatmap.Mods.Value = new Mod[] { new OsuModAutoplay() };
+
+            return base.CreatePlayer(beatmap);
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs

@@ -0,0 +1,53 @@
+// 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.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.ReplaySettings;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseReplaySettingsOverlay : TestCase
+    {
+        public override string Description => @"Settings visible in replay/auto";
+
+        public TestCaseReplaySettingsOverlay()
+        {
+            ExampleContainer container;
+
+            Add(new ReplaySettingsOverlay
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+            });
+
+            Add(container = new ExampleContainer());
+
+            AddStep(@"Add button", () => container.Add(new OsuButton
+            {
+                RelativeSizeAxes = Axes.X,
+                Text = @"Button",
+            }));
+
+            AddStep(@"Add checkbox", () => container.Add(new ReplayCheckbox
+            {
+                LabelText = "Checkbox",
+            }));
+
+            AddStep(@"Add textbox", () => container.Add(new FocusedTextBox
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 30,
+                PlaceholderText = "Textbox",
+                HoldFocus = false,
+            }));
+        }
+
+        private class ExampleContainer : ReplayGroup
+        {
+            protected override string Title => @"example";
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseResults.cs

@@ -0,0 +1,64 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Ranking;
+using osu.Game.Users;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseResults : TestCase
+    {
+        private BeatmapManager beatmaps;
+
+        public override string Description => @"Results after playing.";
+
+        [BackgroundDependencyLoader]
+        private void load(BeatmapManager beatmaps)
+        {
+            this.beatmaps = beatmaps;
+        }
+
+        private WorkingBeatmap beatmap;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (beatmap == null)
+            {
+                var beatmapInfo = beatmaps.QueryBeatmap(b => b.RulesetID == 0);
+                if (beatmapInfo != null)
+                    beatmap = beatmaps.GetWorkingBeatmap(beatmapInfo);
+            }
+
+            Add(new Results(new Score
+            {
+                TotalScore = 2845370,
+                Accuracy = 0.98,
+                MaxCombo = 123,
+                Rank = ScoreRank.A,
+                Date = DateTimeOffset.Now,
+                Statistics = new Dictionary<string, dynamic>
+                {
+                    { "300", 50 },
+                    { "100", 20 },
+                    { "50", 50 },
+                    { "x", 1 }
+                },
+                User = new User
+                {
+                    Username = "peppy",
+                }
+            })
+            {
+                InitialBeatmap = beatmap
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs

@@ -0,0 +1,144 @@
+// 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.Testing;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Multiplayer;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Users;
+using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseRoomInspector : TestCase
+    {
+        public override string Description => @"from the multiplayer lobby";
+
+        private RulesetStore rulesets;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            var room = new Room
+            {
+                Name = { Value = @"My Awesome Room" },
+                Host = { Value = new User { Username = @"flyte", Id = 3103765, Country = new Country { FlagName = @"JP" } } },
+                Status = { Value = new RoomStatusOpen() },
+                Type = { Value = new GameTypeTeamVersus() },
+                Beatmap =
+                {
+                    Value = new BeatmapInfo
+                    {
+                        StarDifficulty = 3.7,
+                        Ruleset = rulesets.GetRuleset(3),
+                        Metadata = new BeatmapMetadata
+                        {
+                            Title = @"Platina",
+                            Artist = @"Maaya Sakamoto",
+                            Author = @"uwutm8",
+                        },
+                        BeatmapSet = new BeatmapSetInfo
+                        {
+                            OnlineInfo = new BeatmapSetOnlineInfo
+                            {
+                                Covers = new BeatmapSetOnlineCovers
+                                {
+                                    Cover = @"https://assets.ppy.sh/beatmaps/560573/covers/cover.jpg?1492722343",
+                                },
+                            },
+                        },
+                    }
+                },
+                MaxParticipants = { Value = 200 },
+                Participants =
+                {
+                    Value = new[]
+                    {
+                        new User { Username = @"flyte", Id = 3103765, GlobalRank = 1425 },
+                        new User { Username = @"Cookiezi", Id = 124493, GlobalRank = 5466 },
+                        new User { Username = @"Angelsim", Id = 1777162, GlobalRank = 2873 },
+                        new User { Username = @"Rafis", Id = 2558286, GlobalRank = 4687 },
+                        new User { Username = @"hvick225", Id = 50265, GlobalRank = 3258 },
+                        new User { Username = @"peppy", Id = 2, GlobalRank = 6251 }
+                    }
+                }
+            };
+
+            RoomInspector inspector;
+            Add(inspector = new RoomInspector
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Room = room,
+            });
+
+            AddStep(@"change title", () => room.Name.Value = @"A Better Room Than The Above");
+            AddStep(@"change host", () => room.Host.Value = new User { Username = @"DrabWeb", Id = 6946022, Country = new Country { FlagName = @"CA" } });
+            AddStep(@"change status", () => room.Status.Value = new RoomStatusPlaying());
+            AddStep(@"change type", () => room.Type.Value = new GameTypeTag());
+            AddStep(@"change beatmap", () => room.Beatmap.Value = null);
+            AddStep(@"change max participants", () => room.MaxParticipants.Value = null);
+            AddStep(@"change participants", () => room.Participants.Value = new[]
+            {
+                new User { Username = @"filsdelama", Id = 2831793, GlobalRank = 8542 },
+                new User { Username = @"_index", Id = 652457, GlobalRank = 15024 }
+            });
+
+            AddStep(@"change room", () =>
+            {
+                var newRoom = new Room
+                {
+                    Name = { Value = @"My New, Better Than Ever Room" },
+                    Host = { Value = new User { Username = @"Angelsim", Id = 1777162, Country = new Country { FlagName = @"KR" } } },
+                    Status = { Value = new RoomStatusOpen() },
+                    Type = { Value = new GameTypeTagTeam() },
+                    Beatmap =
+                    {
+                        Value = new BeatmapInfo
+                        {
+                            StarDifficulty = 7.07,
+                            Ruleset = rulesets.GetRuleset(0),
+                            Metadata = new BeatmapMetadata
+                            {
+                                Title = @"FREEDOM DIVE",
+                                Artist = @"xi",
+                                Author = @"Nakagawa-Kanon",
+                            },
+                            BeatmapSet = new BeatmapSetInfo
+                            {
+                                OnlineInfo = new BeatmapSetOnlineInfo
+                                {
+                                    Covers = new BeatmapSetOnlineCovers
+                                    {
+                                        Cover = @"https://assets.ppy.sh/beatmaps/39804/covers/cover.jpg?1456506845",
+                                    },
+                                },
+                            },
+                        },
+                    },
+                    MaxParticipants = { Value = 10 },
+                    Participants =
+                    {
+                        Value = new[]
+                        {
+                            new User { Username = @"Angelsim", Id = 1777162, GlobalRank = 4 },
+                            new User { Username = @"HappyStick", Id = 256802, GlobalRank = 752 },
+                            new User { Username = @"-Konpaku-", Id = 2258797, GlobalRank = 571 }
+                        }
+                    }
+                };
+
+                inspector.Room = newRoom;
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            this.rulesets = rulesets;
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -1,101 +1,56 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using osu.Framework.Screens.Testing;
+using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
+using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Modes.Catch.UI;
-using osu.Game.Modes.Mania.UI;
-using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.Taiko.UI;
-using osu.Game.Modes.UI;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Graphics.Primitives;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseScoreCounter : TestCase
+    internal class TestCaseScoreCounter : TestCase
     {
-        public override string Name => @"ScoreCounter";
-
         public override string Description => @"Tests multiple counters";
 
-        public override void Reset()
+        public TestCaseScoreCounter()
         {
-            base.Reset();
-
             int numerator = 0, denominator = 0;
 
-            bool maniaHold = false;
-
             ScoreCounter score = new ScoreCounter(7)
             {
                 Origin = Anchor.TopRight,
                 Anchor = Anchor.TopRight,
                 TextSize = 40,
-                Count = 0,
                 Margin = new MarginPadding(20),
             };
             Add(score);
 
-            ComboCounter standardCombo = new OsuComboCounter
+            ComboCounter comboCounter = new StandardComboCounter
             {
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Margin = new MarginPadding(10),
-                Count = 0,
                 TextSize = 40,
             };
-            Add(standardCombo);
+            Add(comboCounter);
 
-            CatchComboCounter catchCombo = new CatchComboCounter
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Count = 0,
-                TextSize = 40,
-            };
-            Add(catchCombo);
-
-            ComboCounter taikoCombo = new TaikoComboCounter
-            {
-                Origin = Anchor.BottomCentre,
-                Anchor = Anchor.Centre,
-                Position = new Vector2(0, -160),
-                Count = 0,
-                TextSize = 40,
-            };
-            Add(taikoCombo);
-
-            ManiaComboCounter maniaCombo = new ManiaComboCounter
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Position = new Vector2(0, -80),
-                Count = 0,
-                TextSize = 40,
-            };
-            Add(maniaCombo);
-
-
-            PercentageCounter accuracyCombo = new PercentageCounter
+            PercentageCounter accuracyCounter = new PercentageCounter
             {
                 Origin = Anchor.TopRight,
                 Anchor = Anchor.TopRight,
                 Position = new Vector2(-20, 60),
             };
-            Add(accuracyCombo);
+            Add(accuracyCounter);
 
             StarCounter stars = new StarCounter
             {
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Position = new Vector2(20, -160),
-                Count = 5,
+                CountStars = 5,
             };
             Add(stars);
 
@@ -104,72 +59,47 @@ namespace osu.Desktop.VisualTests.Tests
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Position = new Vector2(20, -190),
-                Text = stars.Count.ToString("0.00"),
+                Text = stars.CountStars.ToString("0.00"),
             };
             Add(starsLabel);
 
-            AddButton(@"Reset all", delegate
+            AddStep(@"Reset all", delegate
             {
-                score.Count = 0;
-                standardCombo.Count = 0;
-                taikoCombo.Count = 0;
-                maniaCombo.Count = 0;
-                catchCombo.Count = 0;
+                score.Current.Value = 0;
+                comboCounter.Current.Value = 0;
                 numerator = denominator = 0;
-                accuracyCombo.SetFraction(0, 0);
-                stars.Count = 0;
-                starsLabel.Text = stars.Count.ToString("0.00");
+                accuracyCounter.SetFraction(0, 0);
+                stars.CountStars = 0;
+                starsLabel.Text = stars.CountStars.ToString("0.00");
             });
 
-            AddButton(@"Hit! :D", delegate
+            AddStep(@"Hit! :D", delegate
             {
-                score.Count += 300 + (ulong)(300.0 * (standardCombo.Count > 0 ? standardCombo.Count - 1 : 0) / 25.0);
-                standardCombo.Count++;
-                taikoCombo.Count++;
-                maniaCombo.Count++;
-                catchCombo.CatchFruit(new Color4(
-                    Math.Max(0.5f, RNG.NextSingle()),
-                    Math.Max(0.5f, RNG.NextSingle()),
-                    Math.Max(0.5f, RNG.NextSingle()),
-                    1)
-                );
-                numerator++; denominator++;
-                accuracyCombo.SetFraction(numerator, denominator);
-            });
-
-            AddButton(@"miss...", delegate
-            {
-                standardCombo.Roll();
-                taikoCombo.Roll();
-                maniaCombo.Roll();
-                catchCombo.Roll();
+                score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current > 0 ? comboCounter.Current - 1 : 0) / 25.0);
+                comboCounter.Increment();
+                numerator++;
                 denominator++;
-                accuracyCombo.SetFraction(numerator, denominator);
+                accuracyCounter.SetFraction(numerator, denominator);
             });
 
-            AddButton(@"mania hold", delegate
+            AddStep(@"miss...", delegate
             {
-                if (!maniaHold)
-                    maniaCombo.HoldStart();
-                else
-                    maniaCombo.HoldEnd();
-                maniaHold = !maniaHold;
+                comboCounter.Current.Value = 0;
+                denominator++;
+                accuracyCounter.SetFraction(numerator, denominator);
             });
 
-            AddButton(@"Alter stars", delegate
+            AddStep(@"Alter stars", delegate
             {
-                stars.Count = RNG.NextSingle() * (stars.StarCount + 1);
-                starsLabel.Text = stars.Count.ToString("0.00");
+                stars.CountStars = RNG.NextSingle() * (stars.StarCount + 1);
+                starsLabel.Text = stars.CountStars.ToString("0.00");
             });
 
-            AddButton(@"Stop counters", delegate
+            AddStep(@"Stop counters", delegate
             {
                 score.StopRolling();
-                standardCombo.StopRolling();
-                catchCombo.StopRolling();
-                taikoCombo.StopRolling();
-                maniaCombo.StopRolling();
-                accuracyCombo.StopRolling();
+                comboCounter.StopRolling();
+                accuracyCounter.StopRolling();
                 stars.StopAnimation();
             });
         }

osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs

@@ -0,0 +1,210 @@
+// 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;
+using OpenTK.Graphics;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Timing;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    public class TestCaseScrollingHitObjects : TestCase
+    {
+        public override string Description => "SpeedAdjustmentContainer/DrawableTimingSection";
+
+        private readonly BindableDouble timeRangeBindable;
+        private readonly OsuSpriteText bottomLabel;
+        private readonly SpriteText topTime;
+        private readonly SpriteText bottomTime;
+
+        public TestCaseScrollingHitObjects()
+        {
+            OsuSpriteText timeRangeText;
+            SpeedAdjustmentCollection adjustmentCollection;
+
+            timeRangeBindable = new BindableDouble(2000)
+            {
+                MinValue = 200,
+                MaxValue = 4000,
+            };
+
+            SliderBar<double> timeRange;
+            Add(timeRange = new BasicSliderBar<double>
+            {
+                Size = new Vector2(200, 20),
+                SelectionColor = Color4.Pink,
+                KeyboardStep = 100
+            });
+
+            Add(timeRangeText = new OsuSpriteText
+            {
+                X = 210,
+                TextSize = 16,
+            });
+
+            timeRange.Current.BindTo(timeRangeBindable);
+            timeRangeBindable.ValueChanged += v => timeRangeText.Text = $"Visible Range: {v:#,#.#}";
+            timeRangeBindable.ValueChanged += v => bottomLabel.Text = $"t minus {v:#,#}";
+
+            AddRange(new Drawable[]
+            {
+                new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(100, 500),
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0.25f
+                        },
+                        adjustmentCollection = new SpeedAdjustmentCollection(Axes.Y)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            VisibleTimeRange = timeRangeBindable,
+                            Masking = true,
+                        },
+                        new OsuSpriteText
+                        {
+                            Text = "t minus 0",
+                            Margin = new MarginPadding(2),
+                            TextSize = 14,
+                            Anchor = Anchor.TopRight,
+                        },
+                        bottomLabel = new OsuSpriteText
+                        {
+                            Text = "t minus x",
+                            Margin = new MarginPadding(2),
+                            TextSize = 14,
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomLeft,
+                        },
+                        topTime = new OsuSpriteText
+                        {
+                            Margin = new MarginPadding(2),
+                            TextSize = 14,
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopRight,
+                        },
+                        bottomTime = new OsuSpriteText
+                        {
+                            Margin = new MarginPadding(2),
+                            TextSize = 14,
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomRight,
+                        },
+                    }
+                }
+            });
+
+            timeRangeBindable.TriggerChange();
+
+            adjustmentCollection.Add(new TestSpeedAdjustmentContainer(new MultiplierControlPoint()));
+
+            AddStep("Add hit object", () => adjustmentCollection.Add(new TestDrawableHitObject(new HitObject { StartTime = Time.Current + 2000 })));
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            topTime.Text = Time.Current.ToString("#,#");
+            bottomTime.Text = (Time.Current + timeRangeBindable.Value).ToString("#,#");
+        }
+
+        private class TestSpeedAdjustmentContainer : SpeedAdjustmentContainer
+        {
+            public override bool RemoveWhenNotAlive => false;
+
+            public TestSpeedAdjustmentContainer(MultiplierControlPoint controlPoint)
+                : base(controlPoint)
+            {
+            }
+
+            protected override DrawableTimingSection CreateTimingSection() => new TestDrawableTimingSection(ControlPoint);
+
+            private class TestDrawableTimingSection : DrawableTimingSection
+            {
+                private readonly MultiplierControlPoint controlPoint;
+
+                public TestDrawableTimingSection(MultiplierControlPoint controlPoint)
+                {
+                    this.controlPoint = controlPoint;
+                }
+
+                protected override void Update()
+                {
+                    base.Update();
+
+                    Y = (float)(controlPoint.StartTime - Time.Current);
+                }
+            }
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject, IScrollingHitObject
+        {
+            private readonly Box background;
+            private const float height = 14;
+
+            public BindableDouble LifetimeOffset { get; } = new BindableDouble();
+
+            public TestDrawableHitObject(HitObject hitObject)
+                : base(hitObject)
+            {
+                AutoSizeAxes = Axes.Y;
+                RelativeSizeAxes = Axes.X;
+                RelativePositionAxes = Axes.Y;
+
+                Y = (float)hitObject.StartTime;
+
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = height,
+                    },
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Colour = Color4.Cyan,
+                        Height = 1,
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Colour = Color4.Black,
+                        TextSize = height,
+                        Font = @"Exo2.0-BoldItalic",
+                        Text = $"{hitObject.StartTime:#,#}"
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                this.FadeInFromZero(250, Easing.OutQuint);
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                if (Time.Current >= HitObject.StartTime)
+                    background.Colour = Color4.Red;
+            }
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseSettings.cs

@@ -0,0 +1,26 @@
+// 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.Testing;
+using osu.Game.Overlays;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseSettings : TestCase
+    {
+        public override string Description => @"Tests the settings overlay";
+
+        private readonly SettingsOverlay settings;
+
+        public TestCaseSettings()
+        {
+            Children = new[] { settings = new SettingsOverlay() };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            settings.ToggleVisibility();
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs

@@ -0,0 +1,20 @@
+// 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.Testing;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseSkipButton : TestCase
+    {
+        public override string Description => @"Skip skip skippediskip";
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Add(new SkipButton(Clock.CurrentTime + 5000));
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseSocial.cs

@@ -0,0 +1,83 @@
+// 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.Testing;
+using osu.Game.Overlays;
+using osu.Game.Users;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    public class TestCaseSocial : TestCase
+    {
+        public override string Description => @"social browser overlay";
+
+        public TestCaseSocial()
+        {
+            SocialOverlay s = new SocialOverlay
+            {
+                Users = new[]
+                {
+                    new User
+                    {
+                        Username = @"flyte",
+                        Id = 3103765,
+                        Country = new Country { FlagName = @"JP" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
+                    },
+                    new User
+                    {
+                        Username = @"Cookiezi",
+                        Id = 124493,
+                        Country = new Country { FlagName = @"KR" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c2.jpg",
+                    },
+                    new User
+                    {
+                        Username = @"Angelsim",
+                        Id = 1777162,
+                        Country = new Country { FlagName = @"KR" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                    },
+                    new User
+                    {
+                        Username = @"Rafis",
+                        Id = 2558286,
+                        Country = new Country { FlagName = @"PL" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg",
+                    },
+                    new User
+                    {
+                        Username = @"hvick225",
+                        Id = 50265,
+                        Country = new Country { FlagName = @"TW" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c5.jpg",
+                    },
+                    new User
+                    {
+                        Username = @"peppy",
+                        Id = 2,
+                        Country = new Country { FlagName = @"AU" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+                    },
+                    new User
+                    {
+                        Username = @"filsdelama",
+                        Id = 2831793,
+                        Country = new Country { FlagName = @"FR" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c7.jpg"
+                    },
+                    new User
+                    {
+                        Username = @"_index",
+                        Id = 652457,
+                        Country = new Country { FlagName = @"RU" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c8.jpg"
+                    },
+                },
+            };
+            Add(s);
+
+            AddStep(@"toggle", s.ToggleVisibility);
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs

@@ -0,0 +1,65 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.MathUtils;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseSongProgress : TestCase
+    {
+        public override string Description => @"With fake data";
+
+        private readonly SongProgress progress;
+        private readonly SongProgressGraph graph;
+
+        private readonly StopwatchClock clock;
+
+        public TestCaseSongProgress()
+        {
+            clock = new StopwatchClock(true);
+
+            Add(progress = new SongProgress
+            {
+                RelativeSizeAxes = Axes.X,
+                AudioClock = new StopwatchClock(true),
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
+            });
+
+            Add(graph = new SongProgressGraph
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 200,
+                Anchor = Anchor.TopLeft,
+                Origin = Anchor.TopLeft,
+            });
+
+            AddStep("Toggle Bar", () => progress.AllowSeeking = !progress.AllowSeeking);
+            AddWaitStep(5);
+            AddStep("Toggle Bar", () => progress.AllowSeeking = !progress.AllowSeeking);
+            AddWaitStep(2);
+            AddRepeatStep("New Values", displayNewValues, 5);
+
+            displayNewValues();
+        }
+
+        private void displayNewValues()
+        {
+            List<HitObject> objects = new List<HitObject>();
+            for (double i = 0; i < 5000; i += RNG.NextDouble() * 10 + i / 1000)
+                objects.Add(new HitObject { StartTime = i });
+
+            progress.Objects = objects;
+            graph.Objects = objects;
+
+            progress.AudioClock = clock;
+            progress.OnSeek = pos => clock.Seek(pos);
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs

@@ -0,0 +1,43 @@
+// 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.Graphics;
+using OpenTK;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Select.Filter;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    public class TestCaseTabControl : TestCase
+    {
+        public override string Description => @"Filter for song select";
+
+        public TestCaseTabControl()
+        {
+            OsuSpriteText text;
+            OsuTabControl<GroupMode> filter;
+            Add(filter = new OsuTabControl<GroupMode>
+            {
+                Margin = new MarginPadding(4),
+                Size = new Vector2(229, 24),
+                AutoSort = true
+            });
+            Add(text = new OsuSpriteText
+            {
+                Text = "None",
+                Margin = new MarginPadding(4),
+                Position = new Vector2(275, 5)
+            });
+
+            filter.PinItem(GroupMode.All);
+            filter.PinItem(GroupMode.RecentlyPlayed);
+
+            filter.Current.ValueChanged += newFilter =>
+            {
+                text.Text = "Currently Selected: " + newFilter.ToString();
+            };
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs

@@ -0,0 +1,119 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Linq;
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseTaikoHitObjects : TestCase
+    {
+        public override string Description => "Taiko hit objects";
+
+        private bool kiai;
+
+        public TestCaseTaikoHitObjects()
+        {
+            AddToggleStep("Kiai", b =>
+            {
+                kiai = !kiai;
+                updateKiaiState();
+            });
+
+            Add(new CirclePiece
+            {
+                Position = new Vector2(100, 100),
+                AccentColour = Color4.DarkRed,
+                KiaiMode = kiai,
+                Children = new[]
+                {
+                    new CentreHitSymbolPiece()
+                }
+            });
+
+            Add(new CirclePiece(true)
+            {
+                Position = new Vector2(350, 100),
+                AccentColour = Color4.DarkRed,
+                KiaiMode = kiai,
+                Children = new[]
+                {
+                    new CentreHitSymbolPiece()
+                }
+            });
+
+            Add(new CirclePiece
+            {
+                Position = new Vector2(100, 300),
+                AccentColour = Color4.DarkBlue,
+                KiaiMode = kiai,
+                Children = new[]
+                {
+                    new RimHitSymbolPiece()
+                }
+            });
+
+            Add(new CirclePiece(true)
+            {
+                Position = new Vector2(350, 300),
+                AccentColour = Color4.DarkBlue,
+                KiaiMode = kiai,
+                Children = new[]
+                {
+                    new RimHitSymbolPiece()
+                }
+            });
+
+            Add(new CirclePiece
+            {
+                Position = new Vector2(100, 500),
+                AccentColour = Color4.Orange,
+                KiaiMode = kiai,
+                Children = new[]
+                {
+                    new SwellSymbolPiece()
+                }
+            });
+
+            Add(new ElongatedCirclePiece
+            {
+                Position = new Vector2(575, 100),
+                AccentColour = Color4.Orange,
+                KiaiMode = kiai,
+                Length = 0.10f,
+                PlayfieldLengthReference = () => DrawSize.X
+            });
+
+            Add(new ElongatedCirclePiece(true)
+            {
+                Position = new Vector2(575, 300),
+                AccentColour = Color4.Orange,
+                KiaiMode = kiai,
+                Length = 0.10f,
+                PlayfieldLengthReference = () => DrawSize.X
+            });
+        }
+
+        private void updateKiaiState()
+        {
+            foreach (var c in Children.OfType<CirclePiece>())
+                c.KiaiMode = kiai;
+        }
+
+        private abstract class BaseCircle : Container
+        {
+            protected readonly CirclePiece Piece;
+
+            protected BaseCircle(CirclePiece piece)
+            {
+                Piece = piece;
+
+                Add(Piece);
+            }
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs

@@ -0,0 +1,220 @@
+// 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;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.MathUtils;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Judgements;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.UI;
+using System;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseTaikoPlayfield : TestCase
+    {
+        private const double default_duration = 300;
+        private const float scroll_time = 1000;
+
+        public override string Description => "Taiko playfield";
+
+        protected override double TimePerAction => default_duration * 2;
+
+        private readonly Random rng = new Random(1337);
+        private readonly TaikoPlayfield playfield;
+        private readonly Container playfieldContainer;
+
+        public TestCaseTaikoPlayfield()
+        {
+            AddStep("Hit!", addHitJudgement);
+            AddStep("Miss :(", addMissJudgement);
+            AddStep("DrumRoll", () => addDrumRoll(false));
+            AddStep("Strong DrumRoll", () => addDrumRoll(true));
+            AddStep("Swell", () => addSwell());
+            AddStep("Centre", () => addCentreHit(false));
+            AddStep("Strong Centre", () => addCentreHit(true));
+            AddStep("Rim", () => addRimHit(false));
+            AddStep("Strong Rim", () => addRimHit(true));
+            AddStep("Add bar line", () => addBarLine(false));
+            AddStep("Add major bar line", () => addBarLine(true));
+            AddStep("Height test 1", () => changePlayfieldSize(1));
+            AddStep("Height test 2", () => changePlayfieldSize(2));
+            AddStep("Height test 3", () => changePlayfieldSize(3));
+            AddStep("Height test 4", () => changePlayfieldSize(4));
+            AddStep("Height test 5", () => changePlayfieldSize(5));
+            AddStep("Reset height", () => changePlayfieldSize(6));
+
+            var rateAdjustClock = new StopwatchClock(true) { Rate = 1 };
+
+            Add(playfieldContainer = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                Height = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT,
+                Clock = new FramedClock(rateAdjustClock),
+                Children = new[]
+                {
+                    playfield = new TaikoPlayfield()
+                }
+            });
+        }
+
+        private void changePlayfieldSize(int step)
+        {
+            double delay = 0;
+
+            // Add new hits
+            switch (step)
+            {
+                case 1:
+                    addCentreHit(false);
+                    break;
+                case 2:
+                    addCentreHit(true);
+                    break;
+                case 3:
+                    addDrumRoll(false);
+                    break;
+                case 4:
+                    addDrumRoll(true);
+                    break;
+                case 5:
+                    addSwell(1000);
+                    delay = scroll_time - 100;
+                    break;
+            }
+
+            // Tween playfield height
+            switch (step)
+            {
+                default:
+                    playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
+                    break;
+                case 6:
+                    playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT), 500);
+                    break;
+            }
+        }
+
+        private void addHitJudgement()
+        {
+            TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;
+
+            var h = new DrawableTestHit(new Hit())
+            {
+                X = RNG.NextSingle(hitResult == TaikoHitResult.Good ? -0.1f : -0.05f, hitResult == TaikoHitResult.Good ? 0.1f : 0.05f),
+                Judgement = new TaikoJudgement
+                {
+                    Result = HitResult.Hit,
+                    TaikoResult = hitResult,
+                    TimeOffset = 0
+                }
+            };
+
+            playfield.OnJudgement(h);
+
+            if (RNG.Next(10) == 0)
+            {
+                h.Judgement.SecondHit = true;
+                playfield.OnJudgement(h);
+            }
+        }
+
+        private void addMissJudgement()
+        {
+            playfield.OnJudgement(new DrawableTestHit(new Hit())
+            {
+                Judgement = new TaikoJudgement
+                {
+                    Result = HitResult.Miss,
+                    TimeOffset = 0
+                }
+            });
+        }
+
+        private void addBarLine(bool major, double delay = scroll_time)
+        {
+            BarLine bl = new BarLine
+            {
+                StartTime = playfield.Time.Current + delay,
+                ScrollTime = scroll_time
+            };
+
+            playfield.AddBarLine(major ? new DrawableBarLineMajor(bl) : new DrawableBarLine(bl));
+        }
+
+        private void addSwell(double duration = default_duration)
+        {
+            playfield.Add(new DrawableSwell(new Swell
+            {
+                StartTime = playfield.Time.Current + scroll_time,
+                Duration = duration,
+                ScrollTime = scroll_time
+            }));
+        }
+
+        private void addDrumRoll(bool strong, double duration = default_duration)
+        {
+            addBarLine(true);
+            addBarLine(true, scroll_time + duration);
+
+            var d = new DrumRoll
+            {
+                StartTime = playfield.Time.Current + scroll_time,
+                IsStrong = strong,
+                Duration = duration,
+                ScrollTime = scroll_time,
+            };
+
+            playfield.Add(new DrawableDrumRoll(d));
+        }
+
+        private void addCentreHit(bool strong)
+        {
+            Hit h = new Hit
+            {
+                StartTime = playfield.Time.Current + scroll_time,
+                ScrollTime = scroll_time
+            };
+
+            if (strong)
+                playfield.Add(new DrawableCentreHitStrong(h));
+            else
+                playfield.Add(new DrawableCentreHit(h));
+        }
+
+        private void addRimHit(bool strong)
+        {
+            Hit h = new Hit
+            {
+                StartTime = playfield.Time.Current + scroll_time,
+                ScrollTime = scroll_time
+            };
+
+            if (strong)
+                playfield.Add(new DrawableRimHitStrong(h));
+            else
+                playfield.Add(new DrawableRimHit(h));
+        }
+
+        private class DrawableTestHit : DrawableHitObject<TaikoHitObject, TaikoJudgement>
+        {
+            public DrawableTestHit(TaikoHitObject hitObject)
+                : base(hitObject)
+            {
+            }
+
+            protected override TaikoJudgement CreateJudgement() => new TaikoJudgement();
+
+            protected override void UpdateState(ArmedState state)
+            {
+            }
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
@@ -12,19 +12,15 @@ using OpenTK.Graphics;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseTextAwesome : TestCase
+    internal class TestCaseTextAwesome : TestCase
     {
-        public override string Name => @"TextAwesome";
-
         public override string Description => @"Tests display of icons";
 
-        public override void Reset()
+        public TestCaseTextAwesome()
         {
-            base.Reset();
-
             FillFlowContainer flow;
 
-            Add(flow = new FillFlowContainer()
+            Add(flow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Size = new Vector2(0.5f),

osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs

@@ -1,23 +1,18 @@
 // 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.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseTwoLayerButton : TestCase
+    internal class TestCaseTwoLayerButton : TestCase
     {
-        public override string Name => @"TwoLayerButton";
-        public override string Description => @"Back and skip and what not";
+        public override string Description => @"Mostly back button";
 
-        public override void Reset()
+        public TestCaseTwoLayerButton()
         {
-            base.Reset();
-
             Add(new BackButton());
-            Add(new SkipButton());
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseUserPanel.cs

@@ -0,0 +1,55 @@
+// 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.Testing;
+using osu.Framework.Graphics;
+using osu.Game.Users;
+using osu.Framework.Graphics.Containers;
+using OpenTK;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseUserPanel : TestCase
+    {
+        public override string Description => @"Panels for displaying a user's status";
+
+        public TestCaseUserPanel()
+        {
+            UserPanel flyte;
+            UserPanel peppy;
+            Add(new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(10f),
+                Children = new[]
+                {
+                    flyte = new UserPanel(new User
+                    {
+                        Username = @"flyte",
+                        Id = 3103765,
+                        Country = new Country { FlagName = @"JP" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+                    }) { Width = 300 },
+                    peppy = new UserPanel(new User
+                    {
+                        Username = @"peppy",
+                        Id = 2,
+                        Country = new Country { FlagName = @"AU" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
+                    }) { Width = 300 },
+                },
+            });
+
+            flyte.Status.Value = new UserStatusOnline();
+            peppy.Status.Value = new UserStatusSoloGame();
+
+            AddStep(@"spectating", () => { flyte.Status.Value = new UserStatusSpectating(); });
+            AddStep(@"multiplaying", () => { flyte.Status.Value = new UserStatusMultiplayerGame(); });
+            AddStep(@"modding", () => { flyte.Status.Value = new UserStatusModding(); });
+            AddStep(@"offline", () => { flyte.Status.Value = new UserStatusOffline(); });
+            AddStep(@"null status", () => { flyte.Status.Value = null; });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseUserProfile.cs

@@ -0,0 +1,64 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using osu.Framework.Testing;
+using osu.Game.Overlays;
+using osu.Game.Users;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseUserProfile : TestCase
+    {
+        public override string Description => "Tests user's profile page.";
+
+        public TestCaseUserProfile()
+        {
+            var profile = new UserProfileOverlay();
+            Add(profile);
+
+            AddStep("Show offline dummy", () => profile.ShowUser(new User
+            {
+                Username = @"Somebody",
+                Id = 1,
+                Country = new Country { FullName = @"Alien" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
+                JoinDate = DateTimeOffset.Now.AddDays(-1),
+                LastVisit = DateTimeOffset.Now,
+                Age = 1,
+                ProfileOrder = new[] { "me" },
+                CountryRank = 1,
+                Statistics = new UserStatistics
+                {
+                    Rank = 2148,
+                    PP = 4567.89m
+                },
+                AllRankHistories = new User.RankHistories
+                {
+                    Osu = new User.RankHistory
+                    {
+                        Mode = @"osu",
+                        Data = Enumerable.Range(2345,45).Concat(Enumerable.Range(2109,40)).ToArray()
+                    }
+                }
+            }, false));
+            AddStep("Show ppy", () => profile.ShowUser(new User
+            {
+                Username = @"peppy",
+                Id = 2,
+                Country = new Country { FullName = @"Australia", FlagName = @"AU" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
+            }));
+            AddStep("Show flyte", () => profile.ShowUser(new User
+            {
+                Username = @"flyte",
+                Id = 3103765,
+                Country = new Country { FullName = @"Japan", FlagName = @"JP" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+            }));
+            AddStep("Hide", profile.Hide);
+            AddStep("Show without reload", profile.Show);
+        }
+    }
+}

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -1,23 +1,35 @@
 // 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.Screens.Testing;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Game;
 using osu.Game.Screens.Backgrounds;
 
 namespace osu.Desktop.VisualTests
 {
-    class VisualTestGame : OsuGameBase
+    internal class VisualTestGame : OsuGameBase
     {
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            (new BackgroundScreenDefault() { Depth = 10 }).LoadAsync(this, AddInternal);
+            LoadComponentAsync(new BackgroundScreenDefault { Depth = 10 }, AddInternal);
 
             // Have to construct this here, rather than in the constructor, because
             // we depend on some dependencies to be loaded within OsuGameBase.load().
             Add(new TestBrowser());
         }
+
+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+
+            host.UpdateThread.InactiveHz = host.UpdateThread.ActiveHz;
+            host.DrawThread.InactiveHz = host.DrawThread.ActiveHz;
+            host.InputThread.InactiveHz = host.InputThread.ActiveHz;
+
+            host.Window.CursorState |= CursorState.Hidden;
+        }
     }
 }

osu.Desktop.VisualTests/app.config

@@ -1,15 +0,0 @@
-<?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
--->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

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

@@ -23,6 +23,7 @@
     <SignAssembly>false</SignAssembly>
     <TargetZone>LocalIntranet</TargetZone>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -60,6 +61,7 @@
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <Prefer32Bit>false</Prefer32Bit>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -82,8 +84,15 @@
   </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>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -91,9 +100,6 @@
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="SQLiteNetExtensions">
       <HintPath>$(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll</HintPath>
     </Reference>
@@ -110,7 +116,6 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
-    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="OpenTK.dll.config" />
   </ItemGroup>
@@ -146,6 +151,10 @@
       <Project>{65dc628f-a640-4111-ab35-3a5652bc1e17}</Project>
       <Name>osu.Framework.Desktop</Name>
     </ProjectReference>
+    <ProjectReference Include="..\osu-framework\osu.Framework.Testing\osu.Framework.Testing.csproj">
+      <Project>{007b2356-ab6f-4bd9-96d5-116fc2dce69a}</Project>
+      <Name>osu.Framework.Testing</Name>
+    </ProjectReference>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
       <Project>{c76bf5b3-985e-4d39-95fe-97c9c879b83a}</Project>
       <Name>osu.Framework</Name>
@@ -154,21 +163,21 @@
       <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
       <Name>osu.Game.Resources</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj">
       <Project>{c92a607b-1fdd-4954-9f92-03ff547d9080}</Project>
-      <Name>osu.Game.Modes.Osu</Name>
+      <Name>osu.Game.Rulesets.Osu</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Catch\osu.Game.Modes.Catch.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj">
       <Project>{58f6c80c-1253-4a0e-a465-b8c85ebeadf3}</Project>
-      <Name>osu.Game.Modes.Catch</Name>
+      <Name>osu.Game.Rulesets.Catch</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Mania\osu.Game.Modes.Mania.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj">
       <Project>{48f4582b-7687-4621-9cbe-5c24197cb536}</Project>
-      <Name>osu.Game.Modes.Mania</Name>
+      <Name>osu.Game.Rulesets.Mania</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Taiko\osu.Game.Modes.Taiko.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj">
       <Project>{f167e17a-7de6-4af5-b920-a5112296c695}</Project>
-      <Name>osu.Game.Modes.Taiko</Name>
+      <Name>osu.Game.Rulesets.Taiko</Name>
     </ProjectReference>
     <ProjectReference Include="..\osu.Game\osu.Game.csproj">
       <Project>{0d3fbf8a-7464-4cf7-8c90-3e7886df2d4d}</Project>
@@ -176,31 +185,59 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Benchmark.cs" />
+    <Compile Include="AutomatedVisualTestGame.cs" />
     <Compile Include="Program.cs" />
+    <Compile Include="Tests\TestCaseBeatSyncedContainer.cs" />
     <Compile Include="Tests\TestCaseChatDisplay.cs" />
+    <Compile Include="Tests\TestCaseBeatmapDetails.cs" />
+    <Compile Include="Tests\TestCaseContextMenu.cs" />
     <Compile Include="Tests\TestCaseDrawings.cs" />
     <Compile Include="Tests\TestCaseGamefield.cs" />
+    <Compile Include="Tests\TestCaseGraph.cs" />
+    <Compile Include="Tests\TestCaseManiaHitObjects.cs" />
+    <Compile Include="Tests\TestCaseManiaPlayfield.cs" />
+    <Compile Include="Tests\TestCaseMenuOverlays.cs" />
     <Compile Include="Tests\TestCaseMusicController.cs" />
-    <Compile Include="Tests\TestCaseNotificationManager.cs" />
+    <Compile Include="Tests\TestCaseNotificationOverlay.cs" />
+    <Compile Include="Tests\TestCaseOnScreenDisplay.cs" />
+    <Compile Include="Tests\TestCaseReplaySettingsOverlay.cs" />
     <Compile Include="Tests\TestCasePlayer.cs" />
     <Compile Include="Tests\TestCaseHitObjects.cs" />
     <Compile Include="Tests\TestCaseKeyCounter.cs" />
     <Compile Include="Tests\TestCaseMenuButtonSystem.cs" />
+    <Compile Include="Tests\TestCaseReplay.cs" />
+    <Compile Include="Tests\TestCaseResults.cs" />
     <Compile Include="Tests\TestCaseScoreCounter.cs" />
+    <Compile Include="Tests\TestCaseScrollingHitObjects.cs" />
+    <Compile Include="Tests\TestCaseSkipButton.cs" />
+    <Compile Include="Tests\TestCaseTabControl.cs" />
+    <Compile Include="Tests\TestCaseTaikoHitObjects.cs" />
+    <Compile Include="Tests\TestCaseTaikoPlayfield.cs" />
     <Compile Include="Tests\TestCaseTextAwesome.cs" />
     <Compile Include="Tests\TestCasePlaySongSelect.cs" />
     <Compile Include="Tests\TestCaseTwoLayerButton.cs" />
+    <Compile Include="Tests\TestCaseUserProfile.cs" />
     <Compile Include="VisualTestGame.cs" />
     <Compile Include="Platform\TestStorage.cs" />
-    <Compile Include="Tests\TestCaseOptions.cs" />
-    <Compile Include="Tests\TestCasePauseOverlay.cs" />
-    <Compile Include="Tests\TestCaseModSelectOverlay.cs" />
+    <Compile Include="Tests\TestCaseSettings.cs" />
+    <Compile Include="Tests\TestCaseSongProgress.cs" />
+    <Compile Include="Tests\TestCaseMods.cs" />
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
     <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
+    <Compile Include="Tests\TestCaseLeaderboard.cs" />
+    <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
+    <Compile Include="Tests\TestCaseBeatmapDetailArea.cs" />
+    <Compile Include="Tests\TestCaseDrawableRoom.cs" />
+    <Compile Include="Tests\TestCaseUserPanel.cs" />
+    <Compile Include="Tests\TestCaseDirect.cs" />
+    <Compile Include="Tests\TestCaseSocial.cs" />
+    <Compile Include="Tests\TestCaseBreadcrumbs.cs" />
+    <Compile Include="Tests\TestCaseMedalOverlay.cs" />
+    <Compile Include="Tests\TestCaseRoomInspector.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\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.

osu.Desktop.VisualTests/packages.config

@@ -4,8 +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="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
+  <package id="SharpCompress" version="0.17.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="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />

osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs

@@ -1,52 +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
-
-using System.IO;
-using System.Linq;
-using osu.Game.Beatmaps.Formats;
-using osu.Game.Beatmaps.IO;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-
-namespace osu.Desktop.Beatmaps.IO
-{
-    /// <summary>
-    /// Reads an extracted legacy beatmap from disk.
-    /// </summary>
-    public class LegacyFilesystemReader : ArchiveReader
-    {
-        public static void Register() => AddReader<LegacyFilesystemReader>((storage, path) => Directory.Exists(path));
-
-        private string basePath { get; set; }
-        private Beatmap firstMap { get; set; }
-
-        public LegacyFilesystemReader(string path)
-        {
-            basePath = path;
-            BeatmapFilenames = Directory.GetFiles(basePath, @"*.osu").Select(f => Path.GetFileName(f)).ToArray();
-            if (BeatmapFilenames.Length == 0)
-                throw new FileNotFoundException(@"This directory contains no beatmaps");
-            StoryboardFilename = Directory.GetFiles(basePath, @"*.osb").Select(f => Path.GetFileName(f)).FirstOrDefault();
-            using (var stream = new StreamReader(GetStream(BeatmapFilenames[0])))
-            {
-                var decoder = BeatmapDecoder.GetDecoder(stream);
-                firstMap = decoder.Decode(stream);
-            }
-        }
-
-        public override Stream GetStream(string name)
-        {
-            return File.OpenRead(Path.Combine(basePath, name));
-        }
-
-        public override BeatmapMetadata ReadMetadata()
-        {
-            return firstMap.BeatmapInfo.Metadata;
-        }
-
-        public override void Dispose()
-        {
-            // no-op
-        }
-    }
-}

osu.Desktop/OsuGameDesktop.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 System;
 using osu.Game;
 using System.Linq;
 using System.Windows.Forms;
@@ -9,31 +10,89 @@ using osu.Framework.Desktop.Platform;
 using osu.Desktop.Overlays;
 using System.Reflection;
 using System.Drawing;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.Win32;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Menu;
 
 namespace osu.Desktop
 {
-    class OsuGameDesktop : OsuGame
+    internal class OsuGameDesktop : OsuGame
     {
-        private VersionManager versionManager;
-
-        public override bool IsDeployedBuild => versionManager.IsDeployedBuild;
+        private readonly VersionManager versionManager;
 
         public OsuGameDesktop(string[] args = null)
             : base(args)
         {
-            versionManager = new VersionManager { Depth = int.MinValue };
+            versionManager = new VersionManager
+            {
+                Depth = int.MinValue,
+                State = Visibility.Hidden
+            };
+        }
+
+        public override Storage GetStorageForStableInstall()
+        {
+            try
+            {
+                return new StableStorage();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// A method of accessing an osu-stable install in a controlled fashion.
+        /// </summary>
+        private class StableStorage : DesktopStorage
+        {
+            protected override string LocateBasePath()
+            {
+                Func<string, bool> checkExists = p => Directory.Exists(Path.Combine(p, "Songs"));
+
+                string stableInstallPath;
+
+                try
+                {
+                    using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                        stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(String.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+
+                    if (checkExists(stableInstallPath))
+                        return stableInstallPath;
+                }
+                catch
+                {
+                }
+
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                return null;
+            }
+
+            public StableStorage()
+                : base(string.Empty)
+            {
+            }
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            versionManager.LoadAsync(this);
-            ModeChanged += m =>
+            LoadComponentAsync(versionManager, Add);
+            ScreenChanged += s =>
             {
-                if (!versionManager.IsAlive && m is Intro)
-                    Add(versionManager);
+                if (!versionManager.IsPresent && s is Intro)
+                    versionManager.State = Visibility.Visible;
             };
         }
 
@@ -43,8 +102,10 @@ namespace osu.Desktop
             var desktopWindow = host.Window as DesktopGameWindow;
             if (desktopWindow != null)
             {
-                desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
-                desktopWindow.Title = @"osu!lazer";
+                desktopWindow.CursorState |= CursorState.Hidden;
+
+                desktopWindow.Icon = new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
+                desktopWindow.Title = Name;
 
                 desktopWindow.DragEnter += dragEnter;
                 desktopWindow.DragDrop += dragDrop;
@@ -54,22 +115,29 @@ namespace osu.Desktop
         private void dragDrop(DragEventArgs e)
         {
             // this method will only be executed if e.Effect in dragEnter gets set to something other that None.
-            var dropData = e.Data.GetData(DataFormats.FileDrop) as object[];
+            var dropData = (object[])e.Data.GetData(DataFormats.FileDrop);
             var filePaths = dropData.Select(f => f.ToString()).ToArray();
-            ImportBeatmapsAsync(filePaths);
+
+            if (filePaths.All(f => Path.GetExtension(f) == @".osz"))
+                Task.Run(() => BeatmapManager.Import(filePaths));
+            else if (filePaths.All(f => Path.GetExtension(f) == @".osr"))
+                Task.Run(() =>
+                {
+                    var score = ScoreStore.ReadReplayFile(filePaths.First());
+                    Schedule(() => LoadScore(score));
+                });
         }
 
+        private static readonly string[] allowed_extensions = { @".osz", @".osr" };
+
         private void dragEnter(DragEventArgs e)
         {
             // dragDrop will only be executed if e.Effect gets set to something other that None in this method.
             bool isFile = e.Data.GetDataPresent(DataFormats.FileDrop);
             if (isFile)
             {
-                var paths = (e.Data.GetData(DataFormats.FileDrop) as object[]).Select(f => f.ToString()).ToArray();
-                if (paths.Any(p => !p.EndsWith(".osz")))
-                    e.Effect = DragDropEffects.None;
-                else
-                    e.Effect = DragDropEffects.Copy;
+                var paths = ((object[])e.Data.GetData(DataFormats.FileDrop)).Select(f => f.ToString()).ToArray();
+                e.Effect = allowed_extensions.Any(ext => paths.All(p => p.EndsWith(ext))) ? DragDropEffects.Copy : DragDropEffects.None;
             }
         }
     }

osu.Desktop/Overlays/VersionManager.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -11,7 +10,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using Squirrel;
-using System.Reflection;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
@@ -19,55 +18,41 @@ using OpenTK;
 using OpenTK.Graphics;
 using System.Net.Http;
 using osu.Framework.Logging;
+using osu.Game;
 
 namespace osu.Desktop.Overlays
 {
     public class VersionManager : OverlayContainer
     {
         private UpdateManager updateManager;
-        private NotificationManager notificationManager;
-
-        AssemblyName assembly = Assembly.GetEntryAssembly().GetName();
-
-        public bool IsDeployedBuild => assembly.Version.Major > 0;
+        private NotificationOverlay notificationOverlay;
 
         protected override bool HideOnEscape => false;
 
         public override bool HandleInput => false;
 
         [BackgroundDependencyLoader]
-        private void load(NotificationManager notification, OsuColour colours, TextureStore textures)
+        private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game)
         {
-            notificationManager = notification;
+            notificationOverlay = notification;
 
             AutoSizeAxes = Axes.Both;
             Anchor = Anchor.BottomCentre;
             Origin = Anchor.BottomCentre;
             Alpha = 0;
 
-            bool isDebug = false;
-            Debug.Assert(isDebug = true);
-
-            string version;
-            if (!IsDeployedBuild)
-            {
-                version = @"local " + (isDebug ? @"debug" : @"release");
-            }
-            else
-                version = $@"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}";
-
             Children = new Drawable[]
             {
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Right,
+                            Direction = FillDirection.Horizontal,
                             Spacing = new Vector2(5),
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
@@ -76,12 +61,12 @@ namespace osu.Desktop.Overlays
                                 new OsuSpriteText
                                 {
                                     Font = @"Exo2.0-Bold",
-                                    Text = $@"osu!lazer"
+                                    Text = game.Name
                                 },
                                 new OsuSpriteText
                                 {
-                                    Colour = isDebug ? colours.Red : Color4.White,
-                                    Text = version
+                                    Colour = game.IsDebug ? colours.Red : Color4.White,
+                                    Text = game.Version
                                 },
                             }
                         },
@@ -92,7 +77,7 @@ namespace osu.Desktop.Overlays
                             TextSize = 12,
                             Colour = colours.Yellow,
                             Font = @"Venera",
-                            Text = $@"Development Build"
+                            Text = @"Development Build"
                         },
                         new Sprite
                         {
@@ -104,16 +89,10 @@ namespace osu.Desktop.Overlays
                 }
             };
 
-            if (IsDeployedBuild)
+            if (game.IsDeployedBuild)
                 checkForUpdateAsync();
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            State = Visibility.Visible;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -137,7 +116,7 @@ namespace osu.Desktop.Overlays
                 if (notification == null)
                 {
                     notification = new UpdateProgressNotification { State = ProgressNotificationState.Active };
-                    Schedule(() => notificationManager.Post(notification));
+                    Schedule(() => notificationOverlay.Post(notification));
                 }
 
                 Schedule(() =>
@@ -196,40 +175,47 @@ namespace osu.Desktop.Overlays
 
         protected override void PopIn()
         {
-            FadeIn(1000);
+            this.FadeIn(1000);
         }
 
         protected override void PopOut()
         {
         }
 
-        class UpdateProgressNotification : ProgressNotification
+        private class UpdateProgressNotification : ProgressNotification
         {
-            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification(this)
+            private OsuGame game;
+
+            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification
             {
                 Text = @"Update ready to install. Click to restart!",
                 Activated = () =>
                 {
-                    UpdateManager.RestartApp();
+                    UpdateManager.RestartAppWhenExited();
+                    game.GracefullyExit();
                     return true;
                 }
             };
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OsuColour colours, OsuGame game)
             {
-                IconContent.Add(new Drawable[]
+                this.game = game;
+
+                IconContent.AddRange(new Drawable[]
                 {
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        ColourInfo = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow)
+                        Colour = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow)
                     },
                     new TextAwesome
                     {
                         Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
                         Icon = FontAwesome.fa_upload,
                         Colour = Color4.White,
+                        TextSize = 20
                     }
                 });
             }

osu.Desktop/Program.cs

@@ -3,15 +3,9 @@
 
 using System;
 using System.IO;
-using osu.Desktop.Beatmaps.IO;
 using osu.Framework.Desktop;
 using osu.Framework.Desktop.Platform;
 using osu.Game.IPC;
-using osu.Game.Modes;
-using osu.Game.Modes.Catch;
-using osu.Game.Modes.Mania;
-using osu.Game.Modes.Osu;
-using osu.Game.Modes.Taiko;
 
 namespace osu.Desktop
 {
@@ -20,8 +14,6 @@ namespace osu.Desktop
         [STAThread]
         public static int Main(string[] args)
         {
-            LegacyFilesystemReader.Register();
-
             // Back up the cwd before DesktopGameHost changes it
             var cwd = Environment.CurrentDirectory;
 
@@ -29,7 +21,7 @@ namespace osu.Desktop
             {
                 if (!host.IsPrimaryInstance)
                 {
-                    var importer = new BeatmapImporter(host);
+                    var importer = new BeatmapIPCChannel(host);
                     // Restore the cwd so relative paths given at the command line work correctly
                     Directory.SetCurrentDirectory(cwd);
                     foreach (var file in args)
@@ -41,11 +33,6 @@ namespace osu.Desktop
                 }
                 else
                 {
-                    Ruleset.Register(new OsuRuleset());
-                    Ruleset.Register(new TaikoRuleset());
-                    Ruleset.Register(new ManiaRuleset());
-                    Ruleset.Register(new CatchRuleset());
-
                     host.Run(new OsuGameDesktop(args));
                 }
                 return 0;

osu.Desktop/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu!lazer")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 

osu.Desktop/app.config

@@ -1,19 +0,0 @@
-<?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
--->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <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

@@ -23,6 +23,7 @@
     <SignAssembly>false</SignAssembly>
     <TargetZone>LocalIntranet</TargetZone>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -62,6 +63,7 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <Commandlineparameters>
     </Commandlineparameters>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -101,10 +103,6 @@
       <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>$(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>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
       <Private>True</Private>
@@ -123,16 +121,23 @@
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4" />
     <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <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>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+    <Reference Include="Squirrel, Version=1.7.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -153,7 +158,7 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
-    <None Include="app.config" />
+    <None Include="OpenTK.dll.config" />
     <None Include="osu!.res" />
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
@@ -198,21 +203,21 @@
       <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
       <Name>osu.Game.Resources</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj">
       <Project>{c92a607b-1fdd-4954-9f92-03ff547d9080}</Project>
-      <Name>osu.Game.Modes.Osu</Name>
+      <Name>osu.Game.Rulesets.Osu</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Catch\osu.Game.Modes.Catch.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj">
       <Project>{58f6c80c-1253-4a0e-a465-b8c85ebeadf3}</Project>
-      <Name>osu.Game.Modes.Catch</Name>
+      <Name>osu.Game.Rulesets.Catch</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Mania\osu.Game.Modes.Mania.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj">
       <Project>{48f4582b-7687-4621-9cbe-5c24197cb536}</Project>
-      <Name>osu.Game.Modes.Mania</Name>
+      <Name>osu.Game.Rulesets.Mania</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Modes.Taiko\osu.Game.Modes.Taiko.csproj">
+    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj">
       <Project>{f167e17a-7de6-4af5-b920-a5112296c695}</Project>
-      <Name>osu.Game.Modes.Taiko</Name>
+      <Name>osu.Game.Rulesets.Taiko</Name>
     </ProjectReference>
     <ProjectReference Include="..\osu.Game\osu.Game.csproj">
       <Project>{0d3fbf8a-7464-4cf7-8c90-3e7886df2d4d}</Project>
@@ -223,11 +228,10 @@
     <Compile Include="OsuGameDesktop.cs" />
     <Compile Include="Overlays\VersionManager.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Beatmaps\IO\LegacyFilesystemReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="lazer.ico" />
+    <EmbeddedResource Include="lazer.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

osu.Desktop/osu.nuspec

@@ -17,7 +17,8 @@
     </metadata>
     <files>
       <file src="*.exe" target="lib\net45\" exclude="**vshost**"/>
-      <file src="*.dll" target="lib\net45\"/>
+      <file src="*.dll" target="lib\net45\"/>
+      <file src="*.config" target="lib\net45\"/>
       <file src="x86\*.dll" target="lib\net45\x86\"/>
       <file src="x64\*.dll" target="lib\net45\x64\"/>
     </files>

osu.Desktop/packages.config

@@ -7,6 +7,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
   <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.4" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
+  <package id="SharpCompress" version="0.17.1" targetFramework="net45" />
   <package id="Splat" version="2.0.0" targetFramework="net45" />
-  <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
+  <package id="squirrel.windows" version="1.7.5" targetFramework="net45" />
 </packages>

osu.Game.Modes.Catch/Objects/CatchConverter.cs

@@ -1,40 +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
-
-using System.Collections.Generic;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Beatmaps;
-
-namespace osu.Game.Modes.Catch.Objects
-{
-    class CatchConverter : HitObjectConverter<CatchBaseHit>
-    {
-        public override List<CatchBaseHit> Convert(Beatmap beatmap)
-        {
-            List<CatchBaseHit> output = new List<CatchBaseHit>();
-
-            foreach (HitObject i in beatmap.HitObjects)
-            {
-                CatchBaseHit h = i as CatchBaseHit;
-
-                if (h == null)
-                {
-                    OsuHitObject o = i as OsuHitObject;
-
-                    if (o == null) throw new HitObjectConvertException(@"Catch", i);
-
-                    h = new Fruit
-                    {
-                        StartTime = o.StartTime,
-                        Position = o.Position.X,
-                    };
-                }
-
-                output.Add(h);
-            }
-
-            return output;
-        }
-    }
-}

osu.Game.Modes.Catch/UI/CatchComboCounter.cs

@@ -1,65 +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
-
-using osu.Game.Modes.Osu.UI;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Catch.UI
-{
-    /// <summary>
-    /// Similar to Standard, but without the 'x' and has tinted pop-ups. Used in osu!catch.
-    /// </summary>
-    public class CatchComboCounter : OsuComboCounter
-    {
-        protected override bool CanPopOutWhileRolling => true;
-
-        protected virtual double FadeOutDelay => 1000;
-        protected override double FadeOutDuration => 300;
-
-        protected override string FormatCount(ulong count)
-        {
-            return $@"{count:#,0}";
-        }
-
-        private void animateFade()
-        {
-            Show();
-            Delay(FadeOutDelay);
-            FadeOut(FadeOutDuration);
-            DelayReset();
-        }
-
-        protected override void OnCountChange(ulong currentValue, ulong newValue)
-        {
-            if (newValue != 0)
-                animateFade();
-            base.OnCountChange(currentValue, newValue);
-        }
-
-        protected override void OnCountRolling(ulong currentValue, ulong newValue)
-        {
-            if (!IsRolling)
-            {
-                PopOutCount.Colour = DisplayedCountSpriteText.Colour;
-                FadeOut(FadeOutDuration);
-            }
-            base.OnCountRolling(currentValue, newValue);
-        }
-
-        protected override void OnCountIncrement(ulong currentValue, ulong newValue)
-        {
-            animateFade();
-            base.OnCountIncrement(currentValue, newValue);
-        }
-
-        /// <summary>
-        /// Increaces counter and tints pop-out before animation.
-        /// </summary>
-        /// <param name="colour">Last grabbed fruit colour.</param>
-        public void CatchFruit(Color4 colour)
-        {
-            PopOutCount.Colour = colour;
-            Count++;
-        }
-    }
-}

osu.Game.Modes.Catch/UI/CatchHitRenderer.cs

@@ -1,19 +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
-
-using osu.Game.Modes.Catch.Objects;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.UI;
-
-namespace osu.Game.Modes.Catch.UI
-{
-    public class CatchHitRenderer : HitRenderer<CatchBaseHit>
-    {
-        protected override HitObjectConverter<CatchBaseHit> Converter => new CatchConverter();
-
-        protected override Playfield CreatePlayfield() => new CatchPlayfield();
-
-        protected override DrawableHitObject GetVisualRepresentation(CatchBaseHit h) => null;// new DrawableFruit(h);
-    }
-}

osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs

@@ -1,30 +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
-
-using osu.Game.Beatmaps;
-using osu.Game.Modes.Mania.Objects;
-using osu.Game.Modes.Objects;
-using System;
-using System.Collections.Generic;
-
-namespace osu.Game.Modes.Mania
-{
-    public class ManiaDifficultyCalculator : DifficultyCalculator<ManiaBaseHit>
-    {
-        protected override PlayMode PlayMode => PlayMode.Mania;
-
-        private int columns;
-
-        public ManiaDifficultyCalculator(Beatmap beatmap, int columns = 5) : base(beatmap)
-        {
-            this.columns = columns;
-        }
-
-        protected override HitObjectConverter<ManiaBaseHit> Converter => new ManiaConverter(columns);
-
-        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
-        {
-            return 0;
-        }
-    }
-}

osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs

@@ -1,34 +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
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.Graphics;
-using OpenTK;
-
-namespace osu.Game.Modes.Mania.Objects.Drawable
-{
-    public class DrawableNote : Sprite
-    {
-        private readonly ManiaBaseHit note;
-
-        public DrawableNote(ManiaBaseHit note)
-        {
-            this.note = note;
-            Origin = Anchor.Centre;
-            Scale = new Vector2(0.1f);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            Texture = textures.Get(@"Menu/logo");
-
-            Transforms.Add(new TransformPositionY() { StartTime = note.StartTime - 200, EndTime = note.StartTime, StartValue = -0.1f, EndValue = 0.9f });
-            Transforms.Add(new TransformAlpha() { StartTime = note.StartTime + note.Duration + 200, EndTime = note.StartTime + note.Duration + 400, StartValue = 1, EndValue = 0 });
-            Expire(true);
-        }
-    }
-}

osu.Game.Modes.Mania/Objects/ManiaBaseHit.cs

@@ -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
-
-using osu.Game.Modes.Objects;
-
-namespace osu.Game.Modes.Mania.Objects
-{
-    public abstract class ManiaBaseHit : HitObject
-    {
-        public int Column;
-    }
-}

osu.Game.Modes.Mania/Objects/ManiaConverter.cs

@@ -1,48 +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
-
-using System;
-using System.Collections.Generic;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Beatmaps;
-
-namespace osu.Game.Modes.Mania.Objects
-{
-    class ManiaConverter : HitObjectConverter<ManiaBaseHit>
-    {
-        private readonly int columns;
-
-        public ManiaConverter(int columns)
-        {
-            this.columns = columns;
-        }
-
-        public override List<ManiaBaseHit> Convert(Beatmap beatmap)
-        {
-            List<ManiaBaseHit> output = new List<ManiaBaseHit>();
-
-            foreach (HitObject i in beatmap.HitObjects)
-            {
-                ManiaBaseHit h = i as ManiaBaseHit;
-
-                if (h == null)
-                {
-                    OsuHitObject o = i as OsuHitObject;
-
-                    if (o == null) throw new HitObjectConvertException(@"Mania", i);
-
-                    h = new Note
-                    {
-                        StartTime = o.StartTime,
-                        Column = (int)Math.Round(o.Position.X / 512 * columns)
-                    };
-                }
-
-                output.Add(h);
-            }
-
-            return output;
-        }
-    }
-}

osu.Game.Modes.Mania/UI/ManiaComboCounter.cs

@@ -1,78 +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
-
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
-using osu.Game.Modes.Taiko.UI;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Mania.UI
-{
-    /// <summary>
-    /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania.
-    /// </summary>
-    public class ManiaComboCounter : TaikoComboCounter
-    {
-        protected ushort KeysHeld = 0;
-
-        protected Color4 OriginalColour;
-
-        protected Color4 TintColour => Color4.Orange;
-        protected EasingTypes TintEasing => EasingTypes.None;
-        protected int TintDuration => 500;
-
-        protected Color4 PopOutColor => Color4.Red;
-        protected override float PopOutInitialAlpha => 1.0f;
-        protected override double PopOutDuration => 300;
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            PopOutCount.Anchor = Anchor.BottomCentre;
-            PopOutCount.Origin = Anchor.Centre;
-            PopOutCount.FadeColour(PopOutColor, 0);
-            OriginalColour = DisplayedCountSpriteText.Colour;
-        }
-
-        protected override void OnCountRolling(ulong currentValue, ulong newValue)
-        {
-            if (!IsRolling && newValue < currentValue)
-            {
-                PopOutCount.Text = FormatCount(currentValue);
-
-                PopOutCount.FadeTo(PopOutInitialAlpha);
-                PopOutCount.ScaleTo(1.0f);
-
-                PopOutCount.FadeOut(PopOutDuration, PopOutEasing);
-                PopOutCount.ScaleTo(PopOutScale, PopOutDuration, PopOutEasing);
-            }
-
-            base.OnCountRolling(currentValue, newValue);
-        }
-
-        /// <summary>
-        /// Tints text while holding a key.
-        /// </summary>
-        /// <remarks>
-        /// Does not alter combo. This has to be done depending of the scoring system.
-        /// (i.e. v1 = each period of time; v2 = when starting and ending a key hold)
-        /// </remarks>
-        public void HoldStart()
-        {
-            if (KeysHeld == 0)
-                DisplayedCountSpriteText.FadeColour(TintColour, TintDuration, TintEasing);
-            KeysHeld++;
-        }
-
-        /// <summary>
-        /// Ends tinting.
-        /// </summary>
-        public void HoldEnd()
-        {
-            KeysHeld--;
-            if (KeysHeld == 0)
-                DisplayedCountSpriteText.FadeColour(OriginalColour, TintDuration, TintEasing);
-        }
-    }
-}

osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs

@@ -1,34 +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
-
-using osu.Game.Modes.Mania.Objects;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.UI;
-
-namespace osu.Game.Modes.Mania.UI
-{
-    public class ManiaHitRenderer : HitRenderer<ManiaBaseHit>
-    {
-        private readonly int columns;
-
-        public ManiaHitRenderer(int columns = 5)
-        {
-            this.columns = columns;
-        }
-
-        protected override HitObjectConverter<ManiaBaseHit> Converter => new ManiaConverter(columns);
-
-        protected override Playfield CreatePlayfield() => new ManiaPlayfield(columns);
-
-        protected override DrawableHitObject GetVisualRepresentation(ManiaBaseHit h)
-        {
-            return null;
-            //return new DrawableNote(h)
-            //{
-            //    Position = new Vector2((float)(h.Column + 0.5) / columns, -0.1f),
-            //    RelativePositionAxes = Axes.Both
-            //};
-        }
-    }
-}

osu.Game.Modes.Mania/UI/ManiaPlayfield.cs

@@ -1,38 +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
-
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Modes.UI;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Mania.UI
-{
-    public class ManiaPlayfield : Playfield
-    {
-        private readonly int columns;
-
-        public ManiaPlayfield(int columns)
-        {
-            this.columns = columns;
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(columns / 20f, 1f);
-            Anchor = Anchor.BottomCentre;
-            Origin = Anchor.BottomCentre;
-
-            Add(new Box { RelativeSizeAxes = Axes.Both, Alpha = 0.5f });
-
-            for (int i = 0; i < columns; i++)
-                Add(new Box()
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(2, 1),
-                    RelativePositionAxes = Axes.Both,
-                    Position = new Vector2((float)i / columns, 0),
-                    Alpha = 0.5f,
-                    Colour = Color4.Black
-                });
-        }
-    }
-}

osu.Game.Modes.Mania/app.config

@@ -1,15 +0,0 @@
-<?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
--->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs

@@ -1,167 +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
-
-using System;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
-using OpenTK;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables
-{
-    public class DrawableHitCircle : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
-    {
-        private OsuHitObject osuObject;
-
-        public ApproachCircle ApproachCircle;
-        private CirclePiece circle;
-        private RingPiece ring;
-        private FlashPiece flash;
-        private ExplodePiece explode;
-        private NumberPiece number;
-        private GlowPiece glow;
-
-        public DrawableHitCircle(OsuHitObject h) : base(h)
-        {
-            Origin = Anchor.Centre;
-
-            osuObject = h;
-
-            Position = osuObject.StackedPosition;
-            Scale = new Vector2(osuObject.Scale);
-
-            Children = new Drawable[]
-            {
-                glow = new GlowPiece
-                {
-                    Colour = osuObject.Colour
-                },
-                circle = new CirclePiece
-                {
-                    Colour = osuObject.Colour,
-                    Hit = () =>
-                    {
-                        if (Judgement.Result.HasValue) return false;
-
-                        ((PositionalJudgementInfo)Judgement).PositionOffset = Vector2.Zero; //todo: set to correct value
-                        UpdateJudgement(true);
-                        return true;
-                    },
-                },
-                number = new NumberPiece()
-                {
-                    Text = h is Spinner ? "S" : (HitObject.ComboIndex + 1).ToString(),
-                },
-                ring = new RingPiece(),
-                flash = new FlashPiece(),
-                explode = new ExplodePiece
-                {
-                    Colour = osuObject.Colour,
-                },
-                ApproachCircle = new ApproachCircle()
-                {
-                    Colour = osuObject.Colour,
-                }
-            };
-
-            //may not be so correct
-            Size = circle.DrawSize;
-        }
-
-        double hit50 = 150;
-        double hit100 = 80;
-        double hit300 = 30;
-
-        protected override void CheckJudgement(bool userTriggered)
-        {
-            if (!userTriggered)
-            {
-                if (Judgement.TimeOffset > hit50)
-                    Judgement.Result = HitResult.Miss;
-                return;
-            }
-
-            double hitOffset = Math.Abs(Judgement.TimeOffset);
-
-            OsuJudgementInfo osuJudgement = Judgement as OsuJudgementInfo;
-
-            if (hitOffset < hit50)
-            {
-                Judgement.Result = HitResult.Hit;
-
-                if (hitOffset < hit300)
-                    osuJudgement.Score = OsuScoreResult.Hit300;
-                else if (hitOffset < hit100)
-                    osuJudgement.Score = OsuScoreResult.Hit100;
-                else if (hitOffset < hit50)
-                    osuJudgement.Score = OsuScoreResult.Hit50;
-            }
-            else
-                Judgement.Result = HitResult.Miss;
-        }
-
-        protected override void UpdateInitialState()
-        {
-            base.UpdateInitialState();
-
-            //sane defaults
-            ring.Alpha = circle.Alpha = number.Alpha = glow.Alpha = 1;
-            ApproachCircle.Alpha = 0;
-            ApproachCircle.Scale = new Vector2(4);
-            explode.Alpha = 0;
-        }
-
-        protected override void UpdatePreemptState()
-        {
-            base.UpdatePreemptState();
-
-            ApproachCircle.FadeIn(Math.Min(TIME_FADEIN * 2, TIME_PREEMPT));
-            ApproachCircle.ScaleTo(1.1f, TIME_PREEMPT);
-        }
-
-        protected override void UpdateState(ArmedState state)
-        {
-            if (!IsLoaded) return;
-
-            base.UpdateState(state);
-
-            ApproachCircle.FadeOut();
-
-            glow.Delay(osuObject.Duration);
-            glow.FadeOut(400);
-
-            switch (state)
-            {
-                case ArmedState.Idle:
-                    Delay(osuObject.Duration + TIME_PREEMPT);
-                    FadeOut(TIME_FADEOUT);
-                    break;
-                case ArmedState.Miss:
-                    FadeOut(TIME_FADEOUT / 5);
-                    break;
-                case ArmedState.Hit:
-                    const double flash_in = 40;
-
-                    flash.FadeTo(0.8f, flash_in);
-                    flash.Delay(flash_in);
-                    flash.FadeOut(100);
-
-                    explode.FadeIn(flash_in);
-
-                    Delay(flash_in, true);
-
-                    //after the flash, we can hide some elements that were behind it
-                    ring.FadeOut();
-                    circle.FadeOut();
-                    number.FadeOut();
-
-                    FadeOut(800);
-                    ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad);
-                    break;
-            }
-        }
-
-        public Drawable ProxiedLayer => ApproachCircle;
-    }
-}

osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs

@@ -1,108 +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
-
-using System.ComponentModel;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Objects.Drawables;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables
-{
-    public class DrawableOsuHitObject : DrawableHitObject
-    {
-        public const float TIME_PREEMPT = 600;
-        public const float TIME_FADEIN = 400;
-        public const float TIME_FADEOUT = 500;
-
-        public DrawableOsuHitObject(OsuHitObject hitObject)
-            : base(hitObject)
-        {
-        }
-
-        public override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.Hit300 };
-
-        protected override void UpdateState(ArmedState state)
-        {
-            if (!IsLoaded) return;
-
-            Flush();
-
-            UpdateInitialState();
-
-            Delay(HitObject.StartTime - Time.Current - TIME_PREEMPT + Judgement.TimeOffset, true);
-
-            UpdatePreemptState();
-
-            Delay(TIME_PREEMPT, true);
-        }
-
-        protected virtual void UpdatePreemptState()
-        {
-            FadeIn(TIME_FADEIN);
-        }
-
-        protected virtual void UpdateInitialState()
-        {
-            Alpha = 0;
-        }
-    }
-
-    public class OsuJudgementInfo : PositionalJudgementInfo
-    {
-        /// <summary>
-        /// The score the user achieved.
-        /// </summary>
-        public OsuScoreResult Score;
-
-        /// <summary>
-        /// The score which would be achievable on a perfect hit.
-        /// </summary>
-        public OsuScoreResult MaxScore = OsuScoreResult.Hit300;
-
-        public int ScoreValue => scoreToInt(Score);
-
-        public int MaxScoreValue => scoreToInt(MaxScore);
-
-        private int scoreToInt(OsuScoreResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-                case OsuScoreResult.Hit50:
-                    return 50;
-                case OsuScoreResult.Hit100:
-                    return 100;
-                case OsuScoreResult.Hit300:
-                    return 300;
-                case OsuScoreResult.SliderTick:
-                    return 10;
-            }
-        }
-
-        public ComboResult Combo;
-    }
-
-    public enum ComboResult
-    {
-        [Description(@"")]
-        None,
-        [Description(@"Good")]
-        Good,
-        [Description(@"Amazing")]
-        Perfect
-    }
-
-    public enum OsuScoreResult
-    {
-        [Description(@"Miss")]
-        Miss,
-        [Description(@"50")]
-        Hit50,
-        [Description(@"100")]
-        Hit100,
-        [Description(@"300")]
-        Hit300,
-        [Description(@"10")]
-        SliderTick
-    }
-}

osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs

@@ -1,120 +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
-
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
-using osu.Game.Beatmaps.Samples;
-using osu.Game.Modes.Objects.Drawables;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables
-{
-    public class DrawableSliderTick : DrawableOsuHitObject
-    {
-        private SliderTick sliderTick;
-
-        public double FadeInTime;
-        public double FadeOutTime;
-
-        public bool Tracking;
-
-        public override bool RemoveWhenNotAlive => false;
-
-        public override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.SliderTick };
-
-        public DrawableSliderTick(SliderTick sliderTick) : base(sliderTick)
-        {
-            this.sliderTick = sliderTick;
-
-            Size = new Vector2(16) * sliderTick.Scale;
-
-            Masking = true;
-            CornerRadius = Size.X / 2;
-
-            Origin = Anchor.Centre;
-
-            BorderThickness = 2;
-            BorderColour = Color4.White;
-
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = sliderTick.Colour,
-                    Alpha = 0.3f,
-                }
-            };
-        }
-
-        private SampleChannel sample;
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            string sampleSet = (HitObject.Sample?.Set ?? SampleSet.Normal).ToString().ToLower();
-
-            sample = audio.Sample.Get($@"Gameplay/{sampleSet}-slidertick");
-        }
-
-        protected override void PlaySample()
-        {
-            sample?.Play();
-        }
-
-
-        protected override void CheckJudgement(bool userTriggered)
-        {
-            var j = Judgement as OsuJudgementInfo;
-
-            if (Judgement.TimeOffset >= 0)
-            {
-                j.Result = Tracking ? HitResult.Hit : HitResult.Miss;
-                j.Score = Tracking ? OsuScoreResult.SliderTick : OsuScoreResult.Miss;
-            }
-        }
-        
-        protected override void UpdatePreemptState()
-        {
-            var animIn = Math.Min(150, sliderTick.StartTime - FadeInTime);
-
-            ScaleTo(0.5f);
-            ScaleTo(1.2f, animIn);
-            FadeIn(animIn);
-
-            Delay(animIn);
-            ScaleTo(1, 150, EasingTypes.Out);
-
-            Delay(-animIn);
-        }
-
-        protected override void UpdateState(ArmedState state)
-        {
-            if (!IsLoaded) return;
-
-            base.UpdateState(state);
-
-            switch (state)
-            {
-                case ArmedState.Idle:
-                    Delay(FadeOutTime - sliderTick.StartTime);
-                    FadeOut();
-                    break;
-                case ArmedState.Miss:
-                    FadeOut(160);
-                    FadeColour(Color4.Red, 80);
-                    break;
-                case ArmedState.Hit:
-                    FadeOut(120, EasingTypes.OutQuint);
-                    ScaleTo(Scale * 1.5f, 120, EasingTypes.OutQuint);
-                    break;
-            }
-        }
-    }
-}

osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -1,158 +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
-
-using System;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.MathUtils;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables
-{
-    public class DrawableSpinner : DrawableOsuHitObject
-    {
-        private Spinner spinner;
-
-        private SpinnerDisc disc;
-        private SpinnerBackground background;
-        private Container circleContainer;
-        private DrawableHitCircle circle;
-
-        public DrawableSpinner(Spinner s) : base(s)
-        {
-            Origin = Anchor.Centre;
-            Position = s.Position;
-
-            //take up full playfield.
-            Size = new Vector2(512);
-
-            spinner = s;
-
-            Children = new Drawable[]
-            {
-                background = new SpinnerBackground
-                {
-                    Alpha = 0,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    DiscColour = Color4.Black
-                },
-                disc = new SpinnerDisc
-                {
-                    Alpha = 0,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    DiscColour = s.Colour
-                },
-                circleContainer = new Container
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Children = new []
-                    {
-                        circle = new DrawableHitCircle(s)
-                        {
-                            Interactive = false,
-                            Position = Vector2.Zero,
-                            Anchor = Anchor.Centre,
-                        }
-                    }
-                }
-            };
-
-            background.Scale = scaleToCircle;
-            disc.Scale = scaleToCircle;
-        }
-
-        public override bool Contains(Vector2 screenSpacePos) => true;
-
-        protected override void CheckJudgement(bool userTriggered)
-        {
-            if (Time.Current < HitObject.StartTime) return;
-
-            var j = Judgement as OsuJudgementInfo;
-
-            disc.ScaleTo(Interpolation.ValueAt(Math.Sqrt(Progress), scaleToCircle, Vector2.One, 0, 1), 100);
-
-            if (Progress >= 1)
-                disc.Complete = true;
-
-            if (!userTriggered && Time.Current >= HitObject.EndTime)
-            {
-                if (Progress >= 1)
-                {
-                    j.Score = OsuScoreResult.Hit300;
-                    j.Result = HitResult.Hit;
-                }
-                else if (Progress > .9)
-                {
-                    j.Score = OsuScoreResult.Hit100;
-                    j.Result = HitResult.Hit;
-                }
-                else if (Progress > .75)
-                {
-                    j.Score = OsuScoreResult.Hit50;
-                    j.Result = HitResult.Hit;
-                }
-                else
-                {
-                    j.Score = OsuScoreResult.Miss;
-                    if (Time.Current >= HitObject.EndTime)
-                        j.Result = HitResult.Miss;
-                }
-            }
-        }
-
-        private Vector2 scaleToCircle => (circle.Scale * circle.DrawWidth / DrawWidth) * 0.95f;
-
-        private float spinsPerMinuteNeeded = 100 + (5 * 15); //TODO: read per-map OD and place it on the 5
-
-        private float rotationsNeeded => (float)(spinsPerMinuteNeeded * (spinner.EndTime - spinner.StartTime) / 60000f);
-
-        public float Progress => MathHelper.Clamp(disc.RotationAbsolute / 360 / rotationsNeeded, 0, 1);
-
-        protected override void UpdatePreemptState()
-        {
-            base.UpdatePreemptState();
-
-            circleContainer.ScaleTo(1, 400, EasingTypes.OutElastic);
-
-            background.Delay(TIME_PREEMPT - 500);
-
-            background.ScaleTo(scaleToCircle * 1.2f, 400, EasingTypes.OutQuint);
-            background.FadeIn(200);
-
-            background.Delay(400);
-            background.ScaleTo(1, 250, EasingTypes.OutQuint);
-
-            disc.Delay(TIME_PREEMPT - 50);
-            disc.FadeIn(200);
-        }
-
-        protected override void UpdateState(ArmedState state)
-        {
-            if (!IsLoaded) return;
-
-            base.UpdateState(state);
-
-            Delay(HitObject.Duration, true);
-
-            FadeOut(160);
-
-            switch (state)
-            {
-                case ArmedState.Hit:
-                    ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
-                    break;
-                case ArmedState.Miss:
-                    ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
-                    break;
-            }
-        }
-    }
-}

osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs

@@ -1,85 +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
-
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Modes.Objects.Drawables;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables
-{
-    public class HitExplosion : FillFlowContainer
-    {
-        private readonly OsuJudgementInfo judgement;
-        private SpriteText line1;
-        private SpriteText line2;
-
-        public HitExplosion(OsuJudgementInfo judgement, OsuHitObject h = null)
-        {
-            this.judgement = judgement;
-            AutoSizeAxes = Axes.Both;
-            Origin = Anchor.Centre;
-
-            Direction = FillDirection.Down;
-            Spacing = new Vector2(0, 2);
-            Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;
-
-            Children = new Drawable[]
-            {
-                line1 = new OsuSpriteText
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = judgement.Score.GetDescription(),
-                    Font = @"Venera",
-                    TextSize = 16,
-                },
-                line2 = new OsuSpriteText
-                {
-                    Text = judgement.Combo.GetDescription(),
-                    Font = @"Venera",
-                    TextSize = 11,
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            if (judgement.Result == HitResult.Miss)
-            {
-                FadeInFromZero(60);
-
-                ScaleTo(1.6f);
-                ScaleTo(1, 100, EasingTypes.In);
-
-                MoveToOffset(new Vector2(0, 100), 800, EasingTypes.InQuint);
-                RotateTo(40, 800, EasingTypes.InQuint);
-
-                Delay(600);
-                FadeOut(200);
-            }
-            else
-            {
-                line1.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint);
-                line2.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint);
-                FadeOut(500);
-            }
-
-            switch (judgement.Result)
-            {
-                case HitResult.Miss:
-                    Colour = Color4.Red;
-                    break;
-            }
-
-            Expire();
-        }
-    }
-}