Merge pull request #371 from peppy/general-fixes

Update framework.
2026-05-15 14:13:01 +08:00 · 2017-02-18 16:33:09 +01:00 · 2017-02-19 00:27:00 +09:00 · 2017-02-18 16:14:57 +01:00 · 2017-02-18 22:33:24 +09:00 · 2017-02-18 22:29:20 +09:00
183 changed files with 3265 additions and 887 deletions
@@ -255,4 +255,5 @@ paket-files/

 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
+Staging/
@@ -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.
@@ -0,0 +1,28 @@
+<?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>
+    </assemblyBinding>
+  </runtime>
+</configuration>
@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace osu.Desktop.Deploy
+{
+    internal class GitHubObject
+    {
+        [JsonProperty(@"id")]
+        public int Id;
+
+        [JsonProperty(@"name")]
+        public string Name;
+    }
+}
@@ -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;
+    }
+}
@@ -0,0 +1,420 @@
+// 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>
+        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.Md.");
+            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"));
+            if (deltas.Count() > keep_delta_count)
+            {
+                foreach (var l in deltas.Take(deltas.Count() - 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);
+            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}";
+    }
+}
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+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")]
@@ -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.0.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.0.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.PatchApi.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+      <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>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net452" />
+  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
+  <package id="NuGet.CommandLine" version="3.5.0" targetFramework="net452" developmentDependency="true" />
+  <package id="Splat" version="1.6.2" targetFramework="net452" />
+  <package id="squirrel.windows" version="1.5.2" targetFramework="net452" />
+</packages>
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -100,6 +100,9 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
@@ -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="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
  <package id="NUnit" version="3.5.0" targetFramework="net45" />
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Desktop.Platform;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Game;
 using osu.Game.Modes;
 using osu.Game.Modes.Catch;
@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -71,7 +71,7 @@ namespace osu.Desktop.VisualTests.Tests
            Add(flow = new FlowContainer
            {
                RelativeSizeAxes = Axes.Both,
-                Direction = FlowDirection.VerticalOnly
+                Direction = FlowDirections.Vertical
            });

            SpriteText loading;
@@ -2,7 +2,7 @@
 // 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.MathUtils;
 using osu.Framework.Timing;
@@ -1,18 +1,23 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using System.Collections.Generic;
 using osu.Framework;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using OpenTK;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 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.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Modes;
+using OpenTK.Graphics;

 namespace osu.Desktop.VisualTests.Tests
 {
@@ -20,44 +25,125 @@ namespace osu.Desktop.VisualTests.Tests
    {
        public override string Name => @"Hit Objects";

+        private StopwatchClock rateAdjustClock;
+        private FramedClock framedClock;
+
+        bool auto = false;
+
        public TestCaseHitObjects()
        {
-            var swClock = new StopwatchClock(true) { Rate = 0.2f };
-            Clock = new FramedClock(swClock);
+            rateAdjustClock = new StopwatchClock(true);
+            framedClock = new FramedClock(rateAdjustClock);
+            playbackSpeed.ValueChanged += delegate { rateAdjustClock.Rate = playbackSpeed.Value; };
+        }
+
+        HitObjectType mode = HitObjectType.Slider;
+
+        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", () => { auto = !auto; 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
+                Width = 150,
+                Height = 10,
+                SelectionColor = Color4.Orange,
+                Bindable = playbackSpeed
+            });
+
+            framedClock.ProcessFrame();
+
+            var clockAdjustContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Clock = framedClock,
+                Children = new[]
                {
-                    StartTime = Clock.CurrentTime + 600 + i * 80,
-                    Position = new Vector2((i - count / 2) * 14),
-                };
+                    playfieldContainer = new Container { RelativeSizeAxes = Axes.Both },
+                    approachContainer = new Container { RelativeSizeAxes = Axes.Both }
+                }
+            };

-                DrawableHitCircle d = new DrawableHitCircle(h)
-                {
-                    Anchor = Anchor.Centre,
-                    Depth = i,
-                    State = ArmedState.Hit,
-                    Judgement = new OsuJudgementInfo { Result = HitResult.Hit }
-                };
+            Add(clockAdjustContainer);

+            load(mode);
+        }

-                approachContainer.Add(d.ApproachCircle.CreateProxy());
-                Add(d);
+        int depth;
+        void add(DrawableHitObject h)
+        {
+            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());
        }
    }
 }
@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK.Input;
@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

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

-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using osu.Game.Overlays;
@@ -3,7 +3,7 @@

 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;
 using osu.Game.Overlays;
@@ -26,8 +26,6 @@ namespace osu.Desktop.VisualTests.Tests

            progressingNotifications.Clear();

-            AddInternal(new BackgroundModeDefault() { Depth = 10 });
-
            Content.Add(manager = new NotificationManager
            {
                Anchor = Anchor.TopRight,
@@ -88,13 +86,13 @@ namespace osu.Desktop.VisualTests.Tests
                if (n.Progress < 1)
                    n.Progress += (float)(Time.Elapsed / 2000) * RNG.NextSingle();
                else
-                    n.Complete();
+                    n.State = ProgressNotificationState.Completed;
            }
        }

        private void sendProgress2()
        {
-            var n = new ProgressNotification(@"Downloading Haitai...");
+            var n = new ProgressNotification { Text = @"Downloading Haitai..." };
            manager.Post(n);
            progressingNotifications.Add(n);
        }
@@ -103,19 +101,19 @@ namespace osu.Desktop.VisualTests.Tests

        private void sendProgress1()
        {
-            var n = new ProgressNotification(@"Uploading to BSS...");
+            var n = new ProgressNotification { Text = @"Uploading to BSS..." };
            manager.Post(n);
            progressingNotifications.Add(n);
        }

        private void sendNotification2()
        {
-            manager.Post(new SimpleNotification(@"You are amazing"));
+            manager.Post(new SimpleNotification { Text = @"You are amazing" });
        }

        private void sendNotification1()
        {
-            manager.Post(new SimpleNotification(@"Welcome to osu!. Enjoy your stay!"));
+            manager.Post(new SimpleNotification { Text = @"Welcome to osu!. Enjoy your stay!" });
        }
    }
 }
@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK.Input;
@@ -9,7 +9,7 @@ using osu.Game.Overlays.Pause;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Colour;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.UserInterface;

 namespace osu.Desktop.VisualTests.Tests
@@ -3,7 +3,7 @@

 using System.Collections.Generic;
 using osu.Desktop.VisualTests.Platform;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Screens.Select;
@@ -3,7 +3,7 @@

 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
@@ -71,7 +71,7 @@ namespace osu.Desktop.VisualTests.Tests
            Add(new Box
            {
                RelativeSizeAxes = Framework.Graphics.Axes.Both,
-                Colour = Color4.Gray,
+                Colour = Color4.Black,
            });

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

-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using osu.Framework;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Database;
 using osu.Game;
@@ -11,6 +11,7 @@ using System.Reflection;
 using System.IO;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Game.Screens.Backgrounds;

 namespace osu.Desktop.VisualTests
 {
@@ -20,6 +21,8 @@ namespace osu.Desktop.VisualTests
        {
            base.LoadComplete();

+            (new BackgroundScreenDefault() { Depth = 10 }).Preload(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());
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>
@@ -20,27 +20,22 @@ 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; }

        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(f => Path.GetFileName(f)).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(f => Path.GetFileName(f)).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));
@@ -11,15 +11,35 @@ using System.Windows.Forms;
 using osu.Framework.Platform;
 using osu.Framework.Desktop.Platform;
 using osu.Game.Database;
+using osu.Desktop.Overlays;
+using System.Reflection;
+using System.Drawing;
+using osu.Game.Screens.Menu;

 namespace osu.Desktop
 {
    class OsuGameDesktop : OsuGame
    {
+        private VersionManager versionManager;
+
+        public override bool IsDeployedBuild => versionManager.IsDeployedBuild;
+
        public OsuGameDesktop(string[] args = null)
            : base(args)
        {
+            versionManager = new VersionManager { Depth = int.MinValue };
+        }

+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            versionManager.Preload(this);
+            ModeChanged += m =>
+            {
+                if (!versionManager.IsAlive && m is Intro)
+                    Add(versionManager);
+            };
        }

        public override void SetHost(BasicGameHost host)
@@ -28,6 +48,9 @@ namespace osu.Desktop
            var desktopWindow = host.Window as DesktopGameWindow;
            if (desktopWindow != null)
            {
+                desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
+                desktopWindow.Title = @"osu!lazer";
+
                desktopWindow.DragEnter += dragEnter;
                desktopWindow.DragDrop += dragDrop;
            }
@@ -0,0 +1,167 @@
+// 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.Diagnostics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
+using Squirrel;
+using System.Reflection;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Desktop.Overlays
+{
+    public class VersionManager : OverlayContainer
+    {
+        private UpdateManager updateManager;
+        private NotificationManager notification;
+
+        AssemblyName assembly = Assembly.GetEntryAssembly().GetName();
+
+        public bool IsDeployedBuild => assembly.Version.Major > 0;
+
+        protected override bool HideOnEscape => false;
+
+        public override bool HandleInput => false;
+
+        [BackgroundDependencyLoader]
+        private void load(NotificationManager notification, OsuColour colours, TextureStore textures)
+        {
+            this.notification = notification;
+
+            AutoSizeAxes = Axes.Both;
+            Anchor = Anchor.BottomCentre;
+            Origin = Anchor.BottomCentre;
+            Alpha = 0;
+
+            bool isDebug = false;
+            Debug.Assert(isDebug = true);
+
+            string version;
+            if (!IsDeployedBuild)
+            {
+                version = @"local " + (isDebug ? @"debug" : @"release");
+            }
+            else
+                version = $@"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}";
+
+            Children = new Drawable[]
+            {
+                new FlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FlowDirections.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new FlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FlowDirections.Horizontal,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Spacing = new Vector2(5),
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Font = @"Exo2.0-Bold",
+                                    Text = $@"osu!lazer"
+                                },
+                                new OsuSpriteText
+                                {
+                                    Colour = isDebug ? colours.Red : Color4.White,
+                                    Text = version
+                                },
+                            }
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            TextSize = 12,
+                            Colour = colours.Yellow,
+                            Font = @"Venera",
+                            Text = $@"Development Build"
+                        },
+                        new Sprite
+                        {
+                            Texture = textures.Get(@"Menu/dev-build-footer"),
+                        },
+                    }
+                }
+            };
+
+            updateChecker();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            State = Visibility.Visible;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            updateManager?.Dispose();
+        }
+
+        private async void updateChecker()
+        {
+            updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
+
+            if (!updateManager.IsInstalledApp)
+                return;
+
+            var info = await updateManager.CheckForUpdate();
+            if (info.ReleasesToApply.Count > 0)
+            {
+                ProgressNotification n = new UpdateProgressNotification
+                {
+                    Text = @"Downloading update..."
+                };
+                Schedule(() => notification.Post(n));
+                Schedule(() => n.State = ProgressNotificationState.Active);
+                await updateManager.DownloadReleases(info.ReleasesToApply, (int p) => Schedule(() => n.Progress = p / 100f));
+                Schedule(() => n.Text = @"Installing update...");
+                await updateManager.ApplyReleases(info, (int p) => Schedule(() => n.Progress = p / 100f));
+                Schedule(() => n.State = ProgressNotificationState.Completed);
+
+            }
+            else
+            {
+                //check again every 30 minutes.
+                Scheduler.AddDelayed(updateChecker, 60000 * 30);
+            }
+        }
+
+        protected override void PopIn()
+        {
+            FadeIn(1000);
+        }
+
+        protected override void PopOut()
+        {
+        }
+
+        class UpdateProgressNotification : ProgressNotification
+        {
+            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification(this)
+            {
+                Text = @"Update ready to install. Click to restart!",
+                Activated = () =>
+                {
+                    UpdateManager.RestartApp();
+                    return true;
+                }
+            };
+        }
+    }
+}
@@ -0,0 +1,29 @@
+// 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.CompilerServices;
+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")]
@@ -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>
@@ -79,19 +79,73 @@
    <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.0.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.0.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.PatchApi.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="mscorlib" />
+    <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4" />
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
    <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>
@@ -157,10 +211,14 @@
  </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.
@@ -0,0 +1,25 @@
+<?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="x86\*.dll" target="lib\net45\x86\"/>
+      <file src="x64\*.dll" target="lib\net45\x64\"/>
+    </files>
+</package>
+
@@ -0,0 +1,11 @@
+<?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.0.0" targetFramework="net45" />
+  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
+  <package id="Splat" version="1.6.2" targetFramework="net45" />
+  <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
+</packages>
@@ -24,6 +24,6 @@ namespace osu.Game.Modes.Catch

        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null;

-        public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
+        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
    }
 }
@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <packages>
  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
 </packages>
@@ -25,6 +25,6 @@ namespace osu.Game.Modes.Mania

        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null;

-        public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
+        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
    }
 }
@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <packages>
  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
 </packages>
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics.Containers;
+using osu.Game.Modes.Objects;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
+{
+    /// <summary>
+    /// Connects hit objects visually, for example with follow points.
+    /// </summary>
+    public abstract class ConnectionRenderer<T> : Container
+        where T : HitObject
+    {
+        /// <summary>
+        /// Hit objects to create connections for
+        /// </summary>
+        public abstract IEnumerable<T> HitObjects { get; set; }
+    }
+}
@@ -0,0 +1,67 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transformations;
+using osu.Game.Graphics;
+
+namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
+{
+    public class FollowPoint : Container
+    {
+        public double StartTime;
+        public double EndTime;
+        public Vector2 EndPosition;
+
+        const float width = 8;
+
+        public FollowPoint()
+        {
+            Origin = Anchor.Centre;
+            Alpha = 0;
+
+            Masking = true;
+            AutoSizeAxes = Axes.Both;
+            CornerRadius = width / 2;
+            EdgeEffect = new EdgeEffect
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = Color4.White.Opacity(0.2f),
+                Radius = 4,
+            };
+            
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    Size = new Vector2(width),
+                    BlendingMode = BlendingMode.Additive,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Alpha = 0.5f,
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Delay(StartTime);
+            FadeIn(DrawableOsuHitObject.TIME_FADEIN);
+            ScaleTo(1.5f);
+            ScaleTo(1, DrawableOsuHitObject.TIME_FADEIN, EasingTypes.Out);
+            MoveTo(EndPosition, DrawableOsuHitObject.TIME_FADEIN, EasingTypes.Out);
+
+            Delay(EndTime - StartTime);
+            FadeOut(DrawableOsuHitObject.TIME_FADEIN);
+
+            Delay(DrawableOsuHitObject.TIME_FADEIN);
+            Expire(true);
+        }
+    }
+}
@@ -0,0 +1,97 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using osu.Game.Modes.Osu.Objects.Drawables.Connections;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Osu.Objects.Drawables
+{
+    public class FollowPointRenderer : ConnectionRenderer<OsuHitObject>
+    {
+        private int pointDistance = 32;
+        /// <summary>
+        /// Determines how much space there is between points.
+        /// </summary>
+        public int PointDistance
+        {
+            get { return pointDistance; }
+            set
+            {
+                if (pointDistance == value) return;
+                pointDistance = value;
+                update();
+            }
+        }
+
+        private int preEmpt = 800;
+        /// <summary>
+        /// Follow points to the next hitobject start appearing for this many milliseconds before an hitobject's end time.
+        /// </summary>
+        public int PreEmpt
+        {
+            get { return preEmpt; }
+            set
+            {
+                if (preEmpt == value) return;
+                preEmpt = value;
+                update();
+            }
+        }
+
+        private IEnumerable<OsuHitObject> hitObjects;
+        public override IEnumerable<OsuHitObject> HitObjects
+        {
+            get { return hitObjects; }
+            set
+            {
+                hitObjects = value;
+                update();
+            }
+        }
+
+        private void update()
+        {
+            Clear();
+            if (hitObjects == null)
+                return;
+
+            OsuHitObject prevHitObject = null;
+            foreach (var currHitObject in hitObjects)
+            {
+                if (prevHitObject != null && !currHitObject.NewCombo && !(prevHitObject is Spinner) && !(currHitObject is Spinner))
+                {
+                    Vector2 startPosition = prevHitObject.EndPosition;
+                    Vector2 endPosition = currHitObject.Position;
+                    double startTime = prevHitObject.EndTime;
+                    double endTime = currHitObject.StartTime;
+
+                    Vector2 distanceVector = endPosition - startPosition;
+                    int distance = (int)distanceVector.Length;
+                    float rotation = (float)Math.Atan2(distanceVector.Y, distanceVector.X);
+                    double duration = endTime - startTime;
+
+                    for (int d = (int)(PointDistance * 1.5); d < distance - PointDistance; d += PointDistance)
+                    {
+                        float fraction = ((float)d / distance);
+                        Vector2 pointStartPosition = startPosition + (fraction - 0.1f) * distanceVector;
+                        Vector2 pointEndPosition = startPosition + fraction * distanceVector;
+                        double fadeOutTime = startTime + fraction * duration;
+                        double fadeInTime = fadeOutTime - PreEmpt;
+
+                        Add(new FollowPoint()
+                        {
+                            StartTime = fadeInTime,
+                            EndTime = fadeOutTime,
+                            Position = pointStartPosition,
+                            EndPosition = pointEndPosition,
+                            Rotation = rotation,
+                        });
+                    }
+                }
+                prevHitObject = currHitObject;
+            }
+        }
+    }
+}
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System;
-using System.ComponentModel;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transformations;
 using osu.Game.Modes.Objects.Drawables;
@@ -11,9 +10,9 @@ using OpenTK;

 namespace osu.Game.Modes.Osu.Objects.Drawables
 {
-    public class DrawableHitCircle : DrawableOsuHitObject
+    public class DrawableHitCircle : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
    {
-        private HitCircle osuObject;
+        private OsuHitObject osuObject;

        public ApproachCircle ApproachCircle;
        private CirclePiece circle;
@@ -23,11 +22,12 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
        private NumberPiece number;
        private GlowPiece glow;

-        public DrawableHitCircle(HitCircle h) : base(h)
+        public DrawableHitCircle(OsuHitObject h) : base(h)
        {
+            Origin = Anchor.Centre;
+
            osuObject = h;

-            Origin = Anchor.Centre;
            Position = osuObject.StackedPosition;
            Scale = new Vector2(osuObject.Scale);

@@ -49,7 +49,10 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                        return true;
                    },
                },
-                number = new NumberPiece(),
+                number = new NumberPiece()
+                {
+                    Text = h is Spinner ? "S" : (HitObject.ComboIndex + 1).ToString(),
+                },
                ring = new RingPiece(),
                flash = new FlashPiece(),
                explode = new ExplodePiece
@@ -81,18 +84,18 @@ namespace osu.Game.Modes.Osu.Objects.Drawables

            double hitOffset = Math.Abs(Judgement.TimeOffset);

+            OsuJudgementInfo osuJudgement = Judgement as OsuJudgementInfo;
+
            if (hitOffset < hit50)
            {
                Judgement.Result = HitResult.Hit;

-                OsuJudgementInfo osuInfo = Judgement as OsuJudgementInfo;
-
                if (hitOffset < hit300)
-                    osuInfo.Score = OsuScoreResult.Hit300;
+                    osuJudgement.Score = OsuScoreResult.Hit300;
                else if (hitOffset < hit100)
-                    osuInfo.Score = OsuScoreResult.Hit100;
+                    osuJudgement.Score = OsuScoreResult.Hit100;
                else if (hitOffset < hit50)
-                    osuInfo.Score = OsuScoreResult.Hit50;
+                    osuJudgement.Score = OsuScoreResult.Hit50;
            }
            else
                Judgement.Result = HitResult.Miss;
@@ -124,6 +127,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
            base.UpdateState(state);

            ApproachCircle.FadeOut();
+
+            glow.Delay(osuObject.Duration);
            glow.FadeOut(400);

            switch (state)
@@ -156,5 +161,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                    break;
            }
        }
+
+        public Drawable ProxiedLayer => ApproachCircle;
    }
 }
@@ -18,7 +18,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
        {
        }

-        public override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo();
+        public override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.Hit300 };

        protected override void UpdateState(ArmedState state)
        {
@@ -48,7 +48,37 @@ namespace osu.Game.Modes.Osu.Objects.Drawables

    public class OsuJudgementInfo : PositionalJudgementInfo
    {
+        /// <summary>
+        /// The score the user achieved.
+        /// </summary>
        public OsuScoreResult Score;
+
+        /// <summary>
+        /// The score which would be achievable on a perfect hit.
+        /// </summary>
+        public OsuScoreResult MaxScore = OsuScoreResult.Hit300;
+
+        public int ScoreValue => scoreToInt(Score);
+
+        public int MaxScoreValue => scoreToInt(MaxScore);
+
+        private int scoreToInt(OsuScoreResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 0;
+                case OsuScoreResult.Hit50:
+                    return 50;
+                case OsuScoreResult.Hit100:
+                    return 100;
+                case OsuScoreResult.Hit300:
+                    return 300;
+                case OsuScoreResult.SliderTick:
+                    return 10;
+            }
+        }
+
        public ComboResult Combo;
    }

@@ -72,5 +102,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
        Hit100,
        [Description(@"300")]
        Hit300,
+        [Description(@"10")]
+        SliderTick
    }
 }
@@ -1,16 +1,17 @@
 // 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 OpenTK;
 using osu.Framework.Graphics;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
-using OpenTK;
-using osu.Framework.Input;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Graphics.Containers;

 namespace osu.Game.Modes.Osu.Objects.Drawables
 {
-    class DrawableSlider : DrawableOsuHitObject
+    public class DrawableSlider : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
    {
        private Slider slider;

@@ -18,6 +19,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables

        private List<ISliderProgress> components = new List<ISliderProgress>();

+        private Container<DrawableSliderTick> ticks;
+
        SliderBody body;
        SliderBall ball;

@@ -34,6 +37,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                    Position = s.StackedPosition,
                    PathWidth = s.Scale * 64,
                },
+                ticks = new Container<DrawableSliderTick>(),
                bouncer1 = new SliderBouncer(s, false)
                {
                    Position = s.Curve.PositionAt(1),
@@ -50,8 +54,10 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                },
                initialCircle = new DrawableHitCircle(new HitCircle
                {
+                    //todo: avoid creating this temporary HitCircle.
                    StartTime = s.StartTime,
                    Position = s.StackedPosition,
+                    ComboIndex = s.ComboIndex,
                    Scale = s.Scale,
                    Colour = s.Colour,
                    Sample = s.Sample,
@@ -62,6 +68,26 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
            components.Add(ball);
            components.Add(bouncer1);
            components.Add(bouncer2);
+
+            AddNested(initialCircle);
+
+            var repeatDuration = s.Curve.Length / s.Velocity;
+            foreach (var tick in s.Ticks)
+            {
+                var repeatStartTime = s.StartTime + tick.RepeatIndex * repeatDuration;
+                var fadeInTime = repeatStartTime + (tick.StartTime - repeatStartTime) / 2 - (tick.RepeatIndex == 0 ? TIME_FADEIN : TIME_FADEIN / 2);
+                var fadeOutTime = repeatStartTime + repeatDuration;
+
+                var drawableTick = new DrawableSliderTick(tick)
+                {
+                    FadeInTime = fadeInTime,
+                    FadeOutTime = fadeOutTime,
+                    Position = tick.Position,
+                };
+
+                ticks.Add(drawableTick);
+                AddNested(drawableTick);
+            }
        }

        // Since the DrawableSlider itself is just a container without a size we need to
@@ -95,7 +121,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
            if (initialCircle.Judgement?.Result != HitResult.Hit)
                initialCircle.Position = slider.Curve.PositionAt(progress);

-            components.ForEach(c => c.UpdateProgress(progress, repeat));
+            foreach (var c in components) c.UpdateProgress(progress, repeat);
+            foreach (var t in ticks.Children) t.Tracking = ball.Tracking;
        }

        protected override void CheckJudgement(bool userTriggered)
@@ -105,8 +132,22 @@ namespace osu.Game.Modes.Osu.Objects.Drawables

            if (!userTriggered && Time.Current >= HitObject.EndTime)
            {
-                j.Score = sc.Score;
-                j.Result = sc.Result;
+                var ticksCount = ticks.Children.Count() + 1;
+                var ticksHit = ticks.Children.Count(t => t.Judgement.Result == HitResult.Hit);
+                if (sc.Result == HitResult.Hit)
+                    ticksHit++;
+
+                var hitFraction = (double)ticksHit / ticksCount;
+                if (hitFraction == 1 && sc.Score == OsuScoreResult.Hit300)
+                    j.Score = OsuScoreResult.Hit300;
+                else if (hitFraction >= 0.5 && sc.Score >= OsuScoreResult.Hit100)
+                    j.Score = OsuScoreResult.Hit100;
+                else if (hitFraction > 0)
+                    j.Score = OsuScoreResult.Hit50;
+                else
+                    j.Score = OsuScoreResult.Miss;
+
+                j.Result = j.Score != OsuScoreResult.Miss ? HitResult.Hit : HitResult.Miss;
            }
        }

@@ -133,6 +174,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables

            FadeOut(800);
        }
+
+        public Drawable ProxiedLayer => initialCircle.ApproachCircle;
    }

    internal interface ISliderProgress
@@ -0,0 +1,120 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transformations;
+using osu.Game.Beatmaps.Samples;
+using osu.Game.Modes.Objects.Drawables;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Modes.Osu.Objects.Drawables
+{
+    public class DrawableSliderTick : DrawableOsuHitObject
+    {
+        private SliderTick sliderTick;
+
+        public double FadeInTime;
+        public double FadeOutTime;
+
+        public bool Tracking;
+
+        public override bool RemoveWhenNotAlive => false;
+
+        public override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.SliderTick };
+
+        public DrawableSliderTick(SliderTick sliderTick) : base(sliderTick)
+        {
+            this.sliderTick = sliderTick;
+
+            Size = new Vector2(16) * sliderTick.Scale;
+
+            Masking = true;
+            CornerRadius = Size.X / 2;
+
+            Origin = Anchor.Centre;
+
+            BorderThickness = 2;
+            BorderColour = Color4.White;
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = sliderTick.Colour,
+                    Alpha = 0.3f,
+                }
+            };
+        }
+
+        private SampleChannel sample;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            string sampleSet = (HitObject.Sample?.Set ?? SampleSet.Normal).ToString().ToLower();
+
+            sample = audio.Sample.Get($@"Gameplay/{sampleSet}-slidertick");
+        }
+
+        protected override void PlaySample()
+        {
+            sample?.Play();
+        }
+
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            var j = Judgement as OsuJudgementInfo;
+
+            if (Judgement.TimeOffset >= 0)
+            {
+                j.Result = Tracking ? HitResult.Hit : HitResult.Miss;
+                j.Score = Tracking ? OsuScoreResult.SliderTick : OsuScoreResult.Miss;
+            }
+        }
+        
+        protected override void UpdatePreemptState()
+        {
+            var animIn = Math.Min(150, sliderTick.StartTime - FadeInTime);
+
+            ScaleTo(0.5f);
+            ScaleTo(1.2f, animIn);
+            FadeIn(animIn);
+
+            Delay(animIn);
+            ScaleTo(1, 150, EasingTypes.Out);
+
+            Delay(-animIn);
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+            if (!IsLoaded) return;
+
+            base.UpdateState(state);
+
+            switch (state)
+            {
+                case ArmedState.Idle:
+                    Delay(FadeOutTime - sliderTick.StartTime);
+                    FadeOut();
+                    break;
+                case ArmedState.Miss:
+                    FadeOut(160);
+                    FadeColour(Color4.Red, 80);
+                    break;
+                case ArmedState.Hit:
+                    FadeOut(120, EasingTypes.OutQuint);
+                    ScaleTo(Scale * 1.5f, 120, EasingTypes.OutQuint);
+                    break;
+            }
+        }
+    }
+}
@@ -0,0 +1,155 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Transformations;
+using osu.Framework.MathUtils;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Modes.Osu.Objects.Drawables
+{
+    public class DrawableSpinner : DrawableOsuHitObject
+    {
+        private Spinner spinner;
+
+        private SpinnerDisc disc;
+        private SpinnerBackground background;
+        private Container circleContainer;
+        private DrawableHitCircle circle;
+
+        public DrawableSpinner(Spinner s) : base(s)
+        {
+            Origin = Anchor.Centre;
+            Position = s.Position;
+
+            //take up full playfield.
+            Size = new Vector2(512);
+
+            spinner = s;
+
+            Children = new Drawable[]
+            {
+                background = new SpinnerBackground
+                {
+                    Alpha = 0,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    DiscColour = Color4.Black
+                },
+                disc = new SpinnerDisc
+                {
+                    Alpha = 0,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    DiscColour = s.Colour
+                },
+                circleContainer = new Container
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new []
+                    {
+                        circle = new DrawableHitCircle(s)
+                        {
+                            Interactive = false,
+                            Position = Vector2.Zero,
+                            Anchor = Anchor.Centre,
+                        }
+                    }
+                }
+            };
+
+            background.Scale = scaleToCircle;
+            disc.Scale = scaleToCircle;
+        }
+
+        public override bool Contains(Vector2 screenSpacePos) => true;
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            if (Time.Current < HitObject.StartTime) return;
+
+            var j = Judgement as OsuJudgementInfo;
+
+            disc.ScaleTo(Interpolation.ValueAt(Math.Sqrt(Progress), scaleToCircle, Vector2.One, 0, 1), 100);
+
+            if (Progress >= 1)
+                disc.Complete = true;
+
+            if (!userTriggered && Time.Current >= HitObject.EndTime)
+            {
+                if (Progress >= 1)
+                {
+                    j.Score = OsuScoreResult.Hit300;
+                    j.Result = HitResult.Hit;
+                }
+                else if (Progress > .9)
+                {
+                    j.Score = OsuScoreResult.Hit100;
+                    j.Result = HitResult.Hit;
+                }
+                else if (Progress > .75)
+                {
+                    j.Score = OsuScoreResult.Hit50;
+                    j.Result = HitResult.Hit;
+                }
+                else
+                {
+                    j.Score = OsuScoreResult.Miss;
+                    if (Time.Current >= HitObject.EndTime)
+                        j.Result = HitResult.Miss;
+                }
+            }
+        }
+
+        private Vector2 scaleToCircle => new Vector2(circle.Scale * circle.DrawWidth / DrawWidth) * 0.95f;
+
+        private float spinsPerMinuteNeeded = 100 + (5 * 15); //TODO: read per-map OD and place it on the 5
+
+        private float rotationsNeeded => (float)(spinsPerMinuteNeeded * (spinner.EndTime - spinner.StartTime) / 60000f);
+
+        public float Progress => MathHelper.Clamp(disc.RotationAbsolute / 360 / rotationsNeeded, 0, 1);
+
+        protected override void UpdatePreemptState()
+        {
+            base.UpdatePreemptState();
+
+            FadeIn(200);
+            circleContainer.ScaleTo(1, 400, EasingTypes.OutElastic);
+
+            background.Delay(TIME_PREEMPT - 100);
+            background.FadeIn(200);
+            background.ScaleTo(1, 200, EasingTypes.OutQuint);
+
+            disc.Delay(TIME_PREEMPT - 50);
+            disc.FadeIn(200);
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+            if (!IsLoaded) return;
+
+            base.UpdateState(state);
+
+            Delay(HitObject.Duration, true);
+
+            FadeOut(160);
+
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
+                    break;
+                case ArmedState.Miss:
+                    ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
+                    break;
+            }
+        }
+    }
+}
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Modes.Objects.Drawables;
 using OpenTK;
 using OpenTK.Graphics;
@@ -24,13 +25,13 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
            AutoSizeAxes = Axes.Both;
            Origin = Anchor.Centre;

-            Direction = FlowDirection.VerticalOnly;
+            Direction = FlowDirections.Vertical;
            Spacing = new Vector2(0, 2);
            Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;

            Children = new Drawable[]
            {
-                line1 = new SpriteText
+                line1 = new OsuSpriteText
                {
                    Anchor = Anchor.TopCentre,
                    Origin = Anchor.TopCentre,
@@ -38,7 +39,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                    Font = @"Venera",
                    TextSize = 16,
                },
-                line2 = new SpriteText
+                line2 = new OsuSpriteText
                {
                    Text = judgement.Combo.GetDescription(),
                    Font = @"Venera",
@@ -14,9 +14,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
    public class CirclePiece : Container
    {
-
        private Sprite disc;
-        private Triangles triangles;
+

        public Func<bool> Hit;

@@ -36,10 +35,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                    Anchor = Anchor.Centre,
                    Origin = Anchor.Centre
                },
-                triangles = new Triangles
+                new TrianglesPiece
                {
+                    RelativeSizeAxes = Axes.Both,
                    BlendingMode = BlendingMode.Additive,
-                    RelativeSizeAxes = Axes.Both
+                    Alpha = 0.5f,
                }
            };
        }
@@ -21,10 +21,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces

            Children = new Drawable[]
            {
-                new Triangles
+                new TrianglesPiece
                {
                    BlendingMode = BlendingMode.Additive,
-                    RelativeSizeAxes = Axes.Both
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.2f,
                }
            };
        }
@@ -6,33 +6,54 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using OpenTK;
+using OpenTK.Graphics;

 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
    public class NumberPiece : Container
    {
-        private Sprite number;
+        private SpriteText number;
+
+        public string Text
+        {
+            get { return number.Text; }
+            set { number.Text = value; }
+        }

        public NumberPiece()
        {
            Anchor = Anchor.Centre;
            Origin = Anchor.Centre;

-            Children = new[]
+            Children = new Drawable[]
            {
-                number = new Sprite
+                new CircularContainer
                {
+                    EdgeEffect = new EdgeEffect
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Radius = 60,
+                        Colour = Color4.White.Opacity(0.5f),
+                    },
+                    Children = new[]
+                    {
+                        new Box()
+                    }
+                },
+                number = new OsuSpriteText
+                {
+                    Text = @"1",
+                    Font = @"Venera",
+                    UseFullGlyphHeight = false,
                    Anchor = Anchor.Centre,
                    Origin = Anchor.Centre,
+                    TextSize = 40,
                    Alpha = 1
                }
            };
        }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            number.Texture = textures.Get(@"Play/osu/number");
-        }
    }
 }
@@ -11,7 +11,7 @@ using OpenTK.Graphics;

 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
-    public class SliderBall : Container, ISliderProgress
+    public class SliderBall : CircularContainer, ISliderProgress
    {
        private readonly Slider slider;
        private Box follow;
@@ -39,7 +39,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                    Height = width,
                    Alpha = 0,
                },
-                new Container
+                new CircularContainer
                {
                    Masking = true,
                    AutoSizeAxes = Axes.Both,
@@ -48,7 +48,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                    BorderThickness = 10,
                    BorderColour = Color4.White,
                    Alpha = 1,
-                    CornerRadius = width / 2,
                    Children = new[]
                    {
                        new Box
@@ -104,8 +103,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
        {
            base.Update();

-            CornerRadius = DrawWidth / 2;
-            Tracking = canCurrentlyTrack && lastState != null && Contains(lastState.Mouse.NativeState.Position) && lastState.Mouse.HasMainButtonPressed;
+            if (Time.Current < slider.EndTime)
+                Tracking = canCurrentlyTrack && lastState != null && Contains(lastState.Mouse.NativeState.Position) && lastState.Mouse.HasMainButtonPressed;
        }

        public void UpdateProgress(double progress, int repeat)
@@ -8,7 +8,7 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Lines;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Configuration;
 using OpenTK;
@@ -0,0 +1,10 @@
+// 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.Osu.Objects.Drawables.Pieces
+{
+    public class SpinnerBackground : SpinnerDisc
+    {
+        public override bool HandleInput => false;
+    }
+}
@@ -0,0 +1,206 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transformations;
+using osu.Framework.Input;
+using osu.Framework.Logging;
+using osu.Game.Graphics;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
+{
+    public class SpinnerDisc : CircularContainer
+    {
+        public override bool Contains(Vector2 screenSpacePos) => true;
+
+        protected Sprite Disc;
+
+        public SRGBColour DiscColour
+        {
+            get { return Disc.Colour; }
+            set { Disc.Colour = value; }
+        }
+
+        Color4 completeColour;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            completeColour = colours.YellowLight.Opacity(0.8f);
+        }
+
+        class SpinnerBorder : Container
+        {
+            public SpinnerBorder()
+            {
+                Origin = Anchor.Centre;
+                Anchor = Anchor.Centre;
+                RelativeSizeAxes = Axes.Both;
+
+                layout();
+            }
+
+            private int lastLayoutDotCount;
+            private void layout()
+            {
+                int count = (int)(MathHelper.Pi * ScreenSpaceDrawQuad.Width / 9);
+
+                if (count == lastLayoutDotCount) return;
+
+                lastLayoutDotCount = count;
+
+                while (Children.Count() < count)
+                {
+                    Add(new CircularContainer
+                    {
+                        Colour = Color4.White,
+                        RelativePositionAxes = Axes.Both,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(1 / ScreenSpaceDrawQuad.Width * 2000),
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                Origin = Anchor.Centre,
+                                Anchor = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Both,
+                            }
+                        }
+                    });
+                }
+
+                var size = new Vector2(1 / ScreenSpaceDrawQuad.Width * 2000);
+
+                int i = 0;
+                foreach (var d in Children)
+                {
+                    d.Size = size;
+                    d.Position = new Vector2(
+                        0.5f + (float)Math.Sin((float)i / count * 2 * MathHelper.Pi) / 2,
+                        0.5f + (float)Math.Cos((float)i / count * 2 * MathHelper.Pi) / 2
+                    );
+
+                    i++;
+                }
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                layout();
+            }
+        }
+
+        public SpinnerDisc()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            Children = new Drawable[]
+            {
+                Disc = new Box
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.2f,
+                },
+                new SpinnerBorder()
+            };
+        }
+
+        bool tracking;
+        public bool Tracking
+        {
+            get { return tracking; }
+            set
+            {
+                if (value == tracking) return;
+
+                tracking = value;
+
+                Disc.FadeTo(tracking ? 0.5f : 0.2f, 100);
+            }
+        }
+
+        bool complete;
+        public bool Complete
+        {
+            get { return complete; }
+            set
+            {
+                if (value == complete) return;
+
+                complete = value;
+
+                Disc.FadeColour(completeColour, 200);
+
+                updateCompleteTick();
+            }
+        }
+
+        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+        {
+            Tracking = true;
+            return base.OnMouseDown(state, args);
+        }
+
+        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+        {
+            Tracking = false;
+            return base.OnMouseUp(state, args);
+        }
+
+        protected override bool OnMouseMove(InputState state)
+        {
+            Tracking |= state.Mouse.HasMainButtonPressed;
+            mousePosition = state.Mouse.Position;
+            return base.OnMouseMove(state);
+        }
+
+        private Vector2 mousePosition;
+
+        private float lastAngle;
+        private float currentRotation;
+        public float RotationAbsolute;
+
+        private int completeTick;
+
+        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 720));
+
+        protected override void Update()
+        {
+            base.Update();
+
+            var thisAngle = -(float)MathHelper.RadiansToDegrees(Math.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
+            if (tracking)
+            {
+                if (thisAngle - lastAngle > 180)
+                    lastAngle += 360;
+                else if (lastAngle - thisAngle > 180)
+                    lastAngle -= 360;
+
+                currentRotation += thisAngle - lastAngle;
+                RotationAbsolute += Math.Abs(thisAngle - lastAngle);
+            }
+            lastAngle = thisAngle;
+
+            if (Complete && updateCompleteTick())
+            {
+                Disc.Flush(flushType: typeof(TransformAlpha));
+                Disc.FadeTo(0.75f, 30, EasingTypes.OutExpo);
+                Disc.Delay(30);
+                Disc.FadeTo(0.5f, 250, EasingTypes.OutQuint);
+            }
+
+            RotateTo(currentRotation, 100, EasingTypes.OutExpo);
+        }
+    }
+}
@@ -1,46 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-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>
-    {
-        public override bool HandleInput => false;
-
-        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)));
-        }
-    }
-}
@@ -0,0 +1,26 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Graphics.Backgrounds;
+
+namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
+{
+    public class TrianglesPiece : Triangles
+    {
+        protected override bool ExpireOffScreenTriangles => false;
+        protected override bool CreateNewTriangles => false;
+        protected override float SpawnRatio => 0.5f;
+
+        public TrianglesPiece()
+        {
+            TriangleScale = 1.2f;
+        }
+
+        protected override void Update()
+        {
+            if (IsPresent)
+                base.Update();
+        }
+    }
+}
@@ -31,19 +31,19 @@ namespace osu.Game.Modes.Osu.Objects

            Scale = (1.0f - 0.7f * (beatmap.BeatmapInfo.BaseDifficulty.CircleSize - 5) / 5) / 2;
        }
+    }

-        [Flags]
-        internal enum HitObjectType
-        {
-            Circle = 1,
-            Slider = 2,
-            NewCombo = 4,
-            CircleNewCombo = 5,
-            SliderNewCombo = 6,
-            Spinner = 8,
-            ColourHax = 122,
-            Hold = 128,
-            ManiaLong = 128,
-        }
+    [Flags]
+    public enum HitObjectType
+    {
+        Circle = 1,
+        Slider = 2,
+        NewCombo = 4,
+        CircleNewCombo = 5,
+        SliderNewCombo = 6,
+        Spinner = 8,
+        ColourHax = 122,
+        Hold = 128,
+        ManiaLong = 128,
    }
 }
@@ -15,8 +15,14 @@ namespace osu.Game.Modes.Osu.Objects
        {
            List<OsuHitObject> output = new List<OsuHitObject>();

+            int combo = 0;
            foreach (HitObject h in beatmap.HitObjects)
+            {
+                if (h.NewCombo) combo = 0;
+
+                h.ComboIndex = combo++;
                output.Add(h as OsuHitObject);
+            }

            UpdateStacking(output, beatmap.BeatmapInfo?.StackLeniency ?? 0.7f);

@@ -18,21 +18,22 @@ namespace osu.Game.Modes.Osu.Objects
        public override HitObject Parse(string text)
        {
            string[] split = text.Split(',');
-            var type = (OsuHitObject.HitObjectType)int.Parse(split[3]);
-            bool combo = type.HasFlag(OsuHitObject.HitObjectType.NewCombo);
-            type &= (OsuHitObject.HitObjectType)0xF;
-            type &= ~OsuHitObject.HitObjectType.NewCombo;
+            var type = (HitObjectType)int.Parse(split[3]);
+            bool combo = type.HasFlag(HitObjectType.NewCombo);
+            type &= (HitObjectType)0xF;
+            type &= ~HitObjectType.NewCombo;
            OsuHitObject result;
            switch (type)
            {
-                case OsuHitObject.HitObjectType.Circle:
-                    result = new HitCircle();
+                case HitObjectType.Circle:
+                    result = new HitCircle
+                    {
+                        Position = new Vector2(int.Parse(split[0]), int.Parse(split[1]))
+                    };
                    break;
-                case OsuHitObject.HitObjectType.Slider:
-                    Slider s = new Slider();
-
+                case HitObjectType.Slider:
                    CurveTypes curveType = CurveTypes.Catmull;
-                    int repeatCount = 0;
+                    int repeatCount;
                    double length = 0;
                    List<Vector2> points = new List<Vector2>();

@@ -79,29 +80,28 @@ namespace osu.Game.Modes.Osu.Objects
                    if (split.Length > 7)
                        length = Convert.ToDouble(split[7], CultureInfo.InvariantCulture);

-                    s.RepeatCount = repeatCount;
-
-                    s.Curve = new SliderCurve
+                    result = new Slider
                    {
                        ControlPoints = points,
                        Length = length,
-                        CurveType = curveType
+                        CurveType = curveType,
+                        RepeatCount = repeatCount,
+                        Position = new Vector2(int.Parse(split[0]), int.Parse(split[1]))
                    };
-
-                    s.Curve.Calculate();
-
-                    result = s;
                    break;
-                case OsuHitObject.HitObjectType.Spinner:
-                    result = new Spinner();
+                case HitObjectType.Spinner:
+                    result = new Spinner
+                    {
+                        Length = Convert.ToDouble(split[5], CultureInfo.InvariantCulture) - Convert.ToDouble(split[2], CultureInfo.InvariantCulture),
+                        Position = new Vector2(512, 384) / 2,
+                    };
                    break;
                default:
-                    //throw new InvalidOperationException($@"Unknown hit object type {type}");
-                    return null;
+                    throw new InvalidOperationException($@"Unknown hit object type {type}");
            }
-            result.Position = new Vector2(int.Parse(split[0]), int.Parse(split[1]));
-            result.StartTime = double.Parse(split[2]);
-            result.Sample = new HitSampleInfo {
+            result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture);
+            result.Sample = new HitSampleInfo
+            {
                Type = (SampleType)int.Parse(split[4]),
                Set = SampleSet.Soft,
            };
@@ -1,8 +1,12 @@
 // 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 OpenTK;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Samples;
+using osu.Game.Beatmaps.Timing;
+using System;
+using System.Collections.Generic;

 namespace osu.Game.Modes.Osu.Objects
 {
@@ -19,23 +23,93 @@ namespace osu.Game.Modes.Osu.Objects
            set
            {
                stackHeight = value;
-                if (Curve != null)
-                    Curve.Offset = StackOffset;
+                Curve.Offset = StackOffset;
            }
        }

+        public List<Vector2> ControlPoints
+        {
+            get { return Curve.ControlPoints; }
+            set { Curve.ControlPoints = value; }
+        }
+
+        public double Length
+        {
+            get { return Curve.Length; }
+            set { Curve.Length = value; }
+        }
+
+        public CurveTypes CurveType
+        {
+            get { return Curve.CurveType; }
+            set { Curve.CurveType = value; }
+        }
+
        public double Velocity;
+        public double TickDistance;

        public override void SetDefaultsFromBeatmap(Beatmap beatmap)
        {
            base.SetDefaultsFromBeatmap(beatmap);

-            Velocity = 100 / beatmap.BeatLengthAt(StartTime, true) * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier;
+            var baseDifficulty = beatmap.BeatmapInfo.BaseDifficulty;
+
+            ControlPoint overridePoint;
+            ControlPoint timingPoint = beatmap.TimingPointAt(StartTime, out overridePoint);
+            var velocityAdjustment = overridePoint?.VelocityAdjustment ?? 1;
+            var baseVelocity = 100 * baseDifficulty.SliderMultiplier / velocityAdjustment;
+
+            Velocity = baseVelocity / timingPoint.BeatLength;
+            TickDistance = baseVelocity / baseDifficulty.SliderTickRate;
        }

-        public int RepeatCount;
+        public int RepeatCount = 1;

-        public SliderCurve Curve;
+        internal readonly SliderCurve Curve = new SliderCurve();
+
+        public IEnumerable<SliderTick> Ticks
+        {
+            get
+            {
+                if (TickDistance == 0) yield break;
+
+                var length = Curve.Length;
+                var tickDistance = Math.Min(TickDistance, length);
+                var repeatDuration = length / Velocity;
+
+                var minDistanceFromEnd = Velocity * 0.01;
+
+                for (var repeat = 0; repeat < RepeatCount; repeat++)
+                {
+                    var repeatStartTime = StartTime + repeat * repeatDuration;
+                    var reversed = repeat % 2 == 1;
+
+                    for (var d = tickDistance; d <= length; d += tickDistance)
+                    {
+                        if (d > length - minDistanceFromEnd)
+                            break;
+
+                        var distanceProgress = d / length;
+                        var timeProgress = reversed ? 1 - distanceProgress : distanceProgress;
+
+                        yield return new SliderTick
+                        {
+                            RepeatIndex = repeat,
+                            StartTime = repeatStartTime + timeProgress * repeatDuration,
+                            Position = Curve.PositionAt(distanceProgress),
+                            StackHeight = StackHeight,
+                            Scale = Scale,
+                            Colour = Colour,
+                            Sample = new HitSampleInfo
+                            {
+                                Type = SampleType.None,
+                                Set = SampleSet.Soft,
+                            },
+                        };
+                    }
+                }
+            }
+        }
    }

    public enum CurveTypes
@@ -15,7 +15,7 @@ namespace osu.Game.Modes.Osu.Objects

        public List<Vector2> ControlPoints;

-        public CurveTypes CurveType;
+        public CurveTypes CurveType = CurveTypes.PerfectCurve;

        public Vector2 Offset;

@@ -172,6 +172,9 @@ namespace osu.Game.Modes.Osu.Objects
        /// <param name="p1">End progress. Ranges from 0 (beginning of the slider) to 1 (end of the slider).</param>
        public void GetPathToProgress(List<Vector2> path, double p0, double p1)
        {
+            if (calculatedPath.Count == 0 && ControlPoints.Count > 0)
+                Calculate();
+
            double d0 = progressToDistance(p0);
            double d1 = progressToDistance(p1);

@@ -196,6 +199,9 @@ namespace osu.Game.Modes.Osu.Objects
        /// <returns></returns>
        public Vector2 PositionAt(double progress)
        {
+            if (calculatedPath.Count == 0 && ControlPoints.Count > 0)
+                Calculate();
+
            double d = progressToDistance(progress);
            return interpolateVertices(indexOfDistance(d), d) + Offset;
        }
@@ -0,0 +1,9 @@
+using OpenTK;
+
+namespace osu.Game.Modes.Osu.Objects
+{
+    public class SliderTick : OsuHitObject
+    {
+        public int RepeatIndex { get; set; }
+    }
+}
@@ -1,9 +1,14 @@
 // 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;
+
 namespace osu.Game.Modes.Osu.Objects
 {
    public class Spinner : OsuHitObject
    {
+        public double Length;
+
+        public override double EndTime => StartTime + Length;
    }
 }
@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
@@ -36,24 +36,8 @@ namespace osu.Game.Modes.Osu

            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;
-                }
+                score += j.ScoreValue;
+                maxScore += j.MaxScoreValue;
            }

            TotalScore.Value = score;
@@ -21,7 +21,8 @@ namespace osu.Game.Modes.Osu.UI
                return new DrawableHitCircle(h as HitCircle);
            if (h is Slider)
                return new DrawableSlider(h as Slider);
-
+            if (h is Spinner)
+                return new DrawableSpinner(h as Spinner);
            return null;
        }
    }
@@ -1,13 +1,15 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.Objects.Drawables;
+using osu.Game.Modes.Osu.Objects.Drawables.Connections;
 using osu.Game.Modes.UI;
-using OpenTK;
+using System.Linq;

 namespace osu.Game.Modes.Osu.UI
 {
@@ -15,6 +17,7 @@ namespace osu.Game.Modes.Osu.UI
    {
        private Container approachCircles;
        private Container judgementLayer;
+        private ConnectionRenderer<OsuHitObject> connectionLayer;

        public override Vector2 Size
        {
@@ -36,6 +39,11 @@ namespace osu.Game.Modes.Osu.UI

            Add(new Drawable[]
            {
+                connectionLayer = new FollowPointRenderer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = 2,
+                },
                judgementLayer = new Container
                {
                    RelativeSizeAxes = Axes.Both,
@@ -52,10 +60,10 @@ namespace osu.Game.Modes.Osu.UI
        public override void Add(DrawableHitObject h)
        {
            h.Depth = (float)h.HitObject.StartTime;
-            DrawableHitCircle c = h as DrawableHitCircle;
+            IDrawableHitObjectWithProxiedApproach c = h as IDrawableHitObjectWithProxiedApproach;
            if (c != null)
            {
-                approachCircles.Add(c.ApproachCircle.CreateProxy());
+                approachCircles.Add(c.ProxiedLayer.CreateProxy());
            }

            h.OnJudgement += judgement;
@@ -63,6 +71,13 @@ namespace osu.Game.Modes.Osu.UI
            base.Add(h);
        }

+        public override void PostProcess()
+        {
+            connectionLayer.HitObjects = HitObjects.Children
+                .Select(d => (OsuHitObject)d.HitObject)
+                .OrderBy(h => h.StartTime);
+        }
+
        private void judgement(DrawableHitObject h, JudgementInfo j)
        {
            HitExplosion explosion = new HitExplosion((OsuJudgementInfo)j, (OsuHitObject)h.HitObject);
@@ -13,19 +13,21 @@ namespace osu.Game.Modes.Osu.UI
 {
    public class OsuScoreOverlay : ScoreOverlay
    {
-        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter()
+        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)
        {
-            Anchor = Anchor.TopRight,
-            Origin = Anchor.TopRight,
-            TextSize = 60,
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopCentre,
+            TextSize = 40,
+            Position = new Vector2(0, 30),
            Margin = new MarginPadding { Right = 5 },
        };

        protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter()
        {
-            Anchor = Anchor.TopRight,
-            Origin = Anchor.TopRight,
-            Position = new Vector2(0, 55),
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopCentre,
+            Position = new Vector2(0, 65),
+            TextSize = 20,
            Margin = new MarginPadding { Right = 5 },
        };

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -46,21 +46,29 @@
    <Compile Include="Objects\BezierApproximator.cs" />
    <Compile Include="Objects\CircularArcApproximator.cs" />
    <Compile Include="Objects\Drawables\DrawableOsuHitObject.cs" />
+    <Compile Include="Objects\Drawables\Connections\ConnectionRenderer.cs" />
+    <Compile Include="Objects\Drawables\Connections\FollowPointRenderer.cs" />
    <Compile Include="Objects\Drawables\Pieces\ApproachCircle.cs" />
+    <Compile Include="Objects\Drawables\Pieces\SpinnerBackground.cs" />
    <Compile Include="Objects\Drawables\Pieces\CirclePiece.cs" />
    <Compile Include="Objects\Drawables\DrawableSlider.cs" />
+    <Compile Include="Objects\Drawables\Connections\FollowPoint.cs" />
+    <Compile Include="Objects\Drawables\DrawableSpinner.cs" />
    <Compile Include="Objects\Drawables\Pieces\ExplodePiece.cs" />
    <Compile Include="Objects\Drawables\Pieces\FlashPiece.cs" />
    <Compile Include="Objects\Drawables\Pieces\GlowPiece.cs" />
    <Compile Include="Objects\Drawables\HitExplosion.cs" />
    <Compile Include="Objects\Drawables\Pieces\NumberPiece.cs" />
+    <Compile Include="Objects\Drawables\DrawableSliderTick.cs" />
    <Compile Include="Objects\Drawables\Pieces\RingPiece.cs" />
    <Compile Include="Objects\Drawables\Pieces\SliderBouncer.cs" />
-    <Compile Include="Objects\Drawables\Pieces\Triangles.cs" />
+    <Compile Include="Objects\Drawables\Pieces\SpinnerDisc.cs" />
+    <Compile Include="Objects\Drawables\Pieces\TrianglesPiece.cs" />
    <Compile Include="Objects\Drawables\Pieces\SliderBall.cs" />
    <Compile Include="Objects\Drawables\Pieces\SliderBody.cs" />
    <Compile Include="Objects\OsuHitObjectParser.cs" />
    <Compile Include="Objects\SliderCurve.cs" />
+    <Compile Include="Objects\SliderTick.cs" />
    <Compile Include="OsuScore.cs" />
    <Compile Include="OsuScoreProcessor.cs" />
    <Compile Include="UI\OsuComboCounter.cs" />
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <packages>
  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net452" />
 </packages>
@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
@@ -25,6 +25,6 @@ namespace osu.Game.Modes.Taiko

        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null;

-        public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
+        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
    }
 }
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <packages>
  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
 </packages>
@@ -1,4 +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;
 using System.IO;
 using NUnit.Framework;
 using OpenTK;
@@ -1,4 +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;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -1,4 +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;
 using System.IO;
 using NUnit.Framework;
 using osu.Game.Beatmaps.IO;
@@ -39,7 +42,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                    "Soleily - Renatus (MMzz) [Muzukashii].osu",
                    "Soleily - Renatus (MMzz) [Oni].osu"
                };
-                var maps = reader.ReadBeatmaps();
+                var maps = reader.BeatmapFilenames;
                foreach (var map in expected)
                    Assert.Contains(map, maps);
            }
@@ -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"/>
@@ -1,4 +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;
 using System.IO;
 using System.Reflection;

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -55,6 +55,9 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
    <None Include="app.config" />
    <None Include="packages.config" />
    <None Include="OpenTK.dll.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="NUnit" version="3.5.0" targetFramework="net45" />
  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
@@ -26,26 +26,36 @@ namespace osu.Game.Beatmaps
            return 60000 / BeatLengthAt(time);
        }

-        public double BeatLengthAt(double time, bool applyMultipliers = false)
+        public double BeatLengthAt(double time)
        {
-            int point = 0;
-            int samplePoint = 0;
+            ControlPoint overridePoint;
+            ControlPoint timingPoint = TimingPointAt(time, out overridePoint);
+            return timingPoint.BeatLength;
+        }

-            for (int i = 0; i < ControlPoints.Count; i++)
-                if (ControlPoints[i].Time <= time)
+        public ControlPoint TimingPointAt(double time, out ControlPoint overridePoint)
+        {
+            overridePoint = null;
+
+            ControlPoint timingPoint = null;
+            foreach (var controlPoint in ControlPoints)
+            {
+                // Some beatmaps have the first timingPoint (accidentally) start after the first HitObject(s).
+                // This null check makes it so that the first ControlPoint that makes a timing change is used as
+                // the timingPoint for those HitObject(s).
+                if (controlPoint.Time <= time || timingPoint == null)
                {
-                    if (ControlPoints[i].TimingChange)
-                        point = i;
-                    else
-                        samplePoint = i;
+                    if (controlPoint.TimingChange)
+                    {
+                        timingPoint = controlPoint;
+                        overridePoint = null;
+                    }
+                    else overridePoint = controlPoint;
                }
+                else break;
+            }

-            double mult = 1;
-
-            if (applyMultipliers && samplePoint > point)
-                mult = ControlPoints[samplePoint].VelocityAdjustment;
-
-            return ControlPoints[point].BeatLength * mult;
+            return timingPoint ?? ControlPoint.Default;
        }
    }
 }
@@ -77,7 +77,7 @@ namespace osu.Game.Beatmaps.Drawables
                new FlowContainer
                {
                    Padding = new MarginPadding(5),
-                    Direction = FlowDirection.HorizontalOnly,
+                    Direction = FlowDirections.Horizontal,
                    AutoSizeAxes = Axes.Both,
                    Anchor = Anchor.CentreLeft,
                    Origin = Anchor.CentreLeft,
@@ -93,13 +93,13 @@ namespace osu.Game.Beatmaps.Drawables
                        {
                            Padding = new MarginPadding { Left = 5 },
                            Spacing = new Vector2(0, 5),
-                            Direction = FlowDirection.VerticalOnly,
+                            Direction = FlowDirections.Vertical,
                            AutoSizeAxes = Axes.Both,
                            Children = new Drawable[]
                            {
                                new FlowContainer
                                {
-                                    Direction = FlowDirection.HorizontalOnly,
+                                    Direction = FlowDirections.Horizontal,
                                    AutoSizeAxes = Axes.Both,
                                    Spacing = new Vector2(4, 0),
                                    Children = new[]
@@ -39,7 +39,7 @@ namespace osu.Game.Beatmaps.Drawables
                },
                new FlowContainer
                {
-                    Direction = FlowDirection.VerticalOnly,
+                    Direction = FlowDirections.Vertical,
                    Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
                    AutoSizeAxes = Axes.Both,
                    Children = new[]
@@ -113,7 +113,7 @@ namespace osu.Game.Beatmaps.Drawables
                    new FlowContainer
                    {
                        Depth = -1,
-                        Direction = FlowDirection.HorizontalOnly,
+                        Direction = FlowDirections.Horizontal,
                        RelativeSizeAxes = Axes.Both,
                        // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
                        Shear = new Vector2(0.8f, 0),
@@ -7,6 +7,8 @@ using System.IO;
 using osu.Game.Modes.Objects;
 using OpenTK.Graphics;
 using osu.Game.Graphics;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Database;

 namespace osu.Game.Beatmaps.Formats
 {
@@ -34,6 +36,11 @@ namespace osu.Game.Beatmaps.Formats
            return b;
        }

+        public virtual void Decode(TextReader stream, Beatmap beatmap)
+        {
+            ParseFile(stream, beatmap);
+        }
+
        public virtual Beatmap Process(Beatmap beatmap)
        {
            ApplyColours(beatmap);
@@ -41,7 +48,23 @@ namespace osu.Game.Beatmaps.Formats
            return beatmap;
        }

-        protected abstract Beatmap ParseFile(TextReader stream);
+        protected virtual Beatmap ParseFile(TextReader stream)
+        {
+            var beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>(),
+                ControlPoints = new List<ControlPoint>(),
+                ComboColors = new List<Color4>(),
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata(),
+                    BaseDifficulty = new BaseDifficulty(),
+                },
+            };
+            ParseFile(stream, beatmap);
+            return beatmap;
+        }
+        protected abstract void ParseFile(TextReader stream, Beatmap beatmap);

        public virtual void ApplyColours(Beatmap b)
        {
@@ -12,7 +12,7 @@ namespace osu.Game.Beatmaps.Formats
 {
    public class ConstructableBeatmapDecoder : BeatmapDecoder
    {
-        protected override Beatmap ParseFile(TextReader stream)
+        protected override void ParseFile(TextReader stream, Beatmap beatmap)
        {
            throw new NotImplementedException();
        }
@@ -233,20 +233,8 @@ namespace osu.Game.Beatmaps.Formats
            });
        }

-        protected override Beatmap ParseFile(TextReader stream)
+        protected override void ParseFile(TextReader stream, Beatmap beatmap)
        {
-            var beatmap = new Beatmap
-            {
-                HitObjects = new List<HitObject>(),
-                ControlPoints = new List<ControlPoint>(),
-                ComboColors = new List<Color4>(),
-                BeatmapInfo = new BeatmapInfo
-                {
-                    Metadata = new BeatmapMetadata(),
-                    BaseDifficulty = new BaseDifficulty(),
-                },
-            };
-
            HitObjectParser parser = null;

            var section = Section.None;
@@ -309,8 +297,6 @@ namespace osu.Game.Beatmaps.Formats
                        break;
                }
            }
-
-            return beatmap;
        }
    }
 }
@@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps.IO
        }

        private static List<Reader> readers { get; } = new List<Reader>();
-    
+
        public static ArchiveReader GetReader(BasicStorage storage, string path)
        {
            foreach (var reader in readers)
@@ -29,20 +29,27 @@ namespace osu.Game.Beatmaps.IO
            }
            throw new IOException(@"Unknown file format");
        }
-        
+
        protected static void AddReader<T>(Func<BasicStorage, string, bool> test) where T : ArchiveReader
        {
            readers.Add(new Reader { Test = test, Type = typeof(T) });
        }
-    
+
        /// <summary>
        /// Reads the beatmap metadata from this archive.
        /// </summary>
        public abstract BeatmapMetadata ReadMetadata();
+
        /// <summary>
        /// Gets a list of beatmap file names.
        /// </summary>
-        public abstract string[] ReadBeatmaps();
+        public string[] BeatmapFilenames { get; protected set; }
+
+        /// <summary>
+        /// The storyboard filename. Null if no storyboard is present.
+        /// </summary>
+        public string StoryboardFilename { get; protected set; }
+
        /// <summary>
        /// Opens a stream for reading a specific file from this archive.
        /// </summary>
@@ -25,29 +25,25 @@ namespace osu.Game.Beatmaps.IO

        private Stream archiveStream;
        private ZipFile archive;
-        private string[] beatmaps;
        private Beatmap firstMap;
-    
+
        public OszArchiveReader(Stream archiveStream)
        {
            this.archiveStream = archiveStream;
            archive = ZipFile.Read(archiveStream);
-            beatmaps = archive.Entries.Where(e => e.FileName.EndsWith(@".osu"))
+            BeatmapFilenames = archive.Entries.Where(e => e.FileName.EndsWith(@".osu"))
                .Select(e => e.FileName).ToArray();
-            if (beatmaps.Length == 0)
+            if (BeatmapFilenames.Length == 0)
                throw new FileNotFoundException(@"This directory contains no beatmaps");
-            using (var stream = new StreamReader(GetStream(beatmaps[0])))
+            StoryboardFilename = archive.Entries.Where(e => e.FileName.EndsWith(@".osb"))
+                .Select(e => e.FileName).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)
        {
            ZipEntry entry = archive.Entries.SingleOrDefault(e => e.FileName == name);
--- a/Show More
+++ b/Show More