Fix regression in deployment tool

Replay loading via drag-drop huzzah!

.editorconfig

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

.gitignore

@@ -11,7 +11,7 @@
 *.userprefs
 
 # Build results
-[Dd]ebug/
+bin/[Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
@@ -255,4 +255,5 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
+Staging/

.vscode/launch.json

@@ -2,13 +2,25 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch",
+            "name": "Launch VisualTests",
             "type": "mono",
             "request": "launch",
             "program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Debug/osu!.exe",
             "args": [],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "",
+            "preLaunchTask": "build",
+            "runtimeExecutable": null,
+            "env": {},
+            "externalConsole": false
+        },
+        {
+            "name": "Launch Desktop",
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe",
+            "args": [],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "build",
             "runtimeExecutable": null,
             "env": {},
             "externalConsole": false

ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+osu!lazer is currently in early stages of development and is not yet ready for end users. Please avoid creating issues or bugs if you do not personally intend to fix them. Some acceptable topics include:
+
+- Discussions about technical design decisions
+- Bugs that you have found and are personally willing and able to fix
+- TODO lists of smaller tasks around larger features
+
+Basically, issues are not a place for you to get help. They are a place for developers to collaborate on the game.
+
+If your issue qualifies, replace this text with a detailed description of your issue with as much relevant information as you can provide.

LICENCE

@@ -1,6 +1,4 @@
-The MIT License
-
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

README.md

@@ -6,6 +6,10 @@
 
 Rhythm is just a *click* away. The future of osu! and the beginning of an open era!
 
+# Status
+
+This is still heavily under development and is not intended for end-user use. This repository is intended for developer collaboration. You're welcome to try and use it but please do not submit bug reports without a patch. Please do not ask for help building or using this software.
+
 # Requirements
 
 - A desktop platform which can compile .NET 4.5.

osu.Desktop.Deploy/App.config

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <appSettings>
+    <add key="StagingFolder" value="Staging" />
+    <add key="ReleasesFolder" value="Releases" />
+    <add key="GitHubAccessToken" value="" />
+    <add key="GitHubUsername" value="ppy" />
+    <add key="GitHubRepoName" value="osu" />
+    <add key="ProjectName" value="osu.Desktop" />
+    <add key="NuSpecName" value="osu.Desktop\osu.nuspec" />
+    <add key="SolutionName" value="osu" />
+    <add key="TargetName" value="Client\osu.Desktop" />
+    <add key="PackageName" value="osulazer" />
+    <add key="IconName" value="lazer.ico" />
+    <add key="CodeSigningCertificate" value="" />
+  </appSettings>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </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>
+    </assemblyBinding>
+  </runtime>
+</configuration>

osu.Desktop.Deploy/GitHubObject.cs

@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace osu.Desktop.Deploy
+{
+    internal class GitHubObject
+    {
+        [JsonProperty(@"id")]
+        public int Id;
+
+        [JsonProperty(@"name")]
+        public string Name;
+    }
+}

osu.Desktop.Deploy/GitHubRelease.cs

@@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+
+namespace osu.Desktop.Deploy
+{
+    internal class GitHubRelease
+    {
+        [JsonProperty(@"id")]
+        public int Id;
+
+        [JsonProperty(@"tag_name")]
+        public string TagName => $"v{Name}";
+
+        [JsonProperty(@"name")]
+        public string Name;
+
+        [JsonProperty(@"draft")]
+        public bool Draft;
+
+        [JsonProperty(@"prerelease")]
+        public bool PreRelease;
+
+        [JsonProperty(@"upload_url")]
+        public string UploadUrl;
+    }
+}

osu.Desktop.Deploy/Program.cs

@@ -0,0 +1,423 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.GitHubusercontent.com/ppy/osu-framework/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net;
+using Newtonsoft.Json;
+using osu.Framework.IO.Network;
+using FileWebRequest = osu.Framework.IO.Network.FileWebRequest;
+using WebRequest = osu.Framework.IO.Network.WebRequest;
+
+namespace osu.Desktop.Deploy
+{
+    internal static class Program
+    {
+        private const string nuget_path = @"packages\NuGet.CommandLine.3.5.0\tools\NuGet.exe";
+        private const string squirrel_path = @"packages\squirrel.windows.1.5.2\tools\Squirrel.exe";
+        private const string msbuild_path = @"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe";
+
+        public static string StagingFolder = ConfigurationManager.AppSettings["StagingFolder"];
+        public static string ReleasesFolder = ConfigurationManager.AppSettings["ReleasesFolder"];
+        public static string GitHubAccessToken = ConfigurationManager.AppSettings["GitHubAccessToken"];
+        public static string GitHubUsername = ConfigurationManager.AppSettings["GitHubUsername"];
+        public static string GitHubRepoName = ConfigurationManager.AppSettings["GitHubRepoName"];
+        public static string SolutionName = ConfigurationManager.AppSettings["SolutionName"];
+        public static string ProjectName = ConfigurationManager.AppSettings["ProjectName"];
+        public static string NuSpecName = ConfigurationManager.AppSettings["NuSpecName"];
+        public static string TargetName = ConfigurationManager.AppSettings["TargetName"];
+        public static string PackageName = ConfigurationManager.AppSettings["PackageName"];
+        public static string IconName = ConfigurationManager.AppSettings["IconName"];
+        public static string CodeSigningCertificate = ConfigurationManager.AppSettings["CodeSigningCertificate"];
+
+        public static string GitHubApiEndpoint => $"https://api.github.com/repos/{GitHubUsername}/{GitHubRepoName}/releases";
+        public static string GitHubReleasePage => $"https://github.com/{GitHubUsername}/{GitHubRepoName}/releases";
+
+        /// <summary>
+        /// How many previous build deltas we want to keep when publishing.
+        /// </summary>
+        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\"";
+
+        private static string homeDir => Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        private static string codeSigningCertPath => Path.Combine(homeDir, CodeSigningCertificate);
+        private static string solutionPath => Environment.CurrentDirectory;
+        private static string stagingPath => Path.Combine(solutionPath, StagingFolder);
+        private static string iconPath => Path.Combine(solutionPath, ProjectName, IconName);
+
+        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 string codeSigningPassword;
+
+        public static void Main(string[] args)
+        {
+            displayHeader();
+
+            findSolutionPath();
+
+            if (!Directory.Exists(ReleasesFolder))
+            {
+                write("WARNING: No release directory found. Make sure you want this!", ConsoleColor.Yellow);
+                Directory.CreateDirectory(ReleasesFolder);
+            }
+
+            checkGitHubReleases();
+
+            refreshDirectory(StagingFolder);
+
+            //increment build number until we have a unique one.
+            string verBase = DateTime.Now.ToString("yyyy.Mdd.");
+            int increment = 0;
+            while (Directory.GetFiles(ReleasesFolder, $"*{verBase}{increment}*").Any())
+                increment++;
+
+            string version = $"{verBase}{increment}";
+
+            Console.ForegroundColor = ConsoleColor.White;
+            Console.Write($"Ready to deploy {version}: ");
+            Console.ReadLine();
+
+            sw.Start();
+
+            if (!string.IsNullOrEmpty(CodeSigningCertificate))
+            {
+                Console.Write("Enter code signing password: ");
+                codeSigningPassword = readLineMasked();
+            }
+
+            write("Restoring NuGet packages...");
+            runCommand(nuget_path, "restore " + solutionPath);
+
+            write("Updating AssemblyInfo...");
+            updateAssemblyInfo(version);
+
+            write("Running build process...");
+            runCommand(msbuild_path, $"/v:quiet /m /t:{TargetName.Replace('.', '_')} /p:OutputPath={stagingPath};Configuration=Release {SolutionName}.sln");
+
+            write("Creating NuGet deployment package...");
+            runCommand(nuget_path, $"pack {NuSpecName} -Version {version} -Properties Configuration=Deploy -OutputDirectory {stagingPath} -BasePath {stagingPath}");
+
+            //prune once before checking for files so we can avoid erroring on files which aren't even needed for this build.
+            pruneReleases();
+
+            checkReleaseFiles();
+
+            write("Running squirrel build...");
+            runCommand(squirrel_path, $"--releasify {stagingPath}\\{nupkgFilename(version)} --setupIcon {iconPath} --icon {iconPath} {codeSigningCmd} --no-msi");
+
+            //prune again to clean up before upload.
+            pruneReleases();
+
+            //rename setup to install.
+            File.Copy(Path.Combine(ReleasesFolder, "Setup.exe"), Path.Combine(ReleasesFolder, "install.exe"), true);
+            File.Delete(Path.Combine(ReleasesFolder, "Setup.exe"));
+
+            uploadBuild(version);
+
+            //reset assemblyinfo.
+            updateAssemblyInfo("0.0.0");
+
+            write("Done!", ConsoleColor.White);
+            Console.ReadLine();
+        }
+
+        private static void displayHeader()
+        {
+            Console.ForegroundColor = ConsoleColor.Red;
+            Console.WriteLine();
+            Console.WriteLine("  Please note that OSU! and PPY are registered trademarks and as such covered by trademark law.");
+            Console.WriteLine("  Do not distribute builds of this project publicly that make use of these.");
+            Console.ResetColor();
+            Console.WriteLine();
+        }
+
+        /// <summary>
+        /// Ensure we have all the files in the release directory which are expected to be there.
+        /// This should have been accounted for in earlier steps, and just serves as a verification step.
+        /// </summary>
+        private static void checkReleaseFiles()
+        {
+            var releaseLines = getReleaseLines();
+
+            //ensure we have all files necessary
+            foreach (var l in releaseLines)
+                if (!File.Exists(Path.Combine(ReleasesFolder, l.Filename)))
+                    error($"Local file missing {l.Filename}");
+        }
+
+        private static IEnumerable<ReleaseLine> getReleaseLines() => File.ReadAllLines(Path.Combine(ReleasesFolder, "RELEASES")).Select(l => new ReleaseLine(l));
+
+        private static void pruneReleases()
+        {
+            write("Pruning RELEASES...");
+
+            var releaseLines = getReleaseLines().ToList();
+
+            var fulls = releaseLines.Where(l => l.Filename.Contains("-full")).Reverse().Skip(1);
+
+            //remove any FULL releases (except most recent)
+            foreach (var l in fulls)
+            {
+                write($"- Removing old release {l.Filename}", ConsoleColor.Yellow);
+                File.Delete(Path.Combine(ReleasesFolder, l.Filename));
+                releaseLines.Remove(l);
+            }
+
+            //remove excess deltas
+            var deltas = releaseLines.Where(l => l.Filename.Contains("-delta")).ToArray();
+            if (deltas.Length > 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));
+                    releaseLines.Remove(l);
+                }
+            }
+
+            var lines = new List<string>();
+            releaseLines.ForEach(l => lines.Add(l.ToString()));
+            File.WriteAllLines(Path.Combine(ReleasesFolder, "RELEASES"), lines);
+        }
+
+        private static void uploadBuild(string version)
+        {
+            if (string.IsNullOrEmpty(GitHubAccessToken) || string.IsNullOrEmpty(codeSigningCertPath))
+                return;
+
+            write("Publishing to GitHub...");
+
+            write($"- Creating release {version}...", ConsoleColor.Yellow);
+            var req = new JsonWebRequest<GitHubRelease>($"{GitHubApiEndpoint}")
+            {
+                Method = HttpMethod.POST
+            };
+            req.AddRaw(JsonConvert.SerializeObject(new GitHubRelease
+            {
+                Name = version,
+                Draft = true,
+                PreRelease = true
+            }));
+            req.AuthenticatedBlockingPerform();
+
+            var assetUploadUrl = req.ResponseObject.UploadUrl.Replace("{?name,label}", "?name={0}");
+            foreach (var a in Directory.GetFiles(ReleasesFolder).Reverse()) //reverse to upload RELEASES first.
+            {
+                write($"- Adding asset {a}...", ConsoleColor.Yellow);
+                var upload = new WebRequest(assetUploadUrl, Path.GetFileName(a))
+                {
+                    Method = HttpMethod.POST,
+                    ContentType = "application/octet-stream",
+                };
+
+                upload.AddRaw(File.ReadAllBytes(a));
+                upload.AuthenticatedBlockingPerform();
+            }
+
+            openGitHubReleasePage();
+        }
+
+        private static void openGitHubReleasePage() => Process.Start(GitHubReleasePage);
+
+        private static void checkGitHubReleases()
+        {
+            write("Checking GitHub releases...");
+            var req = new JsonWebRequest<List<GitHubRelease>>($"{GitHubApiEndpoint}");
+            req.AuthenticatedBlockingPerform();
+
+            var lastRelease = req.ResponseObject.FirstOrDefault();
+
+            if (lastRelease == null)
+                return;
+
+            if (lastRelease.Draft)
+            {
+                openGitHubReleasePage();
+                error("There's a pending draft release! You probably don't want to push a build with this present.");
+            }
+
+            //there's a previous release for this project.
+            var assetReq = new JsonWebRequest<List<GitHubObject>>($"{GitHubApiEndpoint}/{lastRelease.Id}/assets");
+            assetReq.AuthenticatedBlockingPerform();
+            var assets = assetReq.ResponseObject;
+
+            //make sure our RELEASES file is the same as the last build on the server.
+            var releaseAsset = assets.FirstOrDefault(a => a.Name == "RELEASES");
+
+            //if we don't have a RELEASES asset then the previous release likely wasn't a Squirrel one.
+            if (releaseAsset == null) return;
+
+            write($"Last GitHub release was {lastRelease.Name}.");
+
+            bool requireDownload = false;
+
+            if (!File.Exists(Path.Combine(ReleasesFolder, nupkgDistroFilename(lastRelease.Name))))
+            {
+                write("Last verion's package not found locally.", ConsoleColor.Red);
+                requireDownload = true;
+            }
+            else
+            {
+                var lastReleases = new RawFileWebRequest($"{GitHubApiEndpoint}/assets/{releaseAsset.Id}");
+                lastReleases.AuthenticatedBlockingPerform();
+                if (File.ReadAllText(Path.Combine(ReleasesFolder, "RELEASES")) != lastReleases.ResponseString)
+                {
+                    write("Server's RELEASES differed from ours.", ConsoleColor.Red);
+                    requireDownload = true;
+                }
+            }
+
+            if (!requireDownload) return;
+
+            write("Refreshing local releases directory...");
+            refreshDirectory(ReleasesFolder);
+
+            foreach (var a in assets)
+            {
+                write($"- Downloading {a.Name}...", ConsoleColor.Yellow);
+                new FileWebRequest(Path.Combine(ReleasesFolder, a.Name), $"{GitHubApiEndpoint}/assets/{a.Id}").AuthenticatedBlockingPerform();
+            }
+        }
+
+        private static void refreshDirectory(string directory)
+        {
+            if (Directory.Exists(directory))
+                Directory.Delete(directory, true);
+            Directory.CreateDirectory(directory);
+        }
+
+        private static void updateAssemblyInfo(string version)
+        {
+            string file = Path.Combine(ProjectName, "Properties", "AssemblyInfo.cs");
+
+            var l1 = File.ReadAllLines(file);
+            List<string> l2 = new List<string>();
+            foreach (var l in l1)
+            {
+                if (l.StartsWith("[assembly: AssemblyVersion("))
+                    l2.Add($"[assembly: AssemblyVersion(\"{version}\")]");
+                else if (l.StartsWith("[assembly: AssemblyFileVersion("))
+                    l2.Add($"[assembly: AssemblyFileVersion(\"{version}\")]");
+                else
+                    l2.Add(l);
+            }
+
+            File.WriteAllLines(file, l2);
+        }
+
+        /// <summary>
+        /// Find the base path of the active solution (git checkout location)
+        /// </summary>
+        private static void findSolutionPath()
+        {
+            string path = Path.GetDirectoryName(Environment.CommandLine.Replace("\"", "").Trim());
+
+            if (string.IsNullOrEmpty(path))
+                path = Environment.CurrentDirectory;
+
+            while (!File.Exists(Path.Combine(path, $"{SolutionName}.sln")))
+                path = path.Remove(path.LastIndexOf('\\'));
+            path += "\\";
+
+            Environment.CurrentDirectory = path;
+        }
+
+        private static bool runCommand(string command, string args)
+        {
+            var psi = new ProcessStartInfo(command, args)
+            {
+                WorkingDirectory = solutionPath,
+                CreateNoWindow = true,
+                RedirectStandardOutput = true,
+                UseShellExecute = false,
+                WindowStyle = ProcessWindowStyle.Hidden
+            };
+
+            Process p = Process.Start(psi);
+            if (p == null) return false;
+
+            string output = p.StandardOutput.ReadToEnd();
+
+            if (p.ExitCode == 0) return true;
+
+            write(output);
+            error($"Command {command} {args} failed!");
+            return false;
+        }
+
+        private static string readLineMasked()
+        {
+            var fg = Console.ForegroundColor;
+            Console.ForegroundColor = Console.BackgroundColor;
+            var ret = Console.ReadLine();
+            Console.ForegroundColor = fg;
+
+            return ret;
+        }
+
+        private static void error(string message)
+        {
+            Console.ForegroundColor = ConsoleColor.Red;
+            Console.WriteLine($"FATAL ERROR: {message}");
+
+            Console.ReadLine();
+            Environment.Exit(-1);
+        }
+
+        private static void write(string message, ConsoleColor col = ConsoleColor.Gray)
+        {
+            if (sw.ElapsedMilliseconds > 0)
+            {
+                Console.ForegroundColor = ConsoleColor.Green;
+                Console.Write(sw.ElapsedMilliseconds.ToString().PadRight(8));
+            }
+            Console.ForegroundColor = col;
+            Console.WriteLine(message);
+        }
+
+        public static void AuthenticatedBlockingPerform(this WebRequest r)
+        {
+            r.AddHeader("Authorization", $"token {GitHubAccessToken}");
+            r.BlockingPerform();
+        }
+    }
+
+    internal class RawFileWebRequest : WebRequest
+    {
+        public RawFileWebRequest(string url) : base(url)
+        {
+        }
+
+        protected override HttpWebRequest CreateWebRequest(string requestString = null)
+        {
+            var req = base.CreateWebRequest(requestString);
+            req.Accept = "application/octet-stream";
+            return req;
+        }
+    }
+
+    internal class ReleaseLine
+    {
+        public string Hash;
+        public string Filename;
+        public int Filesize;
+
+        public ReleaseLine(string line)
+        {
+            var split = line.Split(' ');
+            Hash = split[0];
+            Filename = split[1];
+            Filesize = int.Parse(split[2]);
+        }
+
+        public override string ToString() => $"{Hash} {Filename} {Filesize}";
+    }
+}

osu.Desktop.Deploy/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// 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")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("osu.Desktop.Deploy")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[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 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("baea2f74-0315-4667-84e0-acac0b4bf785")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// 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")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

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

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{BAEA2F74-0315-4667-84E0-ACAC0B4BF785}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>osu.Desktop.Deploy</RootNamespace>
+    <AssemblyName>osu.Desktop.Deploy</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>osu.Desktop.Deploy.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.1.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+      <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>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(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>
+    <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>
+      <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>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GitHubObject.cs" />
+    <Compile Include="GitHubRelease.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu-framework\osu.Framework.Desktop\osu.Framework.Desktop.csproj">
+      <Project>{65dc628f-a640-4111-ab35-3a5652bc1e17}</Project>
+      <Name>osu.Framework.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
+      <Project>{C76BF5B3-985E-4D39-95FE-97C9C879B83A}</Project>
+      <Name>osu.Framework</Name>
+    </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. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

osu.Desktop.Deploy/packages.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="Splat" version="2.0.0" targetFramework="net452" />
+  <package id="squirrel.windows" version="1.5.2" targetFramework="net452" />
+</packages>

osu.Desktop.Tests/BenchmarkTest.cs

@@ -0,0 +1,32 @@
+// 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/app.config

@@ -0,0 +1,15 @@
+<?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.Tests/osu.Desktop.Tests.csproj

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{230AC4F3-7783-49FB-9AEC-B83CDA3B9F3D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>osu.Desktop.Tests</RootNamespace>
+    <AssemblyName>osu.Desktop.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </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>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
+    </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>
+    <Reference Include="SQLite.Net.Platform.Win32">
+      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net4\SQLite.Net.Platform.Win32.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLite.Net.Platform.Generic">
+      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BenchmarkTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu-framework\osu.Framework.Desktop\osu.Framework.Desktop.csproj">
+      <Project>{65DC628F-A640-4111-AB35-3A5652BC1E17}</Project>
+      <Name>osu.Framework.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
+      <Project>{C76BF5B3-985E-4D39-95FE-97C9C879B83A}</Project>
+      <Name>osu.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj">
+      <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
+      <Name>osu.Game.Resources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Desktop.VisualTests\osu.Desktop.VisualTests.csproj">
+      <Project>{69051C69-12AE-4E7D-A3E6-460D2E282312}</Project>
+      <Name>osu.Desktop.VisualTests</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Modes.Catch\osu.Game.Modes.Catch.csproj">
+      <Project>{58F6C80C-1253-4A0E-A465-B8C85EBEADF3}</Project>
+      <Name>osu.Game.Modes.Catch</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Modes.Mania\osu.Game.Modes.Mania.csproj">
+      <Project>{48F4582B-7687-4621-9CBE-5C24197CB536}</Project>
+      <Name>osu.Game.Modes.Mania</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
+      <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
+      <Name>osu.Game.Modes.Osu</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Modes.Taiko\osu.Game.Modes.Taiko.csproj">
+      <Project>{F167E17A-7DE6-4AF5-B920-A5112296C695}</Project>
+      <Name>osu.Game.Modes.Taiko</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
+      <Project>{0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D}</Project>
+      <Name>osu.Game</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

osu.Desktop.Tests/packages.config

@@ -0,0 +1,12 @@
+<?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="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="NUnit" version="3.5.0" 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" />
+</packages>

osu.Desktop.VisualTests/Benchmark.cs

@@ -0,0 +1,45 @@
+// 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/OpenTK.dll.config

@@ -1,3 +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
+-->
 <configuration>
   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>

osu.Desktop.VisualTests/Platform/TestStorage.cs

@@ -1,26 +1,29 @@
-using osu.Framework;
-using osu.Framework.Desktop.Platform;
-using SQLite.Net;
-using SQLite.Net.Interop;
-using SQLite.Net.Platform.Generic;
-using SQLite.Net.Platform.Win32;
-
-namespace osu.Desktop.VisualTests.Platform
-{
-    public class TestStorage : DesktopStorage
-    {
-        public TestStorage(string baseName) : base(baseName)
-        {
-        }
-        
-        public override SQLiteConnection GetDatabase(string name)
-        {
-            ISQLitePlatform platform;
-            if (RuntimeInfo.IsWindows)
-                platform = new SQLitePlatformWin32();
-            else
-                platform = new SQLitePlatformGeneric();
-            return new SQLiteConnection(platform, $@":memory:");
-        }
-    }
+// 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;
+using osu.Framework.Desktop.Platform;
+using SQLite.Net;
+using SQLite.Net.Interop;
+using SQLite.Net.Platform.Generic;
+using SQLite.Net.Platform.Win32;
+
+namespace osu.Desktop.VisualTests.Platform
+{
+    public class TestStorage : DesktopStorage
+    {
+        public TestStorage(string baseName) : base(baseName)
+        {
+        }
+        
+        public override SQLiteConnection GetDatabase(string name)
+        {
+            ISQLitePlatform platform;
+            if (RuntimeInfo.IsWindows)
+                platform = new SQLitePlatformWin32();
+            else
+                platform = new SQLitePlatformGeneric();
+            return new SQLiteConnection(platform, @":memory:");
+        }
+    }
 }

osu.Desktop.VisualTests/Program.cs

@@ -1,9 +1,8 @@
-// Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
+// 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.Desktop;
-using osu.Framework.Desktop.Platform;
 using osu.Framework.Platform;
 using osu.Game.Modes;
 using osu.Game.Modes.Catch;
@@ -18,15 +17,19 @@ namespace osu.Desktop.VisualTests
         [STAThread]
         public static void Main(string[] args)
         {
-            using (BasicGameHost host = Host.GetSuitableHost(@"osu-visual-tests"))
+            bool benchmark = args.Length > 0 && args[0] == @"-benchmark";
+
+            using (GameHost host = Host.GetSuitableHost(@"osu"))
             {
                 Ruleset.Register(new OsuRuleset());
                 Ruleset.Register(new TaikoRuleset());
                 Ruleset.Register(new ManiaRuleset());
                 Ruleset.Register(new CatchRuleset());
 
-                host.Add(new VisualTestGame());
-                host.Run();
+                if (benchmark)
+                    host.Run(new Benchmark());
+                else
+                    host.Run(new VisualTestGame());
             }
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.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.Screens.Testing;
+using osu.Game.Screens.Select.Options;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBeatmapOptionsOverlay : TestCase
+    {
+        public override string Description => @"Beatmap options in song select";
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            var overlay = new BeatmapOptionsOverlay();
+
+            Add(overlay);
+
+            AddButton(@"Toggle", overlay.ToggleVisibility);
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs

@@ -1,143 +1,27 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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 System.Diagnostics;
-using System.Linq;
-using osu.Framework;
-using osu.Framework.GameModes.Testing;
-using osu.Framework.Graphics;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Threading;
-using osu.Game;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Online.Chat;
-using OpenTK;
-using osu.Framework.Allocation;
-using osu.Game.Online.Chat.Drawables;
+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 API polling";
-
-        FlowContainer flow;
-
-        private Scheduler scheduler = new Scheduler();
-
-        private APIAccess api;
-
-        private ChannelDisplay channelDisplay;
-
-        [BackgroundDependencyLoader]
-        private void load(APIAccess api)
-        {
-            this.api = api;
-        }
+        public override string Description => @"Testing chat api and overlay";
 
         public override void Reset()
         {
             base.Reset();
 
-            if (api.State != APIState.Online)
-                api.OnStateChange += delegate { initializeChannels(); };
-            else
-                initializeChannels();
-        }
-
-        protected override void Update()
-        {
-            scheduler.Update();
-            base.Update();
-        }
-
-        private long? lastMessageId;
-
-        List<Channel> careChannels;
-
-        private void initializeChannels()
-        {
-            careChannels = new List<Channel>();
-
-            if (api.State != APIState.Online)
-                return;
-
-            Add(flow = new FlowContainer
+            Add(new ChatOverlay
             {
-                RelativeSizeAxes = Axes.Both,
-                Direction = FlowDirection.VerticalOnly
+                State = Visibility.Visible
             });
-
-            SpriteText loading;
-            Add(loading = new SpriteText
-            {
-                Text = @"Loading available channels...",
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                TextSize = 40,
-            });
-
-            messageRequest?.Cancel();
-
-            ListChannelsRequest req = new ListChannelsRequest();
-            req.Success += delegate (List<Channel> channels)
-            {
-                Scheduler.Add(delegate
-                {
-                    loading.FadeOut(100);
-                });
-
-                addChannel(channels.Find(c => c.Name == @"#osu"));
-                addChannel(channels.Find(c => c.Name == @"#lobby"));
-                addChannel(channels.Find(c => c.Name == @"#english"));
-
-                messageRequest = scheduler.AddDelayed(() => FetchNewMessages(api), 1000, true);
-            };
-            api.Queue(req);
-        }
-
-        private void addChannel(Channel channel)
-        {
-            flow.Add(channelDisplay = new ChannelDisplay(channel)
-            {
-                Size = new Vector2(1, 0.3f)
-            });
-
-            careChannels.Add(channel);
-        }
-
-        GetMessagesRequest fetchReq;
-
-        public void FetchNewMessages(APIAccess api)
-        {
-            if (fetchReq != null) return;
-
-            fetchReq = new GetMessagesRequest(careChannels, lastMessageId);
-            fetchReq.Success += delegate (List<Message> messages)
-            {
-                foreach (Message m in messages)
-                {
-                    careChannels.Find(c => c.Id == m.ChannelId).AddNewMessages(m);
-                }
-
-                lastMessageId = messages.LastOrDefault()?.Id ?? lastMessageId;
-
-                Debug.Write("success!");
-                fetchReq = null;
-            };
-            fetchReq.Failure += delegate
-            {
-                Debug.Write("failure!");
-                fetchReq = null;
-            };
-
-            api.Queue(fetchReq);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs

@@ -0,0 +1,78 @@
+// 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.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseDialogOverlay : TestCase
+    {
+        public override string Description => @"Display dialogs";
+
+        private DialogOverlay overlay;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(overlay = new DialogOverlay());
+
+            AddButton("dialog #1", () => overlay.Push(new PopupDialog
+            {
+                Icon = FontAwesome.fa_trash_o,
+                HeaderText = @"Confirm deletion of",
+                BodyText = @"Ayase Rie - Yuima-ru*World TVver.",
+                Buttons = new PopupDialogButton[]
+                {
+                    new PopupDialogOkButton
+                    {
+                        Text = @"I never want to see this again.",
+                        Action = () => System.Console.WriteLine(@"OK"),
+                    },
+                    new PopupDialogCancelButton
+                    {
+                        Text = @"Firetruck, I still want quick ranks!",
+                        Action = () => System.Console.WriteLine(@"Cancel"),
+                    },
+                },
+            }));
+
+            AddButton("dialog #2", () => overlay.Push(new PopupDialog
+            {
+                Icon = FontAwesome.fa_gear,
+                HeaderText = @"What do you want to do with",
+                BodyText = "Camellia as \"Bang Riot\" - Blastix Riotz",
+                Buttons = new PopupDialogButton[]
+                {
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Manage collections",
+                    },
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Delete...",
+                    },
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Remove from unplayed",
+                    },
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Clear local scores",
+                    },
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Edit",
+                    },
+                    new PopupDialogCancelButton
+                    {
+                        Text = @"Cancel",
+                    },
+                },
+            }));
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs

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

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -1,48 +1,41 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Modes.Catch;
 using osu.Game.Modes.Catch.UI;
-using osu.Game.Modes.Mania;
 using osu.Game.Modes.Mania.UI;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.Taiko;
 using osu.Game.Modes.Taiko.UI;
 using OpenTK;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseGamefield : TestCase
+    internal class TestCaseGamefield : TestCase
     {
-        public override string Name => @"Gamefield";
-
         public override string Description => @"Showing hitobjects and what not.";
 
         public override void Reset()
         {
             base.Reset();
 
-            //ensure we are at offset 0
-            Clock = new FramedClock();
-
             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, 512), RNG.Next(0, 384)),
+                    Scale = RNG.NextSingle(0.5f, 1.0f),
                 });
 
                 time += RNG.Next(50, 500);
@@ -55,41 +48,44 @@ namespace osu.Desktop.VisualTests.Tests
 
             Add(new Drawable[]
             {
-                new OsuHitRenderer
+                new Container
                 {
-                    Objects = beatmap.HitObjects,
-                    Scale = new Vector2(0.5f),
-                    Anchor = Anchor.TopLeft,
-                    Origin = Anchor.TopLeft
-                },
-                new TaikoHitRenderer
-                {
-                    Objects = beatmap.HitObjects,
-                    Scale = new Vector2(0.5f),
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight
-                },
-                new CatchHitRenderer
-                {
-                    Objects = beatmap.HitObjects,
-                    Scale = new Vector2(0.5f),
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft
-                },
-                new ManiaHitRenderer
-                {
-                    Objects = beatmap.HitObjects,
-                    Scale = new Vector2(0.5f),
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.BottomRight
+                    RelativeSizeAxes = Axes.Both,
+                    //ensure we are at offset 0
+                    Clock = new FramedClock(),
+                    Children = new Drawable[]
+                    {
+                        new OsuHitRenderer
+                        {
+                            Beatmap = beatmap,
+                            Scale = new Vector2(0.5f),
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft
+                        },
+                        new TaikoHitRenderer
+                        {
+                            Beatmap = beatmap,
+                            Scale = new Vector2(0.5f),
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight
+                        },
+                        new CatchHitRenderer
+                        {
+                            Beatmap = beatmap,
+                            Scale = new Vector2(0.5f),
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft
+                        },
+                        new ManiaHitRenderer
+                        {
+                            Beatmap = beatmap,
+                            Scale = new Vector2(0.5f),
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight
+                        }
+                    }
                 }
             });
         }
-
-        protected override void Update()
-        {
-            base.Update();
-            Clock.ProcessFrame();
-        }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -1,68 +1,144 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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;
-using osu.Framework.GameModes.Testing;
+using System.Collections.Generic;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using OpenTK;
-using osu.Framework.Allocation;
-using osu.Game.Modes.Objects;
+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.Containers;
-using osu.Game.Modes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using OpenTK.Graphics;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseHitObjects : TestCase
+    internal class TestCaseHitObjects : TestCase
     {
-        public override string Name => @"Hit Objects";
+        private StopwatchClock rateAdjustClock;
+        private FramedClock framedClock;
+
+        private bool auto;
 
         public TestCaseHitObjects()
         {
-            var swClock = new StopwatchClock(true) { Rate = 1 };
-            Clock = new FramedClock(swClock);
+            rateAdjustClock = new StopwatchClock(true);
+            framedClock = new FramedClock(rateAdjustClock);
+            playbackSpeed.ValueChanged += delegate { rateAdjustClock.Rate = playbackSpeed.Value; };
+        }
+
+        private HitObjectType mode = HitObjectType.Slider;
+
+        private BindableNumber<double> playbackSpeed = new BindableDouble(0.5) { MinValue = 0, MaxValue = 1 };
+        private Container playfieldContainer;
+        private Container approachContainer;
+
+        private void load(HitObjectType mode)
+        {
+            this.mode = mode;
+
+            switch (mode)
+            {
+                case HitObjectType.Circle:
+                    const int count = 10;
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        var h = new HitCircle
+                        {
+                            StartTime = framedClock.CurrentTime + 600 + i * 80,
+                            Position = new Vector2((i - count / 2) * 14),
+                        };
+
+                        add(new DrawableHitCircle(h));
+                    }
+                    break;
+                case HitObjectType.Slider:
+                    add(new DrawableSlider(new Slider
+                    {
+                        StartTime = framedClock.CurrentTime + 600,
+                        ControlPoints = new List<Vector2>
+                        {
+                            new Vector2(-200, 0),
+                            new Vector2(400, 0),
+                        },
+                        Length = 400,
+                        Position = new Vector2(-200, 0),
+                        Velocity = 1,
+                        TickDistance = 100,
+                    }));
+                    break;
+                case HitObjectType.Spinner:
+                    add(new DrawableSpinner(new Spinner
+                    {
+                        StartTime = framedClock.CurrentTime + 600,
+                        Length = 1000,
+                        Position = new Vector2(0, 0),
+                    }));
+                    break;
+            }
         }
 
         public override void Reset()
         {
             base.Reset();
 
-            Clock.ProcessFrame();
+            playbackSpeed.TriggerChange();
 
-            Container approachContainer = new Container { Depth = float.MinValue, };
+            AddButton(@"circles", () => load(HitObjectType.Circle));
+            AddButton(@"slider", () => load(HitObjectType.Slider));
+            AddButton(@"spinner", () => load(HitObjectType.Spinner));
 
-            Add(approachContainer);
+            AddToggle(@"auto", state => { auto = state; load(mode); });
 
-            const int count = 10;
-
-            for (int i = 0; i < count; i++)
+            ButtonsContainer.Add(new SpriteText { Text = "Playback Speed" });
+            ButtonsContainer.Add(new BasicSliderBar<double>
             {
-                var h = new HitCircle
-                {
-                    StartTime = Clock.CurrentTime + 1000 + i * 80,
-                    Position = new Vector2((i - count / 2) * 14),
-                };
+                Width = 150,
+                Height = 10,
+                SelectionColor = Color4.Orange,
+                Bindable = playbackSpeed
+            });
 
-                DrawableHitCircle d = new DrawableHitCircle(h)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Depth = i,
-                    State = ArmedState.Hit,
-                };
+            framedClock.ProcessFrame();
 
-                approachContainer.Add(d.ApproachCircle.CreateProxy());
-                Add(d);
-            }
+            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);
         }
 
-        protected override void Update()
+        private int depth;
+
+        private void add(DrawableHitObject h)
         {
-            base.Update();
-            Clock.ProcessFrame();
+            h.Anchor = Anchor.Centre;
+            h.Depth = depth++;
+
+            if (auto)
+            {
+                h.State = ArmedState.Hit;
+                h.Judgement = new OsuJudgementInfo { Result = HitResult.Hit };
+            }
+
+            playfieldContainer.Add(h);
+            var proxyable = h as IDrawableHitObjectWithProxiedApproach;
+            if (proxyable != null)
+                approachContainer.Add(proxyable.ProxiedLayer.CreateProxy());
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -1,39 +1,90 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
 using OpenTK.Input;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Configuration;
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.MathUtils;
+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()
         {
             base.Reset();
 
-            Children = new[]
+            KeyCounterCollection kc = new KeyCounterCollection
             {
-                new KeyCounterCollection
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                IsCounting = true,
+                Children = new KeyCounter[]
                 {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    IsCounting = true,
-                    Counters = 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", () =>
+            {
+                Key key = (Key)((int)Key.A + RNG.Next(26));
+                kc.Add(new KeyCounterKeyboard(key));
+            });
+            ButtonsContainer.Add(new SpriteText { Text = "FadeTime" });
+            ButtonsContainer.Add(new TestSliderBar<int>
+            {
+                Width = 150,
+                Height = 10,
+                SelectionColor = Color4.Orange,
+                Bindable = bindable
+            });
+            Add(kc);
+        }
+        private class TestSliderBar<T> : SliderBar<T> where T : struct
+        {
+            public Color4 Color
+            {
+                get { return Box.Colour; }
+                set { Box.Colour = value; }
+            }
+
+            public Color4 SelectionColor
+            {
+                get { return SelectionBox.Colour; }
+                set { SelectionBox.Colour = value; }
+            }
+
+            protected readonly Box SelectionBox;
+            protected readonly Box Box;
+
+            public TestSliderBar()
+            {
+                Children = new Drawable[]
+                {
+                    Box = new Box { RelativeSizeAxes = Axes.Both },
+                    SelectionBox = new Box { RelativeSizeAxes = Axes.Both }
+                };
+            }
+
+            protected override void UpdateValue(float value)
+            {
+                SelectionBox.ScaleTo(
+                    new Vector2(value, 1),
+                    300, EasingTypes.OutQuint);
+            }
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs

@@ -1,7 +1,7 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Menu;
@@ -9,9 +9,8 @@ using OpenTK.Graphics;
 
 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()

osu.Desktop.VisualTests/Tests/TestCaseModSelectOverlay.cs

@@ -0,0 +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.Graphics;
+using osu.Game.Overlays.Mods;
+using osu.Framework.Screens.Testing;
+using osu.Game.Modes;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseModSelectOverlay : TestCase
+    {
+        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/TestCaseMusicController.cs

@@ -1,19 +1,19 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using osu.Game.Overlays;
+using osu.Framework.Graphics.Containers;
 
 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.";
 
-        protected MusicController mc;
+        private MusicController mc;
 
         public TestCaseMusicController()
         {
@@ -30,13 +30,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Anchor = Anchor.Centre
             };
             Add(mc);
-            AddToggle(@"Show", mc.ToggleVisibility);
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-            Clock.ProcessFrame();
+            AddToggle(@"Show", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs

@@ -0,0 +1,117 @@
+// 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.Screens.Testing;
+using osu.Framework.MathUtils;
+using osu.Game.Overlays;
+using System.Linq;
+using osu.Game.Overlays.Notifications;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseNotificationManager : TestCase
+    {
+        public override string Description => @"I handle notifications";
+
+        private NotificationManager manager;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            progressingNotifications.Clear();
+
+            Content.Add(manager = new NotificationManager
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+            });
+
+            AddToggle(@"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());
+        }
+
+        private void sendBarrage(int remaining = 100)
+        {
+            switch (RNG.Next(0, 4))
+            {
+                case 0:
+                    sendNotification1();
+                    break;
+                case 1:
+                    sendNotification2();
+                    break;
+                case 2:
+                    sendProgress1();
+                    break;
+                case 3:
+                    sendProgress2();
+                    break;
+            }
+
+            if (remaining > 0)
+            {
+                Delay(80);
+                Schedule(() => sendBarrage(remaining - 1));
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            progressingNotifications.RemoveAll(n => n.State == ProgressNotificationState.Completed);
+
+            while (progressingNotifications.Count(n => n.State == ProgressNotificationState.Active) < 3)
+            {
+                var p = progressingNotifications.FirstOrDefault(n => n.IsLoaded && n.State == ProgressNotificationState.Queued);
+                if (p == null)
+                    break;
+
+                p.State = ProgressNotificationState.Active;
+            }
+
+            foreach (var n in progressingNotifications.FindAll(n => n.State == ProgressNotificationState.Active))
+            {
+                if (n.Progress < 1)
+                    n.Progress += (float)(Time.Elapsed / 2000) * RNG.NextSingle();
+                else
+                    n.State = ProgressNotificationState.Completed;
+            }
+        }
+
+        private void sendProgress2()
+        {
+            var n = new ProgressNotification { Text = @"Downloading Haitai..." };
+            manager.Post(n);
+            progressingNotifications.Add(n);
+        }
+
+        private List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
+
+        private void sendProgress1()
+        {
+            var n = new ProgressNotification { Text = @"Uploading to BSS..." };
+            manager.Post(n);
+            progressingNotifications.Add(n);
+        }
+
+        private void sendNotification2()
+        {
+            manager.Post(new SimpleNotification { Text = @"You are amazing" });
+        }
+
+        private void sendNotification1()
+        {
+            manager.Post(new SimpleNotification { Text = @"Welcome to osu!. Enjoy your stay!" });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseOptions.cs

@@ -1,19 +1,13 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.GameModes.Testing;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
-using OpenTK.Input;
+using osu.Framework.Screens.Testing;
 using osu.Game.Overlays;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseOptions : TestCase
+    internal class TestCaseOptions : TestCase
     {
-        public override string Name => @"Options";
-
         public override string Description => @"Tests the options overlay";
 
         private OptionsOverlay options;

osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs

@@ -0,0 +1,38 @@
+// 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
+{
+    internal class TestCasePauseOverlay : TestCase
+    {
+        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,21 +1,22 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.Desktop.VisualTests.Platform;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
+using osu.Framework.MathUtils;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Screens.Select;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCasePlaySongSelect : TestCase
+    internal class TestCasePlaySongSelect : TestCase
     {
         private BeatmapDatabase db, oldDb;
         private TestStorage storage;
+        private PlaySongSelect songSelect;
 
-        public override string Name => @"Song Select";
         public override string Description => @"with fake data";
 
         public override void Reset()
@@ -35,13 +36,23 @@ namespace osu.Desktop.VisualTests.Tests
 
                 db.Import(sets);
             }
-            Add(new PlaySongSelect());
+
+            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);
         }
 
@@ -49,21 +60,22 @@ namespace osu.Desktop.VisualTests.Tests
         {
             return new BeatmapSetInfo
             {
-                BeatmapSetID = 1234 + i,
+                OnlineBeatmapSetID = 1234 + i,
                 Hash = "d8e8fca2dc0f896fd7cb4cb0031ba249",
                 Path = string.Empty,
                 Metadata = new BeatmapMetadata
                 {
-                    BeatmapSetID = 1234 + i,
-                    Artist = "MONACA",
-                    Title = "Black Song",
-                    Author = "Some Guy",
+                    OnlineBeatmapSetID = 1234 + i,
+                    // Create random metadata, then we can check if sorting works based on these
+                    Artist = "MONACA " + RNG.Next(0, 9),
+                    Title = "Black Song " + RNG.Next(0, 9),
+                    Author = "Some Guy " + RNG.Next(0, 9),
                 },
                 Beatmaps = new List<BeatmapInfo>(new[]
                 {
                     new BeatmapInfo
                     {
-                        BeatmapID = 1234 + i,
+                        OnlineBeatmapID = 1234 + i,
                         Mode = PlayMode.Osu,
                         Path = "normal.osu",
                         Version = "Normal",
@@ -74,7 +86,7 @@ namespace osu.Desktop.VisualTests.Tests
                     },
                     new BeatmapInfo
                     {
-                        BeatmapID = 1235 + i,
+                        OnlineBeatmapID = 1235 + i,
                         Mode = PlayMode.Osu,
                         Path = "hard.osu",
                         Version = "Hard",
@@ -85,7 +97,7 @@ namespace osu.Desktop.VisualTests.Tests
                     },
                     new BeatmapInfo
                     {
-                        BeatmapID = 1236 + i,
+                        OnlineBeatmapID = 1236 + i,
                         Mode = PlayMode.Osu,
                         Path = "insane.osu",
                         Version = "Insane",

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -1,15 +1,14 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.GameModes.Testing;
-using osu.Framework.MathUtils;
-using osu.Framework.Timing;
+using osu.Framework.Screens.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;
@@ -19,35 +18,38 @@ using OpenTK.Graphics;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCasePlayer : TestCase
+    internal class TestCasePlayer : TestCase
     {
-        private WorkingBeatmap beatmap;
-        public override string Name => @"Player";
+        protected Player Player;
+        private BeatmapDatabase db;
+
 
         public override string Description => @"Showing everything to play the game.";
 
         [BackgroundDependencyLoader]
         private void load(BeatmapDatabase db)
         {
-            beatmap = db.GetWorkingBeatmap(db.Query<BeatmapInfo>().Where(b => b.Mode == PlayMode.Osu).FirstOrDefault());
+            this.db = db;
         }
 
         public override void Reset()
         {
             base.Reset();
 
-            //ensure we are at offset 0
-            Clock = new FramedClock();
+            WorkingBeatmap beatmap = null;
 
-            if (beatmap == null)
+            var beatmapInfo = db.Query<BeatmapInfo>().Where(b => b.Mode == PlayMode.Osu).FirstOrDefault();
+            if (beatmapInfo != null)
+                beatmap = db.GetWorkingBeatmap(beatmapInfo);
+
+            if (beatmap?.Track == null)
             {
-
                 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,
@@ -62,31 +64,52 @@ namespace osu.Desktop.VisualTests.Tests
 
                 Beatmap b = new Beatmap
                 {
-                    HitObjects = objects
+                    HitObjects = objects,
+                    BeatmapInfo = new BeatmapInfo
+                    {
+                        Metadata = new BeatmapMetadata
+                        {
+                            Artist = @"Unknown",
+                            Title = @"Sample Beatmap",
+                            Author = @"peppy",
+                        }
+                    }
                 };
 
                 decoder.Process(b);
 
-                beatmap = new WorkingBeatmap(b);
+                beatmap = new TestWorkingBeatmap(b);
             }
 
             Add(new Box
             {
                 RelativeSizeAxes = Framework.Graphics.Axes.Both,
-                Colour = Color4.Gray,
+                Colour = Color4.Black,
             });
 
-            Add(new Player
+            Add(new PlayerLoader(Player = CreatePlayer(beatmap))
             {
-                PreferredPlayMode = PlayMode.Osu,
                 Beatmap = beatmap
             });
         }
 
-        protected override void Update()
+        protected virtual Player CreatePlayer(WorkingBeatmap beatmap)
         {
-            base.Update();
-            Clock.ProcessFrame();
+            return new Player
+            {
+                Beatmap = beatmap
+            };
+        }
+
+        private class TestWorkingBeatmap : WorkingBeatmap
+        {
+            public TestWorkingBeatmap(Beatmap beatmap)
+                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+            {
+                Beatmap = beatmap;
+            }
+
+            protected override ArchiveReader GetReader() => null;
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseReplay.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 System;
+using System.IO;
+using osu.Framework.Allocation;
+using osu.Framework.Input.Handlers;
+using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Modes;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    class TestCaseReplay : TestCasePlayer
+    {
+        private WorkingBeatmap beatmap;
+
+        private InputHandler replay;
+
+        private Func<Stream> getReplayStream;
+        private ScoreDatabase scoreDatabase;
+
+        public override string Description => @"Testing replay playback.";
+
+        [BackgroundDependencyLoader]
+        private void load(Storage storage)
+        {
+            scoreDatabase = new ScoreDatabase(storage);
+        }
+
+        protected override Player CreatePlayer(WorkingBeatmap beatmap)
+        {
+            var player = base.CreatePlayer(beatmap);
+            player.ReplayInputHandler = Ruleset.GetRuleset(beatmap.PlayMode).CreateAutoplayScore(beatmap.Beatmap)?.Replay?.GetInputHandler();
+            return player;
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -1,33 +1,25 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Modes;
-using osu.Game.Modes.Catch;
 using osu.Game.Modes.Catch.UI;
-using osu.Game.Modes.Mania;
 using osu.Game.Modes.Mania.UI;
-using osu.Game.Modes.Osu;
 using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.Taiko;
 using osu.Game.Modes.Taiko.UI;
 using osu.Game.Modes.UI;
-using osu.Game.Screens.Play;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Primitives;
 
 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()
@@ -164,7 +156,7 @@ namespace osu.Desktop.VisualTests.Tests
 
             AddButton(@"Alter stars", delegate
             {
-                stars.Count = RNG.NextSingle() * (stars.MaxStars + 1);
+                stars.Count = RNG.NextSingle() * (stars.StarCount + 1);
                 starsLabel.Text = stars.Count.ToString("0.00");
             });
 

osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs

@@ -1,8 +1,8 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
@@ -12,19 +12,17 @@ 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()
         {
             base.Reset();
 
-            FlowContainer flow;
+            FillFlowContainer flow;
 
-            Add(flow = new FlowContainer()
+            Add(flow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Size = new Vector2(0.5f),

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

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -1,26 +1,20 @@
-// Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
+// 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;
-using osu.Framework.GameModes.Testing;
-using osu.Framework.Graphics.Cursor;
-using osu.Game.Database;
+using osu.Framework.Screens.Testing;
 using osu.Game;
-using osu.Framework.Desktop.Platform;
-using System.Reflection;
-using System.IO;
-using System.Collections.Generic;
-using SQLiteNetExtensions.Extensions;
-using osu.Framework.Allocation;
+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);
+
             // 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());

osu.Desktop.VisualTests/app.config

@@ -0,0 +1,15 @@
+<?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

@@ -59,6 +59,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <Prefer32Bit>false</Prefer32Bit>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -73,6 +74,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup>
     <Win32Resource>
@@ -80,6 +82,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.15.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpCompress.0.15.1\lib\net45\SharpCompress.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
@@ -97,9 +107,6 @@
     <Reference Include="SQLite.Net.Platform.Generic">
       <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -107,6 +114,7 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="OpenTK.dll.config" />
   </ItemGroup>
@@ -150,7 +158,7 @@
       <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
       <Name>osu.Game.Resources</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
       <Project>{c92a607b-1fdd-4954-9f92-03ff547d9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
@@ -172,20 +180,29 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Benchmark.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Tests\TestCaseChatDisplay.cs" />
+    <Compile Include="Tests\TestCaseDrawings.cs" />
     <Compile Include="Tests\TestCaseGamefield.cs" />
     <Compile Include="Tests\TestCaseMusicController.cs" />
+    <Compile Include="Tests\TestCaseNotificationManager.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\TestCaseScoreCounter.cs" />
     <Compile Include="Tests\TestCaseTextAwesome.cs" />
     <Compile Include="Tests\TestCasePlaySongSelect.cs" />
+    <Compile Include="Tests\TestCaseTwoLayerButton.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\TestCaseDialogOverlay.cs" />
+    <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />

osu.Desktop.VisualTests/packages.config

@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1339" 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" />
+<?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="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
+  <package id="SharpCompress" version="0.15.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" />
 </packages>

osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs

@@ -1,6 +1,7 @@
-using System;
+// 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.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.IO;
@@ -16,28 +17,23 @@ namespace osu.Desktop.Beatmaps.IO
     {
         public static void Register() => AddReader<LegacyFilesystemReader>((storage, path) => Directory.Exists(path));
 
-        private string basePath { get; set; }
-        private string[] beatmaps { get; set; }
-        private Beatmap firstMap { get; set; }
+        private string basePath { get; }
+        private Beatmap firstMap { get; }
 
         public LegacyFilesystemReader(string path)
         {
             basePath = path;
-            beatmaps = Directory.GetFiles(basePath, @"*.osu").Select(f => Path.GetFileName(f)).ToArray();
-            if (beatmaps.Length == 0)
+            BeatmapFilenames = Directory.GetFiles(basePath, @"*.osu").Select(Path.GetFileName).ToArray();
+            if (BeatmapFilenames.Length == 0)
                 throw new FileNotFoundException(@"This directory contains no beatmaps");
-            using (var stream = new StreamReader(GetStream(beatmaps[0])))
+            StoryboardFilename = Directory.GetFiles(basePath, @"*.osb").Select(Path.GetFileName).FirstOrDefault();
+            using (var stream = new StreamReader(GetStream(BeatmapFilenames[0])))
             {
                 var decoder = BeatmapDecoder.GetDecoder(stream);
                 firstMap = decoder.Decode(stream);
             }
         }
 
-        public override string[] ReadBeatmaps()
-        {
-            return beatmaps;
-        }
-
         public override Stream GetStream(string name)
         {
             return File.OpenRead(Path.Combine(basePath, name));

osu.Desktop/OsuGameDesktop.cs

@@ -0,0 +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 osu.Game;
+using System.Linq;
+using System.Windows.Forms;
+using osu.Framework.Platform;
+using osu.Framework.Desktop.Platform;
+using osu.Desktop.Overlays;
+using System.Reflection;
+using System.Drawing;
+using System.IO;
+using System.Threading.Tasks;
+using osu.Game.Screens.Menu;
+
+namespace osu.Desktop
+{
+    internal class OsuGameDesktop : OsuGame
+    {
+        private VersionManager versionManager;
+
+        public OsuGameDesktop(string[] args = null)
+            : base(args)
+        {
+            versionManager = new VersionManager { Depth = int.MinValue };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            versionManager.LoadAsync(this);
+            ModeChanged += m =>
+            {
+                if (!versionManager.IsAlive && m is Intro)
+                    Add(versionManager);
+            };
+        }
+
+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+            var desktopWindow = host.Window as DesktopGameWindow;
+            if (desktopWindow != null)
+            {
+                desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
+                desktopWindow.Title = Name;
+
+                desktopWindow.DragEnter += dragEnter;
+                desktopWindow.DragDrop += dragDrop;
+            }
+        }
+
+        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 = (object[])e.Data.GetData(DataFormats.FileDrop);
+            var filePaths = dropData.Select(f => f.ToString()).ToArray();
+
+            if (filePaths.All(f => Path.GetExtension(f) == @".osz"))
+                Task.Run(() => BeatmapDatabase.Import(filePaths));
+            else if (filePaths.All(f => Path.GetExtension(f) == @".osr"))
+                Task.Run(() =>
+                {
+                    var score = ScoreDatabase.ReadReplayFile(filePaths.First());
+                    Schedule(() => LoadScore(score));
+                });
+        }
+
+        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 = ((object[])e.Data.GetData(DataFormats.FileDrop)).Select(f => f.ToString()).ToArray();
+                if (allowed_extensions.Any(ext => paths.All(p => p.EndsWith(ext))))
+                    e.Effect = DragDropEffects.Copy;
+                else
+                    e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+}

osu.Desktop/Overlays/VersionManager.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 System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
+using Squirrel;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics;
+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;
+
+        protected override bool HideOnEscape => false;
+
+        public override bool HandleInput => false;
+
+        [BackgroundDependencyLoader]
+        private void load(NotificationManager notification, OsuColour colours, TextureStore textures, OsuGameBase game)
+        {
+            notificationManager = notification;
+
+            AutoSizeAxes = Axes.Both;
+            Anchor = Anchor.BottomCentre;
+            Origin = Anchor.BottomCentre;
+            Alpha = 0;
+
+            Children = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(5),
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Font = @"Exo2.0-Bold",
+                                    Text = game.Name
+                                },
+                                new OsuSpriteText
+                                {
+                                    Colour = game.IsDebug ? colours.Red : Color4.White,
+                                    Text = game.Version
+                                },
+                            }
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            TextSize = 12,
+                            Colour = colours.Yellow,
+                            Font = @"Venera",
+                            Text = @"Development Build"
+                        },
+                        new Sprite
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Texture = textures.Get(@"Menu/dev-build-footer"),
+                        },
+                    }
+                }
+            };
+
+            if (game.IsDeployedBuild)
+                checkForUpdateAsync();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            State = Visibility.Visible;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            updateManager?.Dispose();
+        }
+
+        private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
+        {
+            //should we schedule a retry on completion of this check?
+            bool scheduleRetry = true;
+
+            try
+            {
+                if (updateManager == null) updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
+
+                var info = await updateManager.CheckForUpdate(!useDeltaPatching);
+                if (info.ReleasesToApply.Count == 0)
+                    //no updates available. bail and retry later.
+                    return;
+
+                if (notification == null)
+                {
+                    notification = new UpdateProgressNotification { State = ProgressNotificationState.Active };
+                    Schedule(() => notificationManager.Post(notification));
+                }
+
+                Schedule(() =>
+                {
+                    notification.Progress = 0;
+                    notification.Text = @"Downloading update...";
+                });
+
+                try
+                {
+                    await updateManager.DownloadReleases(info.ReleasesToApply, p => Schedule(() => notification.Progress = p / 100f));
+
+                    Schedule(() =>
+                    {
+                        notification.Progress = 0;
+                        notification.Text = @"Installing update...";
+                    });
+
+                    await updateManager.ApplyReleases(info, p => Schedule(() => notification.Progress = p / 100f));
+
+                    Schedule(() => notification.State = ProgressNotificationState.Completed);
+                }
+                catch (Exception e)
+                {
+                    if (useDeltaPatching)
+                    {
+                        Logger.Error(e, @"delta patching failed!");
+
+                        //could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
+                        //try again without deltas.
+                        checkForUpdateAsync(false, notification);
+                        scheduleRetry = false;
+                    }
+                    else
+                    {
+                        Logger.Error(e, @"update failed!");
+                    }
+                }
+            }
+            catch (HttpRequestException)
+            {
+                //likely have no internet connection.
+                //we'll ignore this and retry later.
+            }
+            finally
+            {
+                if (scheduleRetry)
+                {
+                    //check again in 30 minutes.
+                    Scheduler.AddDelayed(() => checkForUpdateAsync(), 60000 * 30);
+                    if (notification != null)
+                        notification.State = ProgressNotificationState.Cancelled;
+                }
+            }
+        }
+
+        protected override void PopIn()
+        {
+            FadeIn(1000);
+        }
+
+        protected override void PopOut()
+        {
+        }
+
+        private class UpdateProgressNotification : ProgressNotification
+        {
+            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification(this)
+            {
+                Text = @"Update ready to install. Click to restart!",
+                Activated = () =>
+                {
+                    UpdateManager.RestartApp();
+                    return true;
+                }
+            };
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                IconContent.Add(new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        ColourInfo = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow)
+                    },
+                    new TextAwesome
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Icon = FontAwesome.fa_upload,
+                        Colour = Color4.White,
+                    }
+                });
+            }
+        }
+    }
+}

osu.Desktop/Program.cs

@@ -1,15 +1,11 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.IO;
-using System.Linq;
 using osu.Desktop.Beatmaps.IO;
-using osu.Framework;
 using osu.Framework.Desktop;
 using osu.Framework.Desktop.Platform;
-using osu.Framework.Platform;
-using osu.Game;
 using osu.Game.IPC;
 using osu.Game.Modes;
 using osu.Game.Modes.Catch;
@@ -26,16 +22,22 @@ namespace osu.Desktop
         {
             LegacyFilesystemReader.Register();
 
+            // Back up the cwd before DesktopGameHost changes it
+            var cwd = Environment.CurrentDirectory;
+
             using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
             {
                 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)
-                        if (!importer.Import(file).Wait(1000))
+                    {
+                        Console.WriteLine(@"Importing {0}", file);
+                        if (!importer.ImportAsync(Path.GetFullPath(file)).Wait(3000))
                             throw new TimeoutException(@"IPC took too long to send");
-                    Console.WriteLine(@"Sent import requests to running instance");
+                    }
                 }
                 else
                 {
@@ -44,9 +46,7 @@ namespace osu.Desktop
                     Ruleset.Register(new ManiaRuleset());
                     Ruleset.Register(new CatchRuleset());
 
-                    BaseGame osu = new OsuGame(args);
-                    host.Add(osu);
-                    host.Run();
+                    host.Run(new OsuGameDesktop(args));
                 }
                 return 0;
             }

osu.Desktop/Properties/AssemblyInfo.cs

@@ -0,0 +1,28 @@
+// 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 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("osu!lazer")]
+[assembly: AssemblyDescription("click the circles. to the beat.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("ppy Pty Ltd")]
+[assembly: AssemblyProduct("osu!lazer")]
+[assembly: AssemblyCopyright("ppy Pty Ltd 2007-2017")]
+[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 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("55e28cb2-7b6c-4595-8dcc-9871d8aad7e9")]
+
+[assembly: AssemblyVersion("0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0")]

osu.Desktop/app.config

@@ -0,0 +1,19 @@
+<?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

@@ -59,6 +59,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <Prefer32Bit>false</Prefer32Bit>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <Commandlineparameters>
     </Commandlineparameters>
   </PropertyGroup>
@@ -75,19 +76,86 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup>
-    <Win32Resource>osu!.res</Win32Resource>
+    <Win32Resource>
+    </Win32Resource>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>lazer.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.1.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+      <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, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\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>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="mscorlib" />
+    <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4" />
+    <Reference Include="Splat, Version=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>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
+    <None Include="app.config" />
     <None Include="osu!.res" />
+    <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
   </ItemGroup>
   <ItemGroup>
@@ -130,7 +198,7 @@
       <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
       <Name>osu.Game.Resources</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
       <Project>{c92a607b-1fdd-4954-9f92-03ff547d9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
@@ -152,11 +220,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <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" />
   </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/osu.nuspec

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>osulazer</id>
+        <version>0.0.0</version>
+        <title>osulazer</title>
+        <authors>ppy Pty Ltd</authors>
+        <owners>Dean Herbert</owners>
+        <projectUrl>https://osu.ppy.sh/</projectUrl>
+        <iconUrl>https://puu.sh/tYyXZ/9a01a5d1b0.ico</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>click the circles. to the beat.</description>
+        <summary>click the circles.</summary>
+        <releaseNotes>testing</releaseNotes>
+        <copyright>Copyright ppy Pty Ltd 2007-2017</copyright>
+        <language>en-AU</language>
+    </metadata>
+    <files>
+      <file src="*.exe" target="lib\net45\" exclude="**vshost**"/>
+      <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>
+</package>
+

osu.Desktop/packages.config

@@ -0,0 +1,13 @@
+<?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="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="SharpZipLib" version="0.86.0" targetFramework="net45" />
+  <package id="Splat" version="2.0.0" targetFramework="net45" />
+  <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
+</packages>

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

@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Objects.Drawables;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables
-{
-    public class DrawableOsuHitObject : DrawableHitObject
-    {
-        protected const float TIME_PREEMPT = 600;
-        protected const float TIME_FADEIN = 400;
-        protected const float TIME_FADEOUT = 500;
-
-        public DrawableOsuHitObject(OsuHitObject hitObject)
-            : base(hitObject)
-        {
-        }
-
-        public override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo();
-
-        protected override void UpdateState(ArmedState state)
-        {
-            if (!IsLoaded) return;
-
-            Flush(true);
-
-            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
-    {
-        public OsuScoreResult Score;
-        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,
-    }
-}

osu.Game.Mode.Osu/Objects/Drawables/DrawableSlider.cs

@@ -1,290 +0,0 @@
-using System.Collections.Generic;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
-using OpenTK;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transformations;
-using OpenTK.Graphics;
-using osu.Framework.Input;
-using OpenTK.Graphics.ES30;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Textures;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables
-{
-    class DrawableSlider : DrawableOsuHitObject
-    {
-        private Slider slider;
-
-        private DrawableHitCircle startCircle;
-        private Container ball;
-        private Body body;
-
-        public DrawableSlider(Slider s) : base(s)
-        {
-            slider = s;
-
-            Origin = Anchor.TopLeft;
-            Position = Vector2.Zero;
-            RelativeSizeAxes = Axes.Both;
-
-            Children = new Drawable[]
-            {
-                body = new Body(s)
-                {
-                    Position = s.Position,
-                },
-                ball = new Ball(),
-                startCircle = new DrawableHitCircle(new HitCircle
-                {
-                    StartTime = s.StartTime,
-                    Position = s.Position,
-                    Colour = s.Colour,
-                })
-                {
-                    Depth = -1 //override time-based depth.
-                },
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            //force application of the state that was set before we loaded.
-            UpdateState(State);
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            ball.Alpha = Time.Current >= slider.StartTime && Time.Current <= slider.EndTime ? 1 : 0;
-
-            double t = (Time.Current - slider.StartTime) / slider.Duration;
-            if (slider.RepeatCount > 1)
-            {
-                int currentRepeat = (int)(t * slider.RepeatCount);
-                t = (t * slider.RepeatCount) % 1;
-                if (currentRepeat % 2 == 1)
-                    t = 1 - t;
-            }
-
-            ball.Position = slider.Curve.PositionAt(t);
-        }
-
-        protected override void CheckJudgement(bool userTriggered)
-        {
-            var j = Judgement as OsuJudgementInfo;
-            var sc = startCircle.Judgement as OsuJudgementInfo;
-
-            if (!userTriggered && Time.Current >= HitObject.EndTime)
-            {
-                j.Score = sc.Score;
-                j.Result = sc.Result;
-            }
-        }
-
-        protected override void UpdateState(ArmedState state)
-        {
-            base.UpdateState(state);
-
-            Delay(HitObject.Duration);
-            FadeOut(300);
-        }
-
-        private class Ball : Container
-        {
-            private Box follow;
-
-            public Ball()
-            {
-                Masking = true;
-                AutoSizeAxes = Axes.Both;
-                BlendingMode = BlendingMode.Additive;
-                Origin = Anchor.Centre;
-
-                Children = new Drawable[]
-                {
-                    follow = new Box
-                    {
-                        Origin = Anchor.Centre,
-                        Anchor = Anchor.Centre,
-                        Colour = Color4.Orange,
-                        Width = 64,
-                        Height = 64,
-                    },
-                    new Container
-                    {
-                        Masking = true,
-                        AutoSizeAxes = Axes.Both,
-                        Origin = Anchor.Centre,
-                        Anchor = Anchor.Centre,
-                        Colour = Color4.Cyan,
-                        CornerRadius = 32,
-                        Children = new[]
-                        {
-                            new Box
-                            {
-                                
-                                Width = 64,
-                                Height = 64,
-                            },
-                        }
-                    }
-                    
-                };
-            }
-
-            private InputState lastState;
-
-            protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
-            {
-                lastState = state;
-                return base.OnMouseDown(state, args);
-            }
-
-            protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
-            {
-                lastState = state;
-                return base.OnMouseUp(state, args);
-            }
-
-            protected override bool OnMouseMove(InputState state)
-            {
-                lastState = state;
-                return base.OnMouseMove(state);
-            }
-
-            bool tracking;
-            protected bool Tracking
-            {
-                get { return tracking; }
-                set
-                {
-                    if (value == tracking) return;
-
-                    tracking = value;
-
-                    follow.ScaleTo(tracking ? 2.4f : 1, 140, EasingTypes.Out);
-                    follow.FadeTo(tracking ? 0.8f : 0, 140, EasingTypes.Out);
-                }
-            }
-            
-            protected override void Update()
-            {
-                base.Update();
-
-                CornerRadius = DrawWidth / 2;
-                Tracking = lastState != null && Contains(lastState.Mouse.NativeState.Position) && lastState.Mouse.HasMainButtonPressed;
-            }
-        }
-
-        private class Body : Container
-        {
-            private Path path;
-            private BufferedContainer container;
-
-            private double? drawnProgress;
-
-            private Slider slider;
-            public Body(Slider s)
-            {
-                slider = s;
-
-                Children = new Drawable[]
-                {
-                    container = new BufferedContainer
-                    {
-                        CacheDrawnFrameBuffer = true,
-                        Children = new Drawable[]
-                        {
-                            path = new Path
-                            {
-                                Colour = s.Colour,
-                                BlendingMode = BlendingMode.None,
-                            },
-                        }
-                    }
-                };
-
-                container.Attach(RenderbufferInternalFormat.DepthComponent16);
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                // Surprisingly, this looks somewhat okay and works well as a test for self-overlaps.
-                // TODO: Don't do this.
-                path.Texture = textures.Get(@"Menu/logo");
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                path.PathWidth = 32;
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                if (updateSnaking())
-                {
-                    // Autosizing does not give us the desired behaviour here.
-                    // We want the container to have the same size as the slider,
-                    // and to be positioned such that the slider head is at (0,0).
-                    container.Size = path.Size;
-                    container.Position = -path.HeadPosition;
-
-                    container.ForceRedraw();
-                }
-            }
-
-            private bool updateSnaking()
-            {
-                double progress = MathHelper.Clamp((Time.Current - slider.StartTime + TIME_PREEMPT) / TIME_FADEIN, 0, 1);
-
-                if (progress == drawnProgress) return false;
-
-                bool madeChanges = false;
-                if (progress == 0)
-                {
-                    //if we have gone backwards, just clear the path for now.
-                    drawnProgress = 0;
-                    path.ClearVertices();
-                    madeChanges = true;
-                }
-
-                Vector2 startPosition = slider.Curve.PositionAt(0);
-
-                if (drawnProgress == null)
-                {
-                    drawnProgress = 0;
-                    path.AddVertex(slider.Curve.PositionAt(drawnProgress.Value) - startPosition);
-                    madeChanges = true;
-                }
-
-                double segmentSize = 1 / (slider.Curve.Length / 5);
-
-                while (drawnProgress + segmentSize < progress)
-                {
-                    drawnProgress += segmentSize;
-                    path.AddVertex(slider.Curve.PositionAt(drawnProgress.Value) - startPosition);
-                    madeChanges = true;
-                }
-
-                if (progress == 1 && drawnProgress != progress)
-                {
-                    drawnProgress = progress;
-                    path.AddVertex(slider.Curve.PositionAt(drawnProgress.Value) - startPosition);
-                    madeChanges = true;
-                }
-
-                return madeChanges;
-            }
-        }
-    }
-}

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

@@ -1,51 +0,0 @@
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transformations;
-using osu.Game.Modes.Objects.Drawables;
-using OpenTK;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables
-{
-    public class HitExplosion : FlowContainer
-    {
-        private SpriteText line1;
-        private SpriteText line2;
-
-        public HitExplosion(OsuJudgementInfo judgement)
-        {
-            AutoSizeAxes = Axes.Both;
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
-
-            Direction = FlowDirection.VerticalOnly;
-            Spacing = new Vector2(0, 2);
-
-            Children = new Drawable[]
-            {
-                line1 = new SpriteText
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = judgement.Score.GetDescription(),
-                    Font = @"Venera",
-                    TextSize = 20,
-                },
-                line2 = new SpriteText
-                {
-                    Text = judgement.Combo.GetDescription(),
-                    Font = @"Venera",
-                    TextSize = 14,
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            line1.TransformSpacingTo(14, 1800, EasingTypes.OutQuint);
-            line2.TransformSpacingTo(14, 1800, EasingTypes.OutQuint);
-        }
-    }
-}

osu.Game.Mode.Osu/Objects/Drawables/Pieces/NumberPiece.cs

@@ -1,35 +0,0 @@
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
-{
-    public class NumberPiece : Container
-    {
-        private Sprite number;
-
-        public NumberPiece()
-        {
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
-
-            Children = new[]
-            {
-                number = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Alpha = 1
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            number.Texture = textures.Get(@"Play/osu/number@2x");
-        }
-    }
-}

osu.Game.Mode.Osu/Objects/Drawables/Pieces/RingPiece.cs

@@ -1,34 +0,0 @@
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
-{
-    public class RingPiece : Container
-    {
-        private Sprite ring;
-
-        public RingPiece()
-        {
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
-
-            Children = new Drawable[]
-            {
-                ring = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            ring.Texture = textures.Get(@"Play/osu/ring@2x");
-        }
-    }
-}

osu.Game.Mode.Osu/Objects/Drawables/Pieces/Triangles.cs

@@ -1,41 +0,0 @@
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.MathUtils;
-using OpenTK;
-
-namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
-{
-    public class Triangles : Container<Triangle>
-    {
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            const float size = 100;
-            for (int i = 0; i < 10; i++)
-            {
-                Add(new Triangle
-                {
-                    Origin = Anchor.Centre,
-                    RelativePositionAxes = Axes.Both,
-                    Position = new Vector2(RNG.NextSingle(), RNG.NextSingle()),
-                    Scale = new Vector2(RNG.NextSingle() * 0.4f + 0.2f),
-                    // Scaling height by 0.866 results in equiangular triangles (== 60° and equal side length)
-                    Size = new Vector2(size, 0.866f * size),
-                    Alpha = RNG.NextSingle() * 0.3f,
-                });
-            }
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            foreach (Drawable d in Children)
-                d.Position -= new Vector2(0, (float)(d.Scale.X * (Time.Elapsed / 2880)));
-        }
-    }
-}

osu.Game.Mode.Osu/Objects/HitCircle.cs

@@ -1,9 +0,0 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-namespace osu.Game.Modes.Osu.Objects
-{
-    public class HitCircle : OsuHitObject
-    {
-    }
-}

osu.Game.Mode.Osu/Objects/OsuHitObject.cs

@@ -1,29 +0,0 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using osu.Game.Beatmaps.Samples;
-using osu.Game.Modes.Objects;
-using OpenTK;
-
-namespace osu.Game.Modes.Osu.Objects
-{
-    public abstract class OsuHitObject : HitObject
-    {
-        public Vector2 Position { get; set; }
-
-        [Flags]
-        internal enum HitObjectType
-        {
-            Circle = 1,
-            Slider = 2,
-            NewCombo = 4,
-            CircleNewCombo = 5,
-            SliderNewCombo = 6,
-            Spinner = 8,
-            ColourHax = 122,
-            Hold = 128,
-            ManiaLong = 128,
-        }
-    }
-}

osu.Game.Mode.Osu/Objects/OsuHitObjectConverter.cs

@@ -1,21 +0,0 @@
-//Copyright (c) 2007-2016 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;
-
-namespace osu.Game.Modes.Osu.Objects
-{
-    public class OsuHitObjectConverter : HitObjectConverter<OsuHitObject>
-    {
-        public override List<OsuHitObject> Convert(List<HitObject> input)
-        {
-            List<OsuHitObject> output = new List<OsuHitObject>();
-
-            foreach (HitObject h in input)
-                output.Add(h as OsuHitObject);
-
-            return output;
-        }
-    }
-}

osu.Game.Mode.Osu/Objects/Slider.cs

@@ -1,33 +0,0 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Database;
-using osu.Game.Beatmaps;
-using System;
-
-namespace osu.Game.Modes.Osu.Objects
-{
-    public class Slider : OsuHitObject
-    {
-        public override double EndTime => StartTime + RepeatCount * Curve.Length / Velocity;
-
-        public double Velocity;
-
-        public override void SetDefaultsFromBeatmap(Beatmap beatmap)
-        {
-            Velocity = 100 / beatmap.BeatLengthAt(StartTime, true) * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier;
-        }
-
-        public int RepeatCount;
-
-        public SliderCurve Curve;
-    }
-
-    public enum CurveTypes
-    {
-        Catmull,
-        Bezier,
-        Linear,
-        PerfectCurve
-    }
-}

osu.Game.Mode.Osu/Objects/SliderCurve.cs

@@ -1,67 +0,0 @@
-using System.Collections.Generic;
-using OpenTK;
-
-namespace osu.Game.Modes.Osu.Objects
-{
-    public class SliderCurve
-    {
-        public double Length;
-
-        public List<Vector2> Path;
-
-        public CurveTypes CurveType;
-
-        private List<Vector2> calculatedPath;
-
-        private List<Vector2> calculateSubpath(List<Vector2> subpath)
-        {
-            switch (CurveType)
-            {
-                case CurveTypes.Linear:
-                    return subpath;
-                default:
-                    return new BezierApproximator(subpath).CreateBezier();
-            }
-        }
-
-        public void Calculate()
-        {
-            calculatedPath = new List<Vector2>();
-
-            // Sliders may consist of various subpaths separated by two consecutive vertices
-            // with the same position. The following loop parses these subpaths and computes
-            // their shape independently, consecutively appending them to calculatedPath.
-            List<Vector2> subpath = new List<Vector2>();
-            for (int i = 0; i < Path.Count; ++i)
-            {
-                subpath.Add(Path[i]);
-                if (i == Path.Count - 1 || Path[i] == Path[i + 1])
-                {
-                    // If we already constructed a subpath previously, then the new subpath
-                    // will have as starting position the end position of the previous subpath.
-                    // Hence we can and should remove the previous endpoint to avoid a segment
-                    // with 0 length.
-                    if (calculatedPath.Count > 0)
-                        calculatedPath.RemoveAt(calculatedPath.Count - 1);
-
-                    calculatedPath.AddRange(calculateSubpath(subpath));
-                    subpath.Clear();
-                }
-            }
-        }
-
-        public Vector2 PositionAt(double progress)
-        {
-            progress = MathHelper.Clamp(progress, 0, 1);
-
-            double index = progress * (calculatedPath.Count - 1);
-            int flooredIndex = (int)index;
-
-            Vector2 pos = calculatedPath[flooredIndex];
-            if (index != flooredIndex)
-                pos += (calculatedPath[flooredIndex + 1] - pos) * (float)(index - flooredIndex);
-
-            return pos;
-        }
-    }
-}

osu.Game.Mode.Osu/Objects/Spinner.cs

@@ -1,9 +0,0 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-namespace osu.Game.Modes.Osu.Objects
-{
-    public class Spinner : OsuHitObject
-    {
-    }
-}

osu.Game.Mode.Osu/OsuRuleset.cs

@@ -1,24 +0,0 @@
-//Copyright (c) 2007-2016 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.Modes.Osu.UI;
-using osu.Game.Modes.UI;
-
-namespace osu.Game.Modes.Osu
-{
-    public class OsuRuleset : Ruleset
-    {
-        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
-
-        public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new OsuHitRenderer { Objects = objects };
-
-        public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
-
-        public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
-
-        protected override PlayMode PlayMode => PlayMode.Osu;
-    }
-}

osu.Game.Mode.Osu/OsuScore.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace osu.Game.Modes.Osu
-{
-    class OsuScore : Score
-    {
-    }
-}

osu.Game.Mode.Osu/OsuScoreProcessor.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Osu.Objects.Drawables;
-
-namespace osu.Game.Modes.Osu
-{
-    class OsuScoreProcessor : ScoreProcessor
-    {
-        protected override void UpdateCalculations(JudgementInfo judgement)
-        {
-            if (judgement != null)
-            {
-                switch (judgement.Result)
-                {
-                    case HitResult.Hit:
-                        Combo.Value++;
-                        break;
-                    case HitResult.Miss:
-                        Combo.Value = 0;
-                        break;
-                }
-            }
-
-            int score = 0;
-            int maxScore = 0;
-
-            foreach (OsuJudgementInfo j in Judgements)
-            {
-                switch (j.Score)
-                {
-                    case OsuScoreResult.Miss:
-                        maxScore += 300;
-                        break;
-                    case OsuScoreResult.Hit50:
-                        score += 50;
-                        maxScore += 300;
-                        break;
-                    case OsuScoreResult.Hit100:
-                        score += 100;
-                        maxScore += 300;
-                        break;
-                    case OsuScoreResult.Hit300:
-                        score += 300;
-                        maxScore += 300;
-                        break;
-                }
-            }
-
-            TotalScore.Value = score;
-            Accuracy.Value = (double)score / maxScore;
-        }
-    }
-}

osu.Game.Mode.Osu/UI/OsuHitRenderer.cs

@@ -1,29 +0,0 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Modes.Osu.Objects.Drawables;
-using osu.Game.Modes.UI;
-using OsuConverter = osu.Game.Modes.Osu.Objects.OsuHitObjectConverter;
-
-namespace osu.Game.Modes.Osu.UI
-{
-    public class OsuHitRenderer : HitRenderer<OsuHitObject>
-    {
-        protected override HitObjectConverter<OsuHitObject> Converter => new OsuHitObjectConverter();
-
-        protected override Playfield CreatePlayfield() => new OsuPlayfield();
-
-        protected override DrawableHitObject GetVisualRepresentation(OsuHitObject h)
-        {
-            if (h is HitCircle)
-                return new DrawableHitCircle(h as HitCircle);
-            if (h is Slider)
-                return new DrawableSlider(h as Slider);
-
-            return null;
-        }
-    }
-}

osu.Game.Mode.Osu/UI/OsuPlayfield.cs

@@ -1,58 +0,0 @@
-//Copyright (c) 2007-2016 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.Graphics.Sprites;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Modes.Osu.Objects.Drawables;
-using osu.Game.Modes.UI;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Osu.UI
-{
-    public class OsuPlayfield : Playfield
-    {
-        private Container approachCircles;
-
-        public override Vector2 Size
-        {
-            get
-            {
-                var parentSize = Parent.DrawSize;
-                var aspectSize = parentSize.X * 0.75f < parentSize.Y ? new Vector2(parentSize.X, parentSize.X * 0.75f) : new Vector2(parentSize.Y * 4f / 3f, parentSize.Y);
-
-                return new Vector2(aspectSize.X / parentSize.X, aspectSize.Y / parentSize.Y) * base.Size;
-            }
-        }
-
-        public OsuPlayfield()
-        {
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(0.75f);
-
-            AddInternal(new Drawable[]
-            {
-                approachCircles = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                }
-            });
-        }
-
-        public override void Add(DrawableHitObject h)
-        {
-            DrawableHitCircle c = h as DrawableHitCircle;
-            if (c != null)
-            {
-                approachCircles.Add(c.ApproachCircle.CreateProxy());
-            }
-
-            base.Add(h);
-        }
-    }
-}

osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs

@@ -1,51 +0,0 @@
-//Copyright (c) 2007-2016 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.Graphics.UserInterface;
-using osu.Game.Modes.UI;
-using OpenTK;
-using OpenTK.Input;
-using osu.Framework.Graphics.Primitives;
-
-namespace osu.Game.Modes.Osu.UI
-{
-    public class OsuScoreOverlay : ScoreOverlay
-    {
-        protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter()
-        {
-            Anchor = Anchor.TopRight,
-            Origin = Anchor.TopRight,
-            Position = new Vector2(0, 45)
-        };
-
-        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter()
-        {
-            Anchor = Anchor.TopRight,
-            Origin = Anchor.TopRight,
-            TextSize = 60
-        };
-
-        protected override ComboCounter CreateComboCounter() => new OsuComboCounter()
-        {
-            Anchor = Anchor.BottomLeft,
-            Origin = Anchor.BottomLeft,
-        };
-
-        protected override KeyCounterCollection CreateKeyCounter() => new KeyCounterCollection
-        {
-            IsCounting = true,
-            FadeTime = 50,
-            Anchor = Anchor.BottomRight,
-            Origin = Anchor.BottomRight,
-            Margin = new MarginPadding(10),
-            Counters = new KeyCounter[]
-            {
-                new KeyCounterKeyboard(@"Z", Key.Z),
-                new KeyCounterKeyboard(@"X", Key.X),
-                new KeyCounterMouse(@"M1", MouseButton.Left),
-                new KeyCounterMouse(@"M2", MouseButton.Right),
-            }
-        };
-    }
-}

osu.Game.Mode.Osu/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net452" />
-</packages>

osu.Game.Modes.Catch/CatchDifficultyCalculator.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.Game.Beatmaps;
+using osu.Game.Modes.Catch.Objects;
+using osu.Game.Modes.Objects;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Catch
+{
+    public class CatchDifficultyCalculator : DifficultyCalculator<CatchBaseHit>
+    {
+        protected override PlayMode PlayMode => PlayMode.Catch;
+
+        public CatchDifficultyCalculator(Beatmap beatmap) : base(beatmap)
+        {
+        }
+
+        protected override HitObjectConverter<CatchBaseHit> Converter => new CatchConverter();
+
+        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        {
+            return 0;
+        }
+    }
+}

osu.Game.Modes.Catch/CatchMod.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
+
+namespace osu.Game.Modes.Catch
+{
+    public class CatchModNoFail : ModNoFail
+    {
+
+    }
+
+    public class CatchModEasy : ModEasy
+    {
+
+    }
+
+    public class CatchModHidden : ModHidden
+    {
+        public override string Description => @"Play with no approach circles and fading notes for a slight score advantage.";
+        public override double ScoreMultiplier => 1.06;
+    }
+
+    public class CatchModHardRock : ModHardRock
+    {
+        public override double ScoreMultiplier => 1.12;
+        public override bool Ranked => true;
+    }
+
+    public class CatchModSuddenDeath : ModSuddenDeath
+    {
+
+    }
+
+    public class CatchModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.06;
+    }
+
+    public class CatchModRelax : ModRelax
+    {
+        public override string Description => @"Use the mouse to control the catcher.";
+    }
+
+    public class CatchModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+
+    public class CatchModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.06;
+    }
+
+    public class CatchModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+
+    public class CatchModPerfect : ModPerfect
+    {
+
+    }
+}

osu.Game.Modes.Catch/CatchRuleset.cs

@@ -1,12 +1,14 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.Graphics;
 using osu.Game.Modes.Catch.UI;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes.Catch
 {
@@ -14,12 +16,75 @@ namespace osu.Game.Modes.Catch
     {
         public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
-        public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new CatchHitRenderer { Objects = objects };
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null) => new CatchHitRenderer
+        {
+            Beatmap = beatmap,
+            InputManager = input,
+        };
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.DifficultyReduction:
+                    return new Mod[]
+                    {
+                        new CatchModEasy(),
+                        new CatchModNoFail(),
+                        new CatchModHalfTime(),
+                    };
+
+                case ModType.DifficultyIncrease:
+                    return new Mod[]
+                    {
+                        new CatchModHardRock(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new CatchModSuddenDeath(),
+                                new CatchModPerfect(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new CatchModDoubleTime(),
+                                new CatchModNightcore(),
+                            },
+                        },
+                        new CatchModHidden(),
+                        new CatchModFlashlight(),
+                    };
+
+                case ModType.Special:
+                    return new Mod[]
+                    {
+                        new CatchModRelax(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ModAutoplay(),
+                                new ModCinema(),
+                            },
+                        },
+                    };
+
+                default:
+                    return new Mod[] { };
+            }
+        }
 
         protected override PlayMode PlayMode => PlayMode.Catch;
 
-        public override ScoreProcessor CreateScoreProcessor() => null;
+        public override FontAwesome Icon => FontAwesome.fa_osu_fruits_o;
 
-        public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
+        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
+
+        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
+
+        public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new CatchDifficultyCalculator(beatmap);
     }
 }

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

@@ -1,5 +1,5 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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;
 

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

@@ -1,19 +1,20 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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>
+    internal class CatchConverter : HitObjectConverter<CatchBaseHit>
     {
-        public override List<CatchBaseHit> Convert(List<HitObject> input)
+        public override List<CatchBaseHit> Convert(Beatmap beatmap)
         {
             List<CatchBaseHit> output = new List<CatchBaseHit>();
 
-            foreach (HitObject i in input)
+            foreach (HitObject i in beatmap.HitObjects)
             {
                 CatchBaseHit h = i as CatchBaseHit;
 

osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs

@@ -1,16 +1,16 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using OpenTK;
 
 namespace osu.Game.Modes.Catch.Objects.Drawable
 {
-    class DrawableFruit : Sprite
+    internal class DrawableFruit : Sprite
     {
         private CatchBaseHit h;
 

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

@@ -1,5 +1,5 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 namespace osu.Game.Modes.Catch.Objects
 {

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

@@ -1,5 +1,5 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 namespace osu.Game.Modes.Catch.Objects
 {

osu.Game.Modes.Catch/OpenTK.dll.config

@@ -1,3 +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
+-->
 <configuration>
   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>

osu.Game.Modes.Catch/Properties/AssemblyInfo.cs

@@ -1,5 +1,7 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+// 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 

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

@@ -1,5 +1,5 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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;

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

@@ -1,5 +1,5 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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;
@@ -12,8 +12,8 @@ namespace osu.Game.Modes.Catch.UI
     {
         protected override HitObjectConverter<CatchBaseHit> Converter => new CatchConverter();
 
-        protected override Playfield CreatePlayfield() => new CatchPlayfield();
+        protected override Playfield<CatchBaseHit> CreatePlayfield() => new CatchPlayfield();
 
-        protected override DrawableHitObject GetVisualRepresentation(CatchBaseHit h) => null;// new DrawableFruit(h);
+        protected override DrawableHitObject<CatchBaseHit> GetVisualRepresentation(CatchBaseHit h) => null;// new DrawableFruit(h);
     }
 }

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

@@ -1,14 +1,15 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.Catch.Objects;
 using osu.Game.Modes.UI;
 using OpenTK;
 
 namespace osu.Game.Modes.Catch.UI
 {
-    public class CatchPlayfield : Playfield
+    public class CatchPlayfield : Playfield<CatchBaseHit>
     {
         public CatchPlayfield()
         {

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

@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,10 +29,11 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -45,6 +47,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CatchDifficultyCalculator.cs" />
     <Compile Include="Objects\CatchBaseHit.cs" />
     <Compile Include="Objects\CatchConverter.cs" />
     <Compile Include="Objects\Drawable\DrawableFruit.cs" />
@@ -55,8 +58,12 @@
     <Compile Include="UI\CatchHitRenderer.cs" />
     <Compile Include="UI\CatchPlayfield.cs" />
     <Compile Include="CatchRuleset.cs" />
+    <Compile Include="CatchMod.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
     <None Include="OpenTK.dll.config" />
     <None Include="packages.config" />
   </ItemGroup>
@@ -65,7 +72,7 @@
       <Project>{C76BF5B3-985E-4D39-95FE-97C9C879B83A}</Project>
       <Name>osu.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
       <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>

osu.Game.Modes.Catch/packages.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
+-->
 <packages>
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
 </packages>

osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs

@@ -0,0 +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.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/ManiaMod.cs

@@ -0,0 +1,146 @@
+// 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.Graphics;
+
+namespace osu.Game.Modes.Mania
+{
+    public class ManiaModNoFail : ModNoFail
+    {
+
+    }
+
+    public class ManiaModEasy : ModEasy
+    {
+
+    }
+
+    public class ManiaModHidden : ModHidden
+    {
+        public override string Description => @"The notes fade out before you hit them!";
+        public override double ScoreMultiplier => 1.0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };
+    }
+
+    public class ManiaModHardRock : ModHardRock
+    {
+        public override double ScoreMultiplier => 1.0;
+    }
+
+    public class ManiaModSuddenDeath : ModSuddenDeath
+    {
+
+    }
+
+    public class ManiaModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.0;
+    }
+
+    public class ManiaModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.3;
+    }
+
+    public class ManiaModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.0;
+    }
+
+    public class ManiaModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModHidden) };
+    }
+
+    public class ManiaModPerfect : ModPerfect
+    {
+
+    }
+
+    public class ManiaModFadeIn : Mod
+    {
+        public override string Name => "FadeIn";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hidden;
+        public override double ScoreMultiplier => 1;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };
+    }
+
+    public class ManiaModRandom : Mod
+    {
+        public override string Name => "Random";
+        public override string Description => @"Shuffle around the notes!";
+        public override double ScoreMultiplier => 1;
+    }
+
+    public abstract class ManiaKeyMod : Mod
+    {
+        public abstract int KeyCount { get; }
+        public override double ScoreMultiplier => 1; // TODO: Implement the mania key mod score multiplier
+        public override bool Ranked => true;
+    }
+
+    public class ManiaModKey1 : ManiaKeyMod
+    {
+        public override int KeyCount => 1;
+        public override string Name => "1K";
+    }
+
+    public class ManiaModKey2 : ManiaKeyMod
+    {
+        public override int KeyCount => 2;
+        public override string Name => "2K";
+    }
+
+    public class ManiaModKey3 : ManiaKeyMod
+    {
+        public override int KeyCount => 3;
+        public override string Name => "3K";
+    }
+
+    public class ManiaModKey4 : ManiaKeyMod
+    {
+        public override int KeyCount => 4;
+        public override string Name => "4K";
+    }
+
+    public class ManiaModKey5 : ManiaKeyMod
+    {
+        public override int KeyCount => 5;
+        public override string Name => "5K";
+    }
+
+    public class ManiaModKey6 : ManiaKeyMod
+    {
+        public override int KeyCount => 6;
+        public override string Name => "6K";
+    }
+
+    public class ManiaModKey7 : ManiaKeyMod
+    {
+        public override int KeyCount => 7;
+        public override string Name => "7K";
+    }
+
+    public class ManiaModKey8 : ManiaKeyMod
+    {
+        public override int KeyCount => 8;
+        public override string Name => "8K";
+    }
+
+    public class ManiaModKey9 : ManiaKeyMod
+    {
+        public override int KeyCount => 9;
+        public override string Name => "9K";
+    }
+
+    public class ManiaModKeyCoop : Mod
+    {
+        public override string Name => "KeyCoop";
+        public override string Description => @"Double the key amount, double the fun!";
+        public override double ScoreMultiplier => 1;
+        public override bool Ranked => true;
+    }
+}

osu.Game.Modes.Mania/ManiaRuleset.cs

@@ -1,13 +1,14 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.Graphics;
 using osu.Game.Modes.Mania.UI;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu;
-using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes.Mania
 {
@@ -15,12 +16,91 @@ namespace osu.Game.Modes.Mania
     {
         public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
-        public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new ManiaHitRenderer { Objects = objects };
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null) => new ManiaHitRenderer
+        {
+            Beatmap = beatmap,
+            InputManager = input,
+        };
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.DifficultyReduction:
+                    return new Mod[]
+                    {
+                        new ManiaModEasy(),
+                        new ManiaModNoFail(),
+                        new ManiaModHalfTime(),
+                    };
+
+                case ModType.DifficultyIncrease:
+                    return new Mod[]
+                    {
+                        new ManiaModHardRock(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModSuddenDeath(),
+                                new ManiaModPerfect(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModDoubleTime(),
+                                new ManiaModNightcore(),
+                            },
+                        },
+                        new ManiaModHidden(),
+                        new ManiaModFlashlight(),
+                    };
+
+                case ModType.Special:
+                    return new Mod[]
+                    {
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModKey4(),
+                                new ManiaModKey5(),
+                                new ManiaModKey6(),
+                                new ManiaModKey7(),
+                                new ManiaModKey8(),
+                                new ManiaModKey9(),
+                                new ManiaModKey1(),
+                                new ManiaModKey2(),
+                                new ManiaModKey3(),
+                            },
+                        },
+                        new ManiaModKeyCoop(),
+                        new ManiaModRandom(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ModAutoplay(),
+                                new ModCinema(),
+                            },
+                        },
+                    };
+
+                default:
+                    return new Mod[] { };
+            }
+        }
 
         protected override PlayMode PlayMode => PlayMode.Mania;
 
-        public override ScoreProcessor CreateScoreProcessor() => null;
+        public override FontAwesome Icon => FontAwesome.fa_osu_mania_o;
 
-        public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
+        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
+
+        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
+
+        public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new ManiaDifficultyCalculator(beatmap);
     }
 }

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

@@ -1,10 +1,10 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics;
 using OpenTK;
 
@@ -26,8 +26,8 @@ namespace osu.Game.Modes.Mania.Objects.Drawable
         {
             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 });
+            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/HoldNote.cs

@@ -1,5 +1,5 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 namespace osu.Game.Modes.Mania.Objects
 {

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

@@ -1,5 +1,5 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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;
 

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

@@ -1,14 +1,15 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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>
+    internal class ManiaConverter : HitObjectConverter<ManiaBaseHit>
     {
         private readonly int columns;
 
@@ -17,11 +18,11 @@ namespace osu.Game.Modes.Mania.Objects
             this.columns = columns;
         }
 
-        public override List<ManiaBaseHit> Convert(List<HitObject> input)
+        public override List<ManiaBaseHit> Convert(Beatmap beatmap)
         {
             List<ManiaBaseHit> output = new List<ManiaBaseHit>();
 
-            foreach (HitObject i in input)
+            foreach (HitObject i in beatmap.HitObjects)
             {
                 ManiaBaseHit h = i as ManiaBaseHit;
 

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

@@ -1,5 +1,5 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 namespace osu.Game.Modes.Mania.Objects
 {

osu.Game.Modes.Mania/OpenTK.dll.config

@@ -1,3 +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
+-->
 <configuration>
   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>

osu.Game.Modes.Mania/Properties/AssemblyInfo.cs

@@ -1,5 +1,7 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+// 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 

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

@@ -1,8 +1,8 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// 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.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Game.Modes.Taiko.UI;
 using OpenTK.Graphics;
 
@@ -13,7 +13,7 @@ namespace osu.Game.Modes.Mania.UI
     /// </summary>
     public class ManiaComboCounter : TaikoComboCounter
     {
-        protected ushort KeysHeld = 0;
+        protected ushort KeysHeld;
 
         protected Color4 OriginalColour;