better patterns (still wip)

.gitattributes

@@ -1,25 +1,19 @@
-# Autodetect text files and ensure that we normalise their
-# line endings to lf internally. When checked out they may
-# use different line endings.
-* text=auto
-
-# Check out with crlf (Windows) line endings
-*.sln text eol=crlf
-*.csproj text eol=crlf
-*.cs text diff=csharp eol=crlf
-*.resx text eol=crlf
-*.vsixmanifest text eol=crlf
-packages.config text eol=crlf
-App.config text eol=crlf
-*.bat text eol=crlf
-*.cmd text eol=crlf
-*.snippet text eol=crlf
-*.manifest text eol=crlf
-*.licenseheader text eol=crlf
-
-# Check out with lf (UNIX) line endings
-*.sh text eol=lf
-.gitignore text eol=lf
-.gitattributes text eol=lf
-*.md text eol=lf
-.travis.yml text eol=lf
+# This won't normalise line endings, but it will ensure that merge drivers use CRLF
+* -text eol=crlf
+
+# Currently in-use binary file extensions
+*.blend  binary
+*.bmp    binary
+*.dll    binary
+*.exe    binary
+*.icns   binary
+*.ico    binary
+*.jpg    binary
+*.osz2   binary
+*.pdn    binary
+*.psd    binary
+*.PSD    binary
+*.tga    binary
+*.ttf    binary
+*.wav    binary
+*.xnb    binary

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: https://osu.ppy.sh/home/support

.github/ISSUE_TEMPLATE/bug-issues.md

@@ -1,11 +0,0 @@
----
-name: Bug Report
-about: Issues regarding encountered bugs.
----
-**Describe the bug:** 
-
-**Screenshots or videos showing encountered issue:** 
-
-**osu!lazer version:** 
-
-**Logs:** 

.github/ISSUE_TEMPLATE/crash-issues.md

@@ -1,13 +0,0 @@
----
-name: Crash Report
-about: Issues regarding crashes or permanent freezes.
----
-**Describe the crash:** 
-
-**Screenshots or videos showing encountered issue:** 
-
-**osu!lazer version:** 
-
-**Logs:** 
-
-**Computer Specifications:** 

.github/ISSUE_TEMPLATE/feature-request-issues.md

@@ -1,7 +0,0 @@
----
-name: Feature Request
-about: Features you would like to see in the game!
----
-**Describe the new feature:** 
-
-**Proposal designs of the feature:** 

.github/ISSUE_TEMPLATE/missing-for-live-issues.md

@@ -1,7 +0,0 @@
----
-name: Missing for Live
-about: Features which are available in osu!stable but not yet in osu!lazer.
----
-**Describe the missing feature:** 
-
-**Proposal designs of the feature:** 

.gitignore

@@ -1,272 +1,259 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-### Cake ###
-tools/**
-build/tools/**
-
-fastlane/report.xml
-
-# Build results
-bin/[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-inspectcode
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/.idea.osu/.idea/*.xml
-.idea/.idea.osu/.idea/codeStyles/*.xml
-.idea/.idea.osu/.idea/dataSources/*.xml
-.idea/.idea.osu/.idea/dictionaries/*.xml
-.idea/.idea.osu/*.iml
-*.sln.iml
-
-# CodeRush
-.cr/
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-Staging/
-
-inspectcodereport.xml
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+bin/[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+Staging/

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "osu-framework"]
+	path = osu-framework
+	url = https://github.com/ppy/osu-framework
+[submodule "osu-resources"]
+	path = osu-resources
+	url = https://github.com/ppy/osu-resources

.idea/.idea.osu/.idea/runConfigurations/RulesetTests__catch_.xml

@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="RulesetTests (catch)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Catch.Tests.dll" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
-    <browser url="http://localhost:5000" />
-    <method />
-  </configuration>
-</component>

.idea/.idea.osu/.idea/runConfigurations/RulesetTests__mania_.xml

@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="RulesetTests (mania)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Mania.Tests.dll" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
-    <browser url="http://localhost:5000" />
-    <method />
-  </configuration>
-</component>

.idea/.idea.osu/.idea/runConfigurations/RulesetTests__osu__.xml

@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="RulesetTests (osu!)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Osu.Tests.dll" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
-    <browser url="http://localhost:5000" />
-    <method />
-  </configuration>
-</component>

.idea/.idea.osu/.idea/runConfigurations/RulesetTests__taiko_.xml

@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="RulesetTests (taiko)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Taiko.Tests.dll" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
-    <browser url="http://localhost:5000" />
-    <method />
-  </configuration>
-</component>

.idea/.idea.osu/.idea/runConfigurations/VisualTests.xml

@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="VisualTests" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp2.2/osu.Game.Tests.dll" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Tests/osu.Game.Tests.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
-    <method />
-  </configuration>
-</component>

.idea/.idea.osu/.idea/runConfigurations/osu_.xml

@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp2.2/osu!.dll" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Desktop/osu.Desktop.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.2" />
-    <method v="2">
-      <option name="Build" enabled="true" />
-    </method>
-  </configuration>
-</component>

.travis.yml

@@ -1,2 +1,2 @@
-language: csharp
+language: csharp
 solution: osu.sln

.vscode/launch.json

@@ -1,87 +1,66 @@
 {
     "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "VisualTests (Debug)",
-            "type": "coreclr",
+    "configurations": [{
+            "name": "osu! VisualTests (Debug)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
             "request": "launch",
-            "program": "dotnet",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.2/osu.Game.Tests.dll"
+                "--tests"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build tests (Debug)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
-                }
-            },
+            "preLaunchTask": "Build (Debug)",
+            "runtimeExecutable": null,
+            "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "VisualTests (Release)",
-            "type": "coreclr",
+            "name": "osu! VisualTests (Release)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
             "request": "launch",
-            "program": "dotnet",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Release/osu!.exe",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.2/osu.Game.Tests.dll"
+                "--tests"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build tests (Release)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
-                }
-            },
+            "preLaunchTask": "Build (Release)",
+            "runtimeExecutable": null,
+            "env": {},
             "console": "internalConsole"
         },
         {
             "name": "osu! (Debug)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "dotnet",
-            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.2/osu!.dll"
-            ],
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build osu! (Debug)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
-                }
+            "windows": {
+                "type": "clr"
             },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "runtimeExecutable": null,
+            "env": {},
             "console": "internalConsole"
         },
         {
             "name": "osu! (Release)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "dotnet",
-            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.2/osu!.dll"
-            ],
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build osu! (Release)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.2:${env:LD_LIBRARY_PATH}"
-                }
+            "windows": {
+                "type": "clr"
             },
-            "console": "internalConsole"
-        },
-        {
-            "name": "Cake: Debug Script",
-            "type": "coreclr",
+            "type": "mono",
             "request": "launch",
-            "program": "${workspaceRoot}/build/tools/Cake.CoreCLR/0.30.0/Cake.dll",
-            "args": [
-                "${workspaceRoot}/build/build.cake",
-                "--debug",
-                "--verbosity=diagnostic"
-            ],
-            "cwd": "${workspaceRoot}/build",
-            "stopAtEntry": true,
-            "externalConsole": false
+            "program": "${workspaceRoot}/osu.Desktop/bin/Release/osu!.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
         }
     ]
-}
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+}

.vscode/tasks.json

@@ -2,78 +2,70 @@
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
     "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Build osu! (Debug)",
+    "tasks": [{
+            "label": "Build (Debug)",
             "type": "shell",
-            "command": "dotnet",
+            "command": "msbuild",
             "args": [
-                "build",
-                "--no-restore",
-                "osu.Desktop",
+                "/p:GenerateFullPaths=true",
+                "/p:DebugType=portable",
+                "/m",
+                "/v:m"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release)",
+            "type": "shell",
+            "command": "msbuild",
+            "args": [
+                "/p:Configuration=Release",
+                "/p:DebugType=portable",
                 "/p:GenerateFullPaths=true",
                 "/m",
-                "/verbosity:m"
+                "/v:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Build osu! (Release)",
+            "label": "Clean (Debug)",
             "type": "shell",
-            "command": "dotnet",
+            "command": "msbuild",
+            "args": [
+                "/p:DebugType=portable",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/t:Clean",
+                "/v:m"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Clean (Release)",
+            "type": "shell",
+            "command": "msbuild",
             "args": [
-                "build",
-                "--no-restore",
-                "osu.Desktop",
                 "/p:Configuration=Release",
                 "/p:GenerateFullPaths=true",
+                "/p:DebugType=portable",
                 "/m",
-                "/verbosity:m"
+                "/t:Clean",
+                "/v:m"
             ],
-            "group": "build",
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Build tests (Debug)",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "build",
-                "--no-restore",
-                "osu.Game.Tests",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
+            "label": "Clean All",
+            "dependsOn": [
+                "Clean (Debug)",
+                "Clean (Release)"
             ],
-            "group": "build",
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Build tests (Release)",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "build",
-                "--no-restore",
-                "osu.Game.Tests",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
-            ],
-            "group": "build",
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Restore (netcoreapp2.2)",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "restore",
-                "osu.sln"
-            ],
-            "problemMatcher": []
         }
     ]
 }

COMPILING.md

@@ -0,0 +1,36 @@
+# Linux
+### 1. Requirements:
+Mono >= 5.4.0 (>= 5.8.0 recommended)
+Please check [here](http://www.mono-project.com/download/) for stable or [here](http://www.mono-project.com/download/alpha/) for an alpha release.  
+NuGet >= 4.4.0  
+msbuild  
+git
+
+### 2. Cloning project
+Clone the entire repository with submodules using
+```
+git clone https://github.com/ppy/osu --recursive
+```
+Then restore NuGet packages from the repository
+```
+nuget restore
+```
+### 3. Compiling
+Simply run `msbuild` where `osu.sln` is located, this will create all binaries in `osu/osu.Desktop/bin/Debug`.
+### 4. Optimizing
+If you want additional performance you can change build type to Release with
+```
+msbuild -p:Configuration=Release
+```
+Additionally, mono provides an AOT utility which attempts to precompile binaries. You can utilize that by running
+```
+mono --aot ./osu\!.exe
+```
+### 5. Troubleshooting
+You may run into trouble with NuGet versioning, as the one in packaging system is almost always out of date. Simply run 
+```
+nuget
+sudo nuget update -self
+```
+**Warning** NuGet creates few config files when it's run for the first time.
+Do not run NuGet as root on the first run or you might run into very peculiar issues.

Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane"
-
-plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
-eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

@@ -1,173 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.0)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    atomos (0.1.3)
-    babosa (1.0.2)
-    claide (1.0.2)
-    colored (1.2)
-    colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    digest-crc (0.4.1)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.1)
-    emoji_regex (1.0.1)
-    excon (0.62.0)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
-      http-cookie (~> 1.0.0)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.5)
-    fastlane (2.117.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
-      babosa (>= 1.0.2, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 2.0)
-      excon (>= 0.45.0, < 1.0.0)
-      faraday (~> 0.9)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 0.9)
-      fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.24.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
-      json (< 3.0.0)
-      mini_magick (~> 4.5.1)
-      multi_json
-      multi_xml (~> 0.5)
-      multipart-post (~> 2.0.0)
-      plist (>= 3.1.0, < 4.0.0)
-      public_suffix (~> 2.0.0)
-      rubyzip (>= 1.2.2, < 2.0.0)
-      security (= 0.1.3)
-      simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
-      terminal-notifier (>= 1.6.2, < 2.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.6.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-clean_testflight_testers (0.2.0)
-    fastlane-plugin-souyuz (0.8.1)
-      souyuz (>= 0.8.1)
-    fastlane-plugin-xamarin (0.6.3)
-    gh_inspector (1.1.3)
-    google-api-client (0.23.9)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
-      httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.9)
-    google-cloud-core (1.3.0)
-      google-cloud-env (~> 1.0)
-    google-cloud-env (1.0.5)
-      faraday (~> 0.11)
-    google-cloud-storage (1.16.0)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.23)
-      google-cloud-core (~> 1.2)
-      googleauth (>= 0.6.2, < 0.10.0)
-    googleauth (0.6.7)
-      faraday (~> 0.12)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    highline (1.7.10)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
-    json (2.2.0)
-    jwt (2.1.0)
-    memoist (0.16.0)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mini_magick (4.5.1)
-    mini_portile2 (2.4.0)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nanaimo (0.2.6)
-    naturally (2.2.0)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    os (1.0.0)
-    plist (3.5.0)
-    public_suffix (2.0.5)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
-    rouge (2.0.7)
-    rubyzip (1.2.2)
-    security (0.1.3)
-    signet (0.11.0)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simctl (1.6.5)
-      CFPropertyList
-      naturally
-    slack-notifier (2.3.2)
-    souyuz (0.8.1)
-      fastlane (>= 2.29.0)
-      highline (~> 1.7)
-      nokogiri (~> 1.7)
-    terminal-notifier (1.8.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-cursor (0.6.1)
-    tty-screen (0.6.5)
-    tty-spinner (0.9.0)
-      tty-cursor (~> 0.6.0)
-    uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.4.1)
-    word_wrap (1.0.0)
-    xcodeproj (1.8.1)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
-      xcpretty (~> 0.2, >= 0.0.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fastlane
-  fastlane-plugin-clean_testflight_testers
-  fastlane-plugin-souyuz
-  fastlane-plugin-xamarin
-
-BUNDLED WITH
-   2.0.1

ISSUE_TEMPLATE.md

@@ -0,0 +1,11 @@
+osu!lazer is currently still under heavy development!
+
+Please ensure that you are making an issue for one of the following:
+
+- A bug with currently implemented features (not features that don't exist)
+- A feature you are considering adding, so we can collaborate on feedback and design.
+- Discussions about technical design decisions
+
+If your issue qualifies, replace this text with a detailed description of your issue with as much relevant information as you can provide.
+
+Screenshots and log files are highly welcomed.

LICENCE

@@ -1,4 +1,4 @@
-Copyright (c) 2019 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2018 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

README.md

@@ -1,94 +1,20 @@
-# osu!
+# osu! [![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu)  [![CodeFactor](https://www.codefactor.io/repository/github/ppy/osu/badge)](https://www.codefactor.io/repository/github/ppy/osu) [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
 
-[![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu)  [![CodeFactor](https://www.codefactor.io/repository/github/ppy/osu/badge)](https://www.codefactor.io/repository/github/ppy/osu) [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
+Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the beginning of an open era!
 
-Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Commonly known by the codename "osu!lazer". Pew pew.
+# Status
 
-## Status
+This is still heavily under development and is not intended for end-user use. This repository is intended for developer collaboration. You're welcome to try and use it but please do not submit bug reports without a patch. Please do not ask for help building or using this software.
 
-This project is still heavily under development, but is in a state where users are encouraged to try it out and keep it installed alongside the stable osu! client. It will continue to evolve over the coming months and hopefully bring some new unique features to the table.
+# Requirements
 
-We are accepting bug reports (please report with as much detail as possible). Feature requests are welcome as long as you read and understand the contribution guidelines listed below.
+- A desktop platform that can compile .NET 4.6.1. We recommend using [Visual Studio Community Edition](https://www.visualstudio.com/) (Windows), [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) (macOS) or [MonoDevelop](http://www.monodevelop.com/download/) (Linux), all of which are free. [Visual Studio Code](https://code.visualstudio.com/) may also be used but requires further setup steps which are not covered here.
 
-Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh/home/changelog).
+# Getting Started
+- Clone the repository including submodules (`git clone --recurse-submodules https://github.com/ppy/osu`)
+- Build in your IDE of choice (recommended IDEs automatically restore nuget packages; if you are using an alternative make sure to `nuget restore`)
 
-## Requirements
-
-- A desktop platform with the [.NET Core SDK 2.2](https://www.microsoft.com/net/learn/get-started) or higher installed.
-- When working with the codebase, we recommend using an IDE with intellisense and syntax highlighting, such as [Visual Studio 2017+](https://visualstudio.microsoft.com/vs/), [Jetbrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
-- Note that there are **[additional requirements for Windows 7 and Windows 8.1](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore2x)** which you may need to manually install if your operating system is not up-to-date.
-
-## Running osu!
-
-### Releases
-
-![](https://puu.sh/DCmvA/f6a74f5fbb.png)
-
-If you are not interested in developing the game, you can consume our [binary releases](https://github.com/ppy/osu/releases).
-
-**Latest build:***
-
-| [Windows (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe)  | [macOS 10.12+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) |
-| ------------- | ------------- |
-
-- **Linux** users are recommended to self-compile until we have official deployment in place.
-- **iOS** users can join the [TestFlight beta program](https://t.co/PasE1zrHhw) (note that due to high demand this is regularly full).
-- **Android** users can self-compile, and expect a public beta soon.
-
-If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
-
-### Downloading the source code
-
-Clone the repository:
-
-```shell
-git clone https://github.com/ppy/osu
-cd osu
-```
-
-To update the source code to the latest commit, run the following command inside the `osu` directory:
-
-```shell
-git pull
-```
-
-### Building
-
-Build configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this provided [below](#contributing).
-
-> Visual Studio Code users must run the `Restore` task before any build attempt.
-
-You can also build and run osu! from the command-line with a single command:
-
-```shell
-dotnet run --project osu.Desktop
-```
-
-If you are not interested in debugging osu!, you can add `-c Release` to gain performance. In this case, you must replace `Debug` with `Release` in any commands mentioned in this document.
-
-If the build fails, try to restore nuget packages with `dotnet restore`.
-
-#### A note for Linux users
-
-On Linux, the environment variable `LD_LIBRARY_PATH` must point to the build directory, located at `osu.Desktop/bin/Debug/$NETCORE_VERSION`.
-
-`$NETCORE_VERSION` is the version of .NET Core SDK. You can have it with `grep TargetFramework osu.Desktop/osu.Desktop.csproj | sed -r 's/.*>(.*)<\/.*/\1/'`.
-
-For example, you can run osu! with the following command:
-
-```shell
-LD_LIBRARY_PATH="$(pwd)/osu.Desktop/bin/Debug/netcoreapp2.2" dotnet run --project osu.Desktop
-```
-
-### Testing with resource/framework modifications
-
-Sometimes it may be necessary to cross-test changes in [osu-resources](https://github.com/ppy/osu-resources) or [osu-framework](https://github.com/ppy/osu-framework). This can be achieved by running some commands as documented on the [osu-resources](https://github.com/ppy/osu-resources/wiki/Testing-local-resources-checkout-with-other-projects) and [osu-framework](https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects) wiki pages.
-
-### Code analysis
-
-Code analysis can be run with `powershell ./build.ps1` or `build.sh`. This is currently only supported under windows due to [resharper cli shortcomings](https://youtrack.jetbrains.com/issue/RSRP-410004). Alternatively, you can install resharper or use rider to get inline support in your IDE of choice.
-
-## Contributing
+# Contributing
 
 We welcome all contributions, but keep in mind that we already have a lot of the UI designed. If you wish to work on something with the intention on having it included in the official distribution, please open an issue for discussion and we will give you what you need from a design perspective to proceed. If you want to make *changes* to the design, we recommend you open an issue with your intentions before spending too much time, to ensure no effort is wasted.
 
@@ -98,7 +24,7 @@ Contributions can be made via pull requests to this repository. We hope to credi
 
 Note that while we already have certain standards in place, nothing is set in stone. If you have an issue with the way code is structured; with any libraries we are using; with any processes involved with contributing, *please* bring it up. I welcome all feedback so we can make contributing to this project as pain-free as possible.
 
-## Licence
+# Licence
 
 The osu! client code and framework are licensed under the [MIT licence](https://opensource.org/licenses/MIT). Please see [the licence file](LICENCE) for more information. [tl;dr](https://tldrlegal.com/license/mit-license) you can do whatever you want as long as you include the original copyright and license notice in any copy of the software/source.
 

Symcol.Core/GameObjects/SymcolHitbox.cs

@@ -0,0 +1,80 @@
+using osu.Framework.Graphics;
+using OpenTK;
+using Symcol.Core.Graphics.Containers;
+
+namespace Symcol.Core.GameObjects
+{
+    public class SymcolHitbox : SymcolContainer
+    {
+        /// <summary>
+        /// whether we want to do hit detection
+        /// </summary>
+        public int Team { get; set; }
+
+        /// <summary>
+        /// whether we want to do hit detection
+        /// </summary>
+        public bool HitDetection { get; set; } = true;
+
+        /// <summary>
+        /// the shape of this object (used for hit detection)
+        /// </summary>
+        public Shape Shape { get; }
+
+        public SymcolHitbox(Vector2 size, Shape shape = Shape.Circle)
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Shape = shape;
+            Size = size;
+
+            if (Shape == Shape.Circle)
+                Child = new SymcolContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    CornerRadius = Width / 2
+                };
+            else if (Shape == Shape.Rectangle)
+                Child = new SymcolContainer
+                {
+                    RelativeSizeAxes = Axes.Both
+                };
+        }
+
+        public bool HitDetect(SymcolHitbox hitbox1, SymcolHitbox hitbox2)
+        {
+            if (hitbox1.HitDetection && hitbox2.HitDetection && hitbox1.Team != hitbox2.Team)
+            {
+                if (hitbox1.Shape == Shape.Circle && hitbox2.Shape == Shape.Circle)
+                {
+                    if (hitbox1.ScreenSpaceDrawQuad.AABB.IntersectsWith(hitbox2.ScreenSpaceDrawQuad.AABB))
+                        return true;
+                }
+                else if (hitbox1.Shape == Shape.Circle && hitbox2.Shape == Shape.Rectangle || hitbox1.Shape == Shape.Rectangle && hitbox2.Shape == Shape.Circle)
+                {
+                    if (hitbox1.ScreenSpaceDrawQuad.AABB.IntersectsWith(hitbox2.ScreenSpaceDrawQuad.AABB))
+                        return true;
+                }
+                else if (hitbox1.Shape == Shape.Rectangle && hitbox2.Shape == Shape.Rectangle)
+                {
+                    if (hitbox1.ScreenSpaceDrawQuad.AABB.IntersectsWith(hitbox2.ScreenSpaceDrawQuad.AABB))
+                        return true;
+                }
+                else if (hitbox1.Shape == Shape.Complex || hitbox2.Shape == Shape.Complex)
+                    foreach (SymcolContainer child1 in hitbox1.Children)
+                        foreach (SymcolContainer child2 in hitbox2.Children)
+                            if (child1.ScreenSpaceDrawQuad.AABB.IntersectsWith(child2.ScreenSpaceDrawQuad.AABB))
+                                return true;
+            }
+            return false;
+        }
+    }
+
+    public enum Shape
+    {
+        Circle,
+        Rectangle,
+        Complex
+    }
+}

Symcol.Core/Graphics/Containers/SymcolClickableContainer.cs

@@ -0,0 +1,12 @@
+using osu.Framework.Graphics.Containers;
+
+namespace Symcol.Core.Graphics.Containers
+{
+    /// <summary>
+    /// Will support base eden game functions (if we come up with any)
+    /// </summary>
+    public class SymcolClickableContainer : ClickableContainer
+    {
+
+    }
+}

Symcol.Core/Graphics/Containers/SymcolContainer.cs

@@ -0,0 +1,12 @@
+using osu.Framework.Graphics.Containers;
+
+namespace Symcol.Core.Graphics.Containers
+{
+    /// <summary>
+    /// Will support base eden game functions (if we come up with any)
+    /// </summary>
+    public class SymcolContainer : Container
+    {
+
+    }
+}

Symcol.Core/Graphics/Containers/SymcolDialContainer.cs

@@ -0,0 +1,58 @@
+using OpenTK;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using System;
+
+namespace Symcol.Core.Graphics.Containers
+{
+    public class SymcolDialContainer : CircularContainer
+    {
+        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
+
+        private Vector2 mousePosition;
+
+        private float lastAngle;
+        private float currentRotation;
+        public float RotationAbsolute;
+
+        private int completeTick;
+
+        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 360));
+
+        private bool rotationTransferred;
+
+        protected override bool OnMouseMove(InputState state)
+        {
+            mousePosition = Parent.ToLocalSpace(state.Mouse.NativeState.Position);
+            return base.OnMouseMove(state);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            var thisAngle = -(float)MathHelper.RadiansToDegrees(Math.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
+
+
+            if (!rotationTransferred)
+            {
+                currentRotation = Rotation * 2;
+                rotationTransferred = true;
+            }
+
+            if (thisAngle - lastAngle > 180)
+                lastAngle += 360;
+            else if (lastAngle - thisAngle > 180)
+                lastAngle -= 360;
+
+            currentRotation += thisAngle - lastAngle;
+            RotationAbsolute += Math.Abs(thisAngle - lastAngle);
+
+            lastAngle = thisAngle;
+
+            foreach(Drawable drawable in Children)
+                drawable.RotateTo(currentRotation / 2, 200, Easing.OutExpo);
+        }
+    }
+}

Symcol.Core/Graphics/Containers/SymcolDragContainer.cs

@@ -0,0 +1,43 @@
+using osu.Framework.Input;
+using OpenTK;
+using OpenTK.Input;
+
+namespace Symcol.Core.Graphics.Containers
+{
+    public class SymcolDragContainer : SymcolContainer
+    {
+        protected override bool OnDragStart(InputState state) => true;
+
+        public bool AllowLeftClickDrag { get; set; } = true;
+
+        private bool drag;
+
+        private Vector2 startPosition;
+
+        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+        {
+            startPosition = Position;
+
+            if (args.Button == MouseButton.Left && AllowLeftClickDrag || args.Button == MouseButton.Right)
+                drag = true;
+
+            return base.OnMouseDown(state, args);
+        }
+
+        protected override bool OnDrag(InputState state)
+        {
+            if (drag)
+                Position = startPosition + state.Mouse.Position - state.Mouse.PositionMouseDown.GetValueOrDefault();
+
+            return base.OnDrag(state);
+        }
+
+        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+        {
+            if (args.Button == MouseButton.Left && AllowLeftClickDrag || args.Button == MouseButton.Right)
+                drag = false;
+
+            return base.OnMouseUp(state, args);
+        }
+    }
+}

Symcol.Core/Graphics/UserInterface/SpriteButton.cs

@@ -0,0 +1,80 @@
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input;
+using Symcol.Core.Graphics.Containers;
+
+namespace Symcol.Core.Graphics.UserInterface
+{
+    /// <summary>
+    /// just a Button with a sprite
+    /// </summary>
+    public class SpriteButton : SymcolClickableContainer
+    {
+        private readonly string textureName;
+
+        public string Text
+        {
+            get { return spriteText?.Text; }
+            set
+            {
+                if (spriteText != null)
+                    spriteText.Text = value;
+            }
+        }
+
+        private readonly Sprite sprite;
+        private readonly SpriteText spriteText;
+
+        public SpriteButton(string textureName)
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            this.textureName = textureName;
+            Masking = true;
+
+            Children = new Drawable[]
+            {
+                sprite = new Sprite
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fill
+                },
+                spriteText = new SpriteText
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            sprite.Texture = textures.Get(textureName);
+        }
+
+        protected override bool OnClick(InputState state)
+        {
+            if (Enabled.Value)
+            {
+                var flash = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.5f
+                };
+
+                Add(flash);
+
+                flash.Blending = BlendingMode.Additive;
+                flash.FadeOut(200);
+                flash.Expire();
+            }
+
+            return base.OnClick(state);
+        }
+    }
+}

Symcol.Core/Graphics/UserInterface/SymcolWindow.cs

@@ -0,0 +1,158 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Input;
+using Symcol.Core.Graphics.Containers;
+
+namespace Symcol.Core.Graphics.UserInterface
+{
+    public class SymcolWindow : SymcolContainer
+    {
+        /// <summary>
+        /// Put all your stuff in this
+        /// </summary>
+        public SymcolContainer WindowContent { get; set; }
+        public SpriteText WindowTitle;
+
+        private readonly SymcolContainer topBar;
+        private readonly SymcolClickableContainer minimize;
+
+        public SymcolWindow(Vector2 size)
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            CornerRadius = 6;
+            Masking = true;
+            AutoSizeAxes = Axes.Both;
+
+            Children = new Drawable[]
+            {
+                topBar = new SymcolContainer
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Height = 20,
+                    Width = size.X,
+
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.Black,
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0.5f
+                        },
+                        WindowTitle = new SpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            TextSize = 18
+                        },
+                        new SymcolClickableContainer
+                        {
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            RelativeSizeAxes = Axes.Y,
+                            Width = 30,
+                            Action = Close,
+
+                            Child = new Box
+                            {
+                                Colour = Color4.Red,
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0.5f
+                            }
+                        },
+                        minimize = new SymcolClickableContainer
+                        {
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            RelativeSizeAxes = Axes.Y,
+                            Width = 30,
+                            Position = new Vector2(-30, 0),
+                            Action = Minimize,
+
+                            Child = new Box
+                            {
+                                Colour = Color4.White,
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0.5f
+                            }
+                        }
+                    }
+                },
+                WindowContent = new SymcolContainer
+                {
+                    Size = size,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre
+                }
+            };
+
+            WindowContent.Position = new Vector2(0, topBar.Height);
+        }
+
+        protected void Close()
+        {
+            this.FadeOut(200);
+        }
+
+        protected void Open()
+        {
+            this.FadeIn(200);
+        }
+
+        public void Toggle()
+        {
+            if (Alpha > 0)
+                this.FadeOut(200);
+            else
+                this.FadeIn(200);
+        }
+
+        protected override bool OnDragStart(InputState state) => true;
+
+        private bool drag;
+
+        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+        {
+            if (args.Button == MouseButton.Left)
+                drag = true;
+
+            return base.OnMouseDown(state, args);
+        }
+
+        protected override bool OnDrag(InputState state)
+        {
+            if (drag)
+                Position += state.Mouse.Delta;
+
+            return base.OnDrag(state);
+        }
+
+        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+        {
+            if (args.Button == MouseButton.Left)
+                drag = false;
+
+            return base.OnMouseUp(state, args);
+        }
+
+        public void Maximize()
+        {
+            WindowContent.FadeIn(200);
+            WindowContent.ScaleTo(Vector2.One, 200);
+            minimize.Action = Minimize;
+        }
+
+        public void Minimize()
+        {
+            WindowContent.FadeOut(200);
+            WindowContent.ScaleTo(new Vector2(1, 0), 200);
+            minimize.Action = Maximize;
+        }
+    }
+}

Symcol.Core/Networking/BasicPacket.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+
+namespace Symcol.Core.Networking
+{
+    [Serializable]
+    public class BasicPacket : Packet
+    {
+        /// <summary>
+        /// Ask host if we can connect
+        /// </summary>
+        public bool Connect;
+
+        /// <summary>
+        /// Tell the host we are breaking up
+        /// </summary>
+        public bool Disconnect;
+
+        /// <summary>
+        /// Testing Connection
+        /// </summary>
+        public bool Test;
+
+        /// <summary>
+        /// Send a force exit to others
+        /// </summary>
+        public bool Abort;
+
+        /// <summary>
+        /// PreLoad the game
+        /// </summary>
+        public bool LoadGame;
+
+        /// <summary>
+        /// Request a list of all players from Host
+        /// </summary>
+        public bool RequestPlayerList;
+
+        /// <summary>
+        /// List of players in this match that we should account for
+        /// </summary>
+        public List<ClientInfo> PlayerList = new List<ClientInfo>();
+
+        /// <summary>
+        /// Tell Host we are PreLoaded
+        /// </summary>
+        public bool Loaded;
+
+        /// <summary>
+        /// Start the game already!
+        /// </summary>
+        public bool StartGame;
+
+        /// <summary>
+        /// Send to host when game started
+        /// </summary>
+        public bool GameStarted;
+
+        public BasicPacket(ClientInfo clientInfo) : base(clientInfo)
+        {
+        }
+    }
+}

Symcol.Core/Networking/ClientInfo.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace Symcol.Core.Networking
+{
+    /// <summary>
+    /// Just a client signature basically
+    /// </summary>
+    [Serializable]
+    public class ClientInfo
+    {
+        public string IP;
+
+        public int Port;
+
+        public int Ping;
+
+        public int ConncetionTryCount;
+
+        public double LastConnectionTime;
+
+        public double StartedTestConnectionTime;
+    }
+}

Symcol.Core/Networking/NetworkingClient.cs

@@ -0,0 +1,119 @@
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Runtime.Serialization.Formatters.Binary;
+
+namespace Symcol.Core.Networking
+{
+    public class NetworkingClient
+    {
+        public UdpClient UdpClient;
+
+        public IPEndPoint EndPoint;
+
+        /// <summary>
+        /// if false we only receive
+        /// </summary>
+        public readonly bool Send;
+
+        public readonly int Port;
+
+        public readonly string IP;
+
+        public NetworkingClient(bool send, string ip, int port = 25570)
+        {
+            Port = port;
+            IP = ip;
+
+            if (send)
+                initializeSend();
+            else
+                initializeReceive();
+        }
+
+        private void initializeSend()
+        {
+            UdpClient = new UdpClient(IP, Port);
+        }
+
+        private void initializeReceive()
+        {
+            UdpClient = new UdpClient(Port);
+            EndPoint = new IPEndPoint(IPAddress.Any, Port);
+        }
+
+        private void sendByte(byte[] data)
+        {
+            UdpClient.Send(data, data.Length);
+        }
+
+        private byte[] receiveByte()
+        {
+            return UdpClient.Receive(ref EndPoint);
+        }
+
+        public static int SENTPACKETCOUNT;
+
+        /// <summary>
+        /// Send a Packet somewhere
+        /// </summary>
+        /// <param name="packet"></param>
+        public void SendPacket(Packet packet)
+        {
+            SENTPACKETCOUNT++;
+            using (MemoryStream stream = new MemoryStream())
+            {
+                BinaryFormatter formatter = new BinaryFormatter();
+                formatter.Serialize(stream, packet);
+
+                stream.Position = 0;
+
+                int i = packet.PacketSize;
+                retry:
+                byte[] data = new byte[i];
+
+                try
+                {
+                    stream.Read(data, 0, (int)stream.Length);
+                }
+                catch
+                {
+                    i *= 2;
+                    goto retry;
+                }
+
+                sendByte(data);
+            }
+        }
+
+        /// <summary>
+        /// Receive a Packet from somewhere
+        /// </summary>
+        /// <returns></returns>
+        public Packet ReceivePacket(bool force = false)
+        {
+            if (UdpClient.Available > 0 || force)
+                using (MemoryStream stream = new MemoryStream())
+                {
+                    byte[] data = receiveByte();
+                    stream.Write(data, 0, data.Length);
+
+                    stream.Position = 0;
+
+                    BinaryFormatter formatter = new BinaryFormatter();
+                    Packet packet = (Packet)formatter.Deserialize(stream);
+                    packet.ClientInfo.IP = EndPoint.Address.ToString();
+
+                    return packet;
+                }
+            else
+                return null;
+        }
+
+        public void Clear()
+        {
+            if (UdpClient != null)
+                UdpClient.Dispose();
+        }
+    }
+}

Symcol.Core/Networking/NetworkingClientHandler.cs

@@ -0,0 +1,646 @@
+#define SoloTesting
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
+using System;
+using System.Collections.Generic;
+
+namespace Symcol.Core.Networking
+{
+    //TODO: This NEEDS its own clock to avoid fuckery later on with DoubleTime and HalfTime
+    public class NetworkingClientHandler : Container
+    {
+        //30 Seconds by default
+        protected virtual double TimeOutTime => 30000;
+
+        protected readonly NetworkingClient ReceiveClient;
+
+        protected readonly NetworkingClient SendClient;
+
+        /// <summary>
+        /// Just a client signature basically
+        /// </summary>
+        public ClientInfo ClientInfo;
+
+        /// <summary>
+        /// All Connecting clients
+        /// </summary>
+        public readonly List<ClientInfo> ConnectingClients = new List<ClientInfo>();
+
+        /// <summary>
+        /// All Connected clients
+        /// </summary>
+        public readonly List<ClientInfo> ConncetedClients = new List<ClientInfo>();
+
+        /// <summary>
+        /// Clients waiting in our match
+        /// </summary>
+        public readonly List<ClientInfo> InMatchClients = new List<ClientInfo>();
+
+        /// <summary>
+        /// Clients loaded and ready to start
+        /// </summary>
+        public readonly List<ClientInfo> LoadedClients = new List<ClientInfo>();
+
+        /// <summary>
+        /// Clients ingame playing
+        /// </summary>
+        public readonly List<ClientInfo> InGameClients = new List<ClientInfo>();
+
+        /// <summary>
+        /// Gets hit when we get a Packet
+        /// </summary>
+        public Action<Packet> OnPacketReceive;
+
+        /// <summary>
+        /// (Peer) Call this when we connect to a Host (Includes list of connected peers + Host)
+        /// </summary>
+        public Action<List<ClientInfo>> OnConnectedToHost;
+
+        /// <summary>
+        /// (Host) Whenever a new client Connects
+        /// </summary>
+        public Action<ClientInfo> OnClientConnect;
+
+        /// <summary>
+        /// (Host) Whenever a new client Disconnects
+        /// </summary>
+        public Action<ClientInfo> OnClientDisconnect;
+
+        /// <summary>
+        /// (Host/Peer) When a new Client joins the game
+        /// </summary>
+        public Action<ClientInfo> OnClientJoin;
+
+        /// <summary>
+        /// Receive a full player list
+        /// </summary>
+        public Action<List<ClientInfo>> OnReceivePlayerList;
+
+        /// <summary>
+        /// if we are connected and in a match
+        /// </summary>
+        public bool InMatch;
+
+        /// <summary>
+        /// Are we in a game
+        /// </summary>
+        public bool InGame;
+
+        /// <summary>
+        /// Are we loaded and ready to start?
+        /// </summary>
+        public bool Loaded;
+
+        /// <summary>
+        /// Called to leave an in-progress game
+        /// </summary>
+        public Action OnAbort;
+
+        /// <summary>
+        /// Called to load the game (Includes Host)
+        /// </summary>
+        public Action<List<ClientInfo>> OnLoadGame;
+
+        /// <summary>
+        /// Called to start the game once loaded
+        /// </summary>
+        public Action StartGame;
+
+        public readonly ClientType ClientType;
+
+        public NetworkingClientHandler(ClientType type, string ip, int port = 25570, string thisLocalIp = "0.0.0.0")
+        {
+            AlwaysPresent = true;
+
+            ClientType = type;
+
+            switch (type)
+            {
+                case ClientType.Host:
+                    ReceiveClient = new NetworkingClient(false, ip, port);
+                    break;
+                case ClientType.Peer:
+                    ReceiveClient = new NetworkingClient(false, thisLocalIp, port);
+                    SendClient = new NetworkingClient(true, ip, port);
+                    break;
+                case ClientType.Server:
+                    throw new NotImplementedException();
+            }
+
+            Logger.Log("Created a RulesetNetworkingClientHandler", LoggingTarget.Network, LogLevel.Verbose);
+
+            if (ClientInfo == null)
+                ClientInfo = new ClientInfo
+                {
+                    Port = port
+                };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (ClientType == ClientType.Peer)
+                ConnectToHost();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            PacketRestart:
+            Packet p = null;
+
+            if (ReceiveClient.UdpClient.Available > 0)
+                p = ReceiveClient.ReceivePacket();
+
+            if (p is BasicPacket packet)
+            {
+                //Hosts
+                if (SendClient == null)
+                {
+                    if (packet.Disconnect)
+                    {
+                        OnClientDisconnect?.Invoke(packet.ClientInfo);
+                        foreach (ClientInfo client in ConnectingClients)
+                            if (client.IP == packet.ClientInfo.IP)
+                            {
+                                ConnectingClients.Remove(client);
+                                Logger.Log("A Connecting Client has Disconnected", LoggingTarget.Network, LogLevel.Verbose);
+                                break;
+                            }
+                        foreach (ClientInfo client in ConncetedClients)
+                            if (client.IP == packet.ClientInfo.IP)
+                            {
+                                ConncetedClients.Remove(client);
+                                Logger.Log("A Client has Disconnected", LoggingTarget.Network, LogLevel.Verbose);
+                                break;
+                            }
+                        foreach (ClientInfo client in InMatchClients)
+                            if (client.IP == packet.ClientInfo.IP)
+                            {
+                                InMatchClients.Remove(client);
+                                break;
+                            }
+                        foreach (ClientInfo client in LoadedClients)
+                            if (client.IP == packet.ClientInfo.IP)
+                            {
+                                LoadedClients.Remove(client);
+                                break;
+                            }
+                        foreach (ClientInfo client in InGameClients)
+                            if (client.IP == packet.ClientInfo.IP)
+                            {
+                                InGameClients.Remove(client);
+                                break;
+                            }
+                    }
+
+                    if (packet.Connect)
+                    {
+                        packet.ClientInfo.StartedTestConnectionTime = Time.Current;
+                        ConnectingClients.Add(packet.ClientInfo);
+
+                        NetworkingClient client = new NetworkingClient(true, packet.ClientInfo.IP, packet.ClientInfo.Port);
+
+                        List<ClientInfo> playerList = new List<ClientInfo>
+                        {
+                            ClientInfo
+                        };
+
+                        foreach (ClientInfo clientInfo in ConncetedClients)
+                            playerList.Add(clientInfo);
+
+                        client.SendPacket(new BasicPacket(ClientInfo)
+                        {
+                            PlayerList = playerList,
+                            Connect = true
+                        });
+
+                        Logger.Log("A Client is Connecting. . .", LoggingTarget.Network, LogLevel.Verbose);
+                    }
+
+                    if (packet.RequestPlayerList)
+                    {
+                        NetworkingClient client = new NetworkingClient(true, packet.ClientInfo.IP, packet.ClientInfo.Port);
+
+                        List<ClientInfo> playerList = new List<ClientInfo>
+                        {
+                            ClientInfo
+                        };
+
+                        foreach (ClientInfo clientInfo in ConncetedClients)
+                            playerList.Add(clientInfo);
+
+                        client.SendPacket(new BasicPacket(ClientInfo)
+                        {
+                            PlayerList = playerList,
+                            RequestPlayerList = true
+                        });
+
+                        Logger.Log("A Client is Connecting. . .", LoggingTarget.Network, LogLevel.Verbose);
+                    }
+
+                    if (packet.Loaded)
+                        foreach (ClientInfo client in InMatchClients)
+                            if (client.IP == packet.ClientInfo.IP)
+                            {
+                                Logger.Log("A Client has Loaded and is ready to start", LoggingTarget.Network, LogLevel.Verbose);
+                                InMatchClients.Remove(client);
+                                LoadedClients.Add(client);
+                                break;
+                            }
+
+                    if (packet.GameStarted)
+                        foreach (ClientInfo client in LoadedClients)
+                            if (client.IP == packet.ClientInfo.IP)
+                            {
+                                Logger.Log("A Client has started!", LoggingTarget.Network, LogLevel.Verbose);
+                                LoadedClients.Remove(client);
+                                InGameClients.Add(client);
+                                break;
+                            }
+
+                    if (packet.Test)
+                    {
+                        foreach (ClientInfo client in ConnectingClients)
+                            if (client.IP == packet.ClientInfo.IP)
+                            {
+                                client.Ping = (int)Time.Current - (int)client.StartedTestConnectionTime;
+                                ConnectingClients.Remove(client);
+                                ConncetedClients.Add(client);
+                                InMatchClients.Add(client);
+                                OnClientJoin?.Invoke(client);
+                                client.LastConnectionTime = Time.Current;
+                                client.ConncetionTryCount = 0;
+                                Logger.Log("Successfully connected to a Client! Ping: " + client.Ping, LoggingTarget.Network, LogLevel.Verbose);
+                                break;
+                            }
+                        foreach (ClientInfo client in ConncetedClients)
+                            if (client.IP == packet.ClientInfo.IP)
+                            {
+                                client.Ping = (int)Time.Current - (int)client.StartedTestConnectionTime;
+                                client.LastConnectionTime = Time.Current;
+                                client.ConncetionTryCount = 0;
+                                Logger.Log("Successfully maintained connection to a Client! Ping: " + client.Ping, LoggingTarget.Network, LogLevel.Verbose);
+                            }
+                    }
+                }
+
+#if !SoloTesting
+                if (InMatchClients.Count == 0 && LoadedClients.Count > 0 && Loaded && !InGame)
+                    SendStartGame();
+#endif
+
+                //Peers
+                else if (SendClient != null)
+                {
+                    if (packet.Connect)
+                    {
+                        if (!InGame && !InMatch)
+                        {
+                            InMatch = true;
+                            OnConnectedToHost?.Invoke(packet.PlayerList);
+                        }
+                        Logger.Log("Connected to Host!", LoggingTarget.Network, LogLevel.Verbose);
+                    }
+
+                    if (packet.Test)
+                    {
+                        SendToHost(new BasicPacket(ClientInfo) { Test = true });
+                        Logger.Log("Received connection test info from host, returning. . .", LoggingTarget.Network, LogLevel.Verbose);
+                    }
+
+                    if (packet.RequestPlayerList)
+                        OnReceivePlayerList?.Invoke(packet.PlayerList);
+
+                    if (packet.StartGame)
+                    {
+                        StartGame?.Invoke();
+                        SendToHost(new BasicPacket(ClientInfo) { GameStarted = true });
+                        InGame = true;
+                    }
+
+                    if (packet.Abort)
+                    {
+                        OnAbort?.Invoke();
+                        InGame = false;
+                        Loaded = false;
+                    }
+
+                    if (packet.LoadGame)
+                    {
+                        Logger.Log("Received instructions to LoadGame for " + packet.PlayerList.Count + " players", LoggingTarget.Network, LogLevel.Verbose);
+                        OnLoadGame?.Invoke(packet.PlayerList);
+                    }
+                }
+            }
+
+#if SoloTesting
+            if (Loaded && !InGame)
+                SendStartGame();
+#endif
+
+            if (p != null)
+                OnPacketReceive?.Invoke(p);
+
+            if (ReceiveClient.UdpClient.Available > 0)
+                goto PacketRestart;
+
+            foreach (ClientInfo client in ConnectingClients)
+            {
+                if (client.LastConnectionTime + TimeOutTime / 10 <= Time.Current && client.ConncetionTryCount == 0)
+                {
+                    client.StartedTestConnectionTime = Time.Current;
+                    TestConnection(client);
+                }
+
+                if (client.LastConnectionTime + TimeOutTime / 6 <= Time.Current && client.ConncetionTryCount == 1)
+                    TestConnection(client);
+
+                if (client.LastConnectionTime + TimeOutTime / 3 <= Time.Current && client.ConncetionTryCount == 2)
+                    TestConnection(client);
+
+                if (client.StartedTestConnectionTime + TimeOutTime <= Time.Current)
+                {
+                    ConnectingClients.Remove(client);
+                    Logger.Log("Connection to a connecting client lost! - " + client.IP + ":" + client.Port, LoggingTarget.Network, LogLevel.Error);
+                    break;
+                }
+            }
+
+            foreach (ClientInfo client in ConncetedClients)
+            {
+                if (client.LastConnectionTime + TimeOutTime / 6 <= Time.Current && client.ConncetionTryCount == 0)
+                {
+                    client.StartedTestConnectionTime = Time.Current;
+                    TestConnection(client);
+                }
+
+                if (client.LastConnectionTime + TimeOutTime / 3 <= Time.Current && client.ConncetionTryCount == 1)
+                    TestConnection(client);
+
+                if (client.LastConnectionTime + TimeOutTime / 2 <= Time.Current && client.ConncetionTryCount == 2)
+                    TestConnection(client);
+
+                if (client.StartedTestConnectionTime + TimeOutTime <= Time.Current)
+                {
+                    ConncetedClients.Remove(client);
+                    InGameClients.Remove(client);
+                    LoadedClients.Remove(client);
+                    InGameClients.Remove(client);
+                    Logger.Log("Connection to a connected client lost! - " + client.IP + ":" + client.Port, LoggingTarget.Network, LogLevel.Error);
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Poke!
+        /// </summary>
+        /// <param name="clientInfo"></param>
+        protected void TestConnection(ClientInfo clientInfo)
+        {
+            clientInfo.ConncetionTryCount++;
+            NetworkingClient client = new NetworkingClient(true, clientInfo.IP, clientInfo.Port);
+            client.SendPacket(new BasicPacket(ClientInfo) { Test = true });
+            Logger.Log("Testing a client's connection - " + clientInfo.IP + ":" + clientInfo.Port, LoggingTarget.Network, LogLevel.Verbose);
+        }
+
+        public void RequestPlayerList()
+        {
+            BasicPacket packet = new BasicPacket(ClientInfo) { RequestPlayerList = true };
+            SendToHost(packet);
+        }
+
+        /// <summary>
+        /// Tell peers to start loading game
+        /// </summary>
+        public virtual void StartLoadingGame()
+        {
+            if (SendClient == null)
+            {
+                BasicPacket packet = new BasicPacket(ClientInfo) { LoadGame = true };
+
+                foreach (ClientInfo client in InMatchClients)
+                    packet.PlayerList.Add(client);
+                packet.PlayerList.Add(ClientInfo);
+
+                SendToInMatchClients(packet);
+
+                OnLoadGame?.Invoke(packet.PlayerList);
+            }
+            else
+                Logger.Log("Called StartLoadingGame - We are not the Host!", LoggingTarget.Network, LogLevel.Verbose);
+        }
+
+        /// <summary>
+        /// Call this when the game is Loaded and ready to be started
+        /// </summary>
+        public virtual void GameLoaded()
+        {
+            Loaded = true;
+            SendToHost(new BasicPacket(ClientInfo) { Loaded = true });
+        }
+
+        /// <summary>
+        /// Connects to the Host
+        /// </summary>
+        public virtual void ConnectToHost()
+        {
+            SendToHost(new BasicPacket(ClientInfo) { Connect = true });
+            Logger.Log("Attempting conection to Host. . .", LoggingTarget.Network, LogLevel.Verbose);
+        }
+
+        /// <summary>
+        /// Tell peers to start and starts ours
+        /// </summary>
+        public virtual void SendStartGame()
+        {
+            if (SendClient == null)
+            {
+                SendToLoadedClients(new BasicPacket(ClientInfo) { StartGame = true });
+                InGame = true;
+                Logger.Log("Sending Start Game", LoggingTarget.Network, LogLevel.Verbose);
+            }
+            StartGame?.Invoke();
+        }
+
+        /// <summary>
+        /// Send a Packet to the Host
+        /// </summary>
+        /// <param name="packet"></param>
+        public void SendToHost(Packet packet)
+        {
+            if (SendClient != null)
+                SendClient.SendPacket(packet);
+        }
+
+        /// <summary>
+        /// Send a Packet to all Connecting clients
+        /// </summary>
+        /// <param name="packet"></param>
+        public void SendToConnectingClients(Packet packet)
+        {
+            if (SendClient == null)
+                foreach (ClientInfo clientInfo in ConnectingClients)
+                {
+                    NetworkingClient client = new NetworkingClient(true, clientInfo.IP, clientInfo.Port);
+                    client.SendPacket(packet);
+                }
+        }
+
+        /// <summary>
+        /// Send a Packet to all clients Connected and waiting
+        /// </summary>
+        /// <param name="packet"></param>
+        public void SendToConnectedClients(Packet packet)
+        {
+            if (SendClient == null)
+                foreach (ClientInfo clientInfo in ConncetedClients)
+                {
+                    NetworkingClient client = new NetworkingClient(true, clientInfo.IP, clientInfo.Port);
+                    client.SendPacket(packet);
+                }
+        }
+
+        /// <summary>
+        /// Send a Packet to all clients In this Match
+        /// </summary>
+        /// <param name="packet"></param>
+        public void SendToInMatchClients(Packet packet)
+        {
+            if (SendClient == null)
+                foreach (ClientInfo clientInfo in InMatchClients)
+                {
+                    NetworkingClient client = new NetworkingClient(true, clientInfo.IP, clientInfo.Port);
+                    client.SendPacket(packet);
+                }
+        }
+
+        /// <summary>
+        /// Send a Packet to all clients Loaded
+        /// </summary>
+        /// <param name="packet"></param>
+        public void SendToLoadedClients(Packet packet)
+        {
+            if (SendClient == null)
+                foreach (ClientInfo clientInfo in LoadedClients)
+                {
+                    NetworkingClient client = new NetworkingClient(true, clientInfo.IP, clientInfo.Port);
+                    client.SendPacket(packet);
+                }
+        }
+
+        /// <summary>
+        /// Send a Packet to all clients InGame
+        /// </summary>
+        /// <param name="packet"></param>
+        public void SendToInGameClients(Packet packet)
+        {
+            if (SendClient == null)
+                foreach (ClientInfo clientInfo in InGameClients)
+                {
+                    NetworkingClient client = new NetworkingClient(true, clientInfo.IP, clientInfo.Port);
+                    client.SendPacket(packet);
+                }
+        }
+
+        /// <summary>
+        /// Send a Packet to ALL clients we know
+        /// </summary>
+        /// <param name="packet"></param>
+        public void SendToAllClients(Packet packet)
+        {
+            if (SendClient == null)
+            {
+                SendToConnectingClients(packet);
+                SendToConnectedClients(packet);
+            }
+        }
+
+        /// <summary>
+        /// Send to all but the one that sent it
+        /// </summary>
+        /// <param name="packet"></param>
+        /// <param name="playerID"></param>
+        public void ShareWithOtherPeers(Packet packet)
+        {
+            if (SendClient == null)
+                foreach (ClientInfo clientInfo in ConncetedClients)
+                    if (packet.ClientInfo.IP != clientInfo.IP)
+                    {
+                        NetworkingClient client = new NetworkingClient(true, clientInfo.IP, clientInfo.Port);
+                        client.SendPacket(packet);
+                    }
+        }
+
+        public virtual void AbortGame()
+        {
+            SendToLoadedClients(new BasicPacket(ClientInfo) { Abort = true });
+            SendToInGameClients(new BasicPacket(ClientInfo) { Abort = true });
+
+            restart:
+            foreach (ClientInfo client in LoadedClients)
+            {
+                LoadedClients.Remove(client);
+                InMatchClients.Add(client);
+                goto restart;
+            }
+            foreach (ClientInfo client in InGameClients)
+            {
+                InGameClients.Remove(client);
+                InMatchClients.Add(client);
+                goto restart;
+            }
+
+            InGame = false;
+            Loaded = false;
+
+            OnAbort?.Invoke();
+        }
+
+        public virtual void Disconnect()
+        {
+            Packet packet = new BasicPacket(ClientInfo) { Disconnect = true };
+
+            OnAbort?.Invoke();
+            InMatch = false;
+            InGame = false;
+            Loaded = false;
+
+            if (SendClient == null)
+            {
+                SendToConnectingClients(packet);
+                SendToConnectedClients(packet);
+            }
+            else
+                SendToHost(packet);
+        }
+
+        /// <summary>
+        /// Die
+        /// </summary>
+        /// <param name="isDisposing"></param>
+        protected override void Dispose(bool isDisposing)
+        {
+            ReceiveClient?.Clear();
+
+            if (SendClient != null)
+            {
+                SendToHost(new BasicPacket(ClientInfo) { Disconnect = true });
+                SendClient.Clear();
+            }
+
+            base.Dispose(isDisposing);
+        }
+    }
+
+    public enum ClientType
+    {
+        Host,
+        Peer,
+        Server
+    }
+}

Symcol.Core/Networking/Packet.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace Symcol.Core.Networking
+{
+    [Serializable]
+    public class Packet
+    {
+        /// <summary>
+        /// Just a Signature
+        /// </summary>
+        public readonly ClientInfo ClientInfo;
+
+        /// <summary>
+        /// Specify starting size of packet for efficiency
+        /// </summary>
+        public virtual int PacketSize => 1024;
+
+        public Packet(ClientInfo clientInfo)
+        {
+            ClientInfo = clientInfo;
+        }
+    }
+}

Symcol.Core/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("symcol.Toys")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("symcol.Toys")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
+[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("f34ac16c-e590-4d70-a069-a748326852bf")]
+
+// 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")]

Symcol.Core/Symcol.Core.csproj

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" 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>{F34AC16C-E590-4D70-A069-A748326852BF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Symcol.Core</RootNamespace>
+    <AssemblyName>Symcol.Core</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Cyotek.Drawing.BitmapFont, Version=1.0.0.0, Culture=neutral, PublicKeyToken=58daa28b0b2de221, processorArchitecture=MSIL">
+      <HintPath>..\packages\Cyotek.Drawing.BitmapFont.1.3.4-beta1\lib\net46\Cyotek.Drawing.BitmapFont.dll</HintPath>
+    </Reference>
+    <Reference Include="ManagedBass, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ManagedBass.2.0.3\lib\net45\ManagedBass.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\OpenTK.3.0.0-git00009\lib\net20\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite.Net.Platform.Generic, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite.Net.Platform.Win32, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net4\SQLite.Net.Platform.Win32.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLiteNetExtensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GameObjects\SymcolHitbox.cs" />
+    <Compile Include="Graphics\Containers\SymcolClickableContainer.cs" />
+    <Compile Include="Graphics\Containers\SymcolDialContainer.cs" />
+    <Compile Include="Graphics\Containers\SymcolDragContainer.cs" />
+    <Compile Include="Graphics\Containers\SymcolContainer.cs" />
+    <Compile Include="Graphics\UserInterface\SpriteButton.cs" />
+    <Compile Include="Graphics\UserInterface\SymcolWindow.cs" />
+    <Compile Include="Networking\BasicPacket.cs" />
+    <Compile Include="Networking\ClientInfo.cs" />
+    <Compile Include="Networking\NetworkingClient.cs" />
+    <Compile Include="Networking\Packet.cs" />
+    <Compile Include="Networking\NetworkingClientHandler.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <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" />
+</Project>

Symcol.Rulesets.Core/Containers/LinkText.cs

@@ -0,0 +1,43 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Symcol.Rulesets.Core.Containers
+{
+    public class LinkText : OsuSpriteText, IHasTooltip
+    {
+        public string TooltipText => Tooltip;
+
+        public virtual string Tooltip => "";
+
+        private readonly OsuHoverContainer content;
+
+        public override bool HandleKeyboardInput => content.Action != null;
+        public override bool HandleMouseInput => content.Action != null;
+
+        protected override Container<Drawable> Content => content ?? (Container<Drawable>)this;
+
+        public override IEnumerable<Drawable> FlowingChildren => Children;
+
+        public string Url
+        {
+            set
+            {
+                if (value != null)
+                    content.Action = () => Process.Start(value);
+            }
+        }
+
+        public LinkText()
+        {
+            AddInternal(content = new OsuHoverContainer
+            {
+                AutoSizeAxes = Axes.Both,
+            });
+        }
+    }
+}

Symcol.Rulesets.Core/Containers/ProfileLink.cs

@@ -0,0 +1,24 @@
+using osu.Game.Users;
+
+namespace Symcol.Rulesets.Core.Containers
+{
+    /// <summary>
+    /// TODO: make this more generic
+    /// </summary>
+    public class ProfileLink : LinkText
+    {
+        public override string Tooltip => "View profile in browser";
+
+        public ProfileLink(User user, bool maintainer = false)
+        {
+            if (!maintainer)
+                Text = "Ruleset Creator: " + user.Username;
+            else
+                Text = "Ruleset Maintainer: " + user.Username;
+
+            Url = $@"https://osu.ppy.sh/users/{user.Id}";
+            Font = @"Exo2.0-RegularItalic";
+            TextSize = 20;
+        }
+    }
+}

Symcol.Rulesets.Core/HitObjects/DrawableSymcolHitObject.cs

@@ -0,0 +1,91 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using System;
+using System.Collections.Generic;
+
+namespace Symcol.Rulesets.Core.HitObjects
+{
+    /// <summary>
+    /// Mostly stuff copied from Container
+    /// </summary>
+    /// <typeparam name="TObject"></typeparam>
+    public abstract class DrawableSymcolHitObject<TObject> : DrawableHitObject<TObject>
+        where TObject : HitObject
+    {
+        //Future prep?
+        //public override void ClearTransformsAfter(double time, bool propagateChildren = false, string targetMember = null) { }
+        //public override void ApplyTransformsAt(double time, bool propagateChildren = false) { }
+
+        protected virtual Container<Drawable> Content => new Container();
+
+        public IReadOnlyList<Drawable> Children
+        {
+            get
+            {
+                return InternalChildren;
+            }
+            set
+            {
+                ChildrenEnumerable = value;
+            }
+        }
+
+        public IEnumerable<Drawable> ChildrenEnumerable
+        {
+            set
+            {
+                Clear();
+                AddRange(value);
+            }
+        }
+
+        public void AddRange(IEnumerable<Drawable> range)
+        {
+            foreach (Drawable d in range)
+                Add(d);
+        }
+
+        public Drawable Child
+        {
+            get
+            {
+                if (Children.Count != 1)
+                    throw new InvalidOperationException($"{nameof(Child)} is only available when there's only 1 in {nameof(Children)}!");
+
+                return Children[0];
+            }
+            set
+            {
+                Clear();
+                Add(value);
+            }
+        }
+
+        public void Clear() => Clear(true);
+
+        public virtual void Clear(bool disposeChildren)
+        {
+            if (Content != null)
+                Content.Clear(disposeChildren);
+            else
+                ClearInternal(disposeChildren);
+        }
+
+        protected DrawableSymcolHitObject(TObject hitObject)
+    : base(hitObject)
+        {
+        }
+
+        public void Add(Drawable drawable)
+        {
+            AddInternal(drawable);
+        }
+
+        public void Remove(Drawable drawable)
+        {
+            RemoveInternal(drawable);
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Networking/ChatPacket.cs

@@ -0,0 +1,22 @@
+using Symcol.Core.Networking;
+using System;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Networking
+{
+    [Serializable]
+    public class ChatPacket : Packet
+    {
+        public override int PacketSize => 4096;
+
+        public string Author;
+
+        public string AuthorColor;
+
+        public string Message;
+
+        public ChatPacket(ClientInfo clientInfo) : base(clientInfo)
+        {
+
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Networking/RulesetClientInfo.cs

@@ -0,0 +1,24 @@
+using Symcol.Core.Networking;
+using System;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Networking
+{
+    /// <summary>
+    /// Just a client signature basically
+    /// </summary>
+    [Serializable]
+    public class RulesetClientInfo : ClientInfo
+    {
+        public string Username = "";
+
+        public int UserID = -1;
+
+        public string UserPic;
+
+        public string UserBackground;
+
+        public string UserCountry;
+
+        public string CountryFlagName;
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Networking/RulesetNetworkingClientHandler.cs

@@ -0,0 +1,83 @@
+using osu.Framework.Allocation;
+using osu.Game;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using Symcol.Core.Networking;
+using System;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Networking
+{
+    //TODO: This NEEDS its own clock to avoid fuckery later on with DoubleTime and HalfTime
+    public class RulesetNetworkingClientHandler : NetworkingClientHandler, IOnlineComponent
+    {
+        public RulesetClientInfo RulesetClientInfo;
+
+        public Action<WorkingBeatmap> OnMapChange;
+
+        private OsuGame osu;
+
+        public RulesetNetworkingClientHandler(ClientType type, string ip, int port = 25570, string thisLocalIp = "0.0.0.0") : base(type, ip, port, thisLocalIp)
+        {
+            if (RulesetClientInfo == null)
+            {
+                RulesetClientInfo = new RulesetClientInfo
+                {
+                    Port = port
+                };
+
+                ClientInfo = RulesetClientInfo;
+            }
+        }
+
+        /// <summary>
+        /// Send Map to Peers
+        /// </summary>
+        /// <param name="map"></param>
+        public void SetMap(WorkingBeatmap map)
+        {
+            RulesetPacket packet;
+            try
+            {
+                packet = new RulesetPacket(RulesetClientInfo)
+                {
+                    OnlineBeatmapSetID = (int)map.BeatmapSetInfo.OnlineBeatmapSetID,
+                    OnlineBeatmapID = (int)map.BeatmapInfo.OnlineBeatmapID
+                };
+                SendToInMatchClients(packet);
+                OnMapChange?.Invoke(osu.Beatmap.Value);
+            }
+            catch
+            {
+                packet = new RulesetPacket(RulesetClientInfo);
+                SendToInMatchClients(packet);
+                return;
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(APIAccess api, OsuGame osu)
+        {
+            api.Register(this);
+            this.osu = osu;
+        }
+
+        public void APIStateChanged(APIAccess api, APIState state)
+        {
+            switch (state)
+            {
+                default:
+                    RulesetClientInfo.Username = "";
+                    RulesetClientInfo.UserID = -1;
+                    break;
+                case APIState.Online:
+                    RulesetClientInfo.Username = api.LocalUser.Value.Username;
+                    RulesetClientInfo.UserID = (int)api.LocalUser.Value.Id;
+                    RulesetClientInfo.UserCountry = api.LocalUser.Value.Country.FullName;
+                    RulesetClientInfo.CountryFlagName = api.LocalUser.Value.Country.FlagName;
+                    RulesetClientInfo.UserPic = api.LocalUser.Value.AvatarUrl;
+                    RulesetClientInfo.UserBackground = api.LocalUser.Value.CoverUrl;
+                    break;
+            }
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Networking/RulesetPacket.cs

@@ -0,0 +1,28 @@
+using Symcol.Core.Networking;
+using System;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Networking
+{
+    [Serializable]
+    public class RulesetPacket : Packet
+    {
+        public new readonly RulesetClientInfo ClientInfo;
+
+        public override int PacketSize => 4096;
+
+        public int OnlineBeatmapSetID = -1;
+
+        public int OnlineBeatmapID = -1;
+
+        public bool HaveMap;
+
+        public string ChatContent;
+
+        //public string RulesetName = "";
+
+        public RulesetPacket(RulesetClientInfo rulesetClientInfo) : base(rulesetClientInfo)
+        {
+            ClientInfo = rulesetClientInfo;
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Networking/ScorePacket.cs

@@ -0,0 +1,22 @@
+using Symcol.Core.Networking;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Networking
+{
+    [Serializable]
+    public class ScorePacket : Packet
+    {
+        public override int PacketSize => 2048;
+
+        public int Score;
+
+        public ScorePacket(ClientInfo clientInfo, int score) : base(clientInfo)
+        {
+            Score = score;
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Options/MultiplayerDropdownEnumOption.cs

@@ -0,0 +1,43 @@
+using osu.Framework.Configuration;
+using osu.Game.Overlays.Settings;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Options
+{
+    public class MultiplayerDropdownEnumOption<T> : MultiplayerOption
+        where T : struct
+    {
+        public readonly Bindable<T> BindableEnum;
+
+        public MultiplayerDropdownEnumOption(Bindable<T> bindable, string name, int quadrant, bool sync = true) : base(name, quadrant, sync)
+        {
+            BindableEnum = bindable;
+
+            OptionContainer.Child = new BetterSettingsEnumDropdown<T>
+            {
+                Anchor = Anchor.TopLeft,
+                Origin = Anchor.TopLeft,
+                RelativeSizeAxes = Axes.X,
+                Bindable = bindable,
+            };
+        }
+
+        private class BetterSettingsEnumDropdown<T> : SettingsEnumDropdown<T>
+        {
+            protected override Drawable CreateControl() => new BetterOsuEnumDropdown<T>
+            {
+                Margin = new MarginPadding { Top = 5 },
+                RelativeSizeAxes = Axes.X,
+            };
+
+            private class BetterOsuEnumDropdown<T> : OsuEnumDropdown<T>
+            {
+                public BetterOsuEnumDropdown()
+                {
+                    Menu.MaxHeight = 160;
+                }
+            }
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Options/MultiplayerOption.cs

@@ -0,0 +1,87 @@
+using OpenTK;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using System;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Options
+{
+    public abstract class MultiplayerOption : Container
+    {
+        protected readonly SpriteText Title;
+
+        protected readonly Container OptionContainer;
+
+        public MultiplayerOption(string name, int quadrant, bool sync = true)
+        {
+            if (quadrant == 1 | quadrant == 3 | quadrant == 5 | quadrant == 7)
+            {
+                switch (quadrant)
+                {
+                    case 1:
+                        quadrant = 0;
+                        break;
+                    case 3:
+                        quadrant = 1;
+                        break;
+                    case 5:
+                        quadrant = 2;
+                        break;
+                    case 7:
+                        quadrant = 3;
+                        break;
+                }
+
+                Anchor = Anchor.TopLeft;
+                Origin = Anchor.TopLeft;
+                Position = new Vector2(16, 4 + (64 * quadrant));
+            }
+            else if (quadrant == 2 | quadrant == 4 | quadrant == 6 | quadrant == 8)
+            {
+                switch (quadrant)
+                {
+                    case 2:
+                        quadrant = 0;
+                        break;
+                    case 4:
+                        quadrant = 1;
+                        break;
+                    case 6:
+                        quadrant = 2;
+                        break;
+                    case 8:
+                        quadrant = 3;
+                        break;
+                }
+
+                Anchor = Anchor.TopCentre;
+                Origin = Anchor.TopLeft;
+                Position = new Vector2(22, 4 + (64 * quadrant));
+            }
+            else
+                throw new Exception("Globglogabgalab");
+
+            RelativeSizeAxes = Axes.X;
+            Width = 0.49f;
+            Height = 80;
+
+            Children = new Drawable[]
+            {
+                Title = new SpriteText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    TextSize = 20,
+                    Text = name
+                },
+                OptionContainer = new Container
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(-16, 18),
+                    RelativeSizeAxes = Axes.Both,
+                }
+            };
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Options/MultiplayerToggleOption.cs

@@ -0,0 +1,27 @@
+using osu.Framework.Configuration;
+using osu.Game.Overlays.Settings;
+using osu.Framework.Graphics;
+using OpenTK;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Options
+{
+    public class MultiplayerToggleOption : MultiplayerOption
+    {
+        public readonly Bindable<bool> BindableBool;
+
+        public MultiplayerToggleOption(Bindable<bool> bindable, string name, int quadrant, bool sync = true) : base(name, quadrant, sync)
+        {
+            BindableBool = bindable;
+
+            Child = new SettingsCheckbox
+            {
+                Anchor = Anchor.TopLeft,
+                Origin = Anchor.TopLeft,
+                RelativeSizeAxes = Axes.X,
+                Bindable = bindable,
+                LabelText = " " + name,
+                Position = new Vector2(-16, 18),
+            };
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Pieces/Chat.cs

@@ -0,0 +1,148 @@
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Logging;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Users;
+using Symcol.Core.Networking;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Pieces
+{
+    public class Chat : Container, IOnlineComponent
+    {
+        private readonly RulesetNetworkingClientHandler rulesetNetworkingClientHandler;
+
+        private string playerColorHex = SymcolSettingsSubsection.SymcolConfigManager.GetBindable<string>(SymcolSetting.PlayerColor);
+
+        private User user;
+
+        private readonly FillFlowContainer<ChatMessage> messageContainer;
+        private readonly OsuTextBox textBox;
+
+        public Chat(RulesetNetworkingClientHandler rulesetNetworkingClientHandler)
+        {
+            this.rulesetNetworkingClientHandler = rulesetNetworkingClientHandler;
+
+            rulesetNetworkingClientHandler.OnPacketReceive += (packet) =>
+            {
+                if (packet is ChatPacket chatPacket)
+                    Add(chatPacket);
+                if (rulesetNetworkingClientHandler.ClientType == ClientType.Host)
+                    rulesetNetworkingClientHandler.ShareWithOtherPeers(packet);
+            };
+
+            Anchor = Anchor.BottomCentre;
+            Origin = Anchor.BottomCentre;
+            RelativeSizeAxes = Axes.Both;
+            Height = 0.46f;
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                    Alpha = 0.8f
+                },
+                new OsuScrollContainer
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.9f,
+
+                    Children = new Drawable[]
+                    {
+                        messageContainer = new FillFlowContainer<ChatMessage>
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y
+                        }
+                    }
+                },
+                textBox = new OsuTextBox
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.98f,
+                    Height = 36,
+                    Position = new Vector2(0, -12),
+                    Colour = Color4.White,
+                    Text = "Type here!"
+                }
+            };
+
+            textBox.OnCommit += (s, r) =>
+            {
+                AddMessage(textBox.Text);
+                textBox.Text = "";
+            };
+        }
+
+        public void Add(ChatPacket packet)
+        {
+            ChatMessage message = new ChatMessage(packet);
+            messageContainer.Add(message);
+        }
+
+        public void AddMessage(string message)
+        {
+            if (message == "" | message == " ")
+                return;
+
+            if (user != null)
+            {
+                try
+                {
+                    OsuColour.FromHex(playerColorHex);
+                }
+                catch
+                {
+                    playerColorHex = "#ffffff";
+                }
+
+                ChatPacket packet = new ChatPacket(rulesetNetworkingClientHandler.ClientInfo)
+                {
+                    Author = user.Username,
+                    AuthorColor = playerColorHex,
+                    Message = message,
+                };
+
+                rulesetNetworkingClientHandler.SendToHost(packet);
+                rulesetNetworkingClientHandler.SendToInMatchClients(packet);
+                Add(packet);
+            }
+            else
+                Logger.Log("You must be logged in to message!", LoggingTarget.Network, LogLevel.Error);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(APIAccess api)
+        {
+            api.Register(this);
+        }
+
+        public void APIStateChanged(APIAccess api, APIState state)
+        {
+            switch (state)
+            {
+                default:
+                    user = null;
+                    break;
+                case APIState.Online:
+                    user = api.LocalUser.Value;
+                    break;
+            }
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Pieces/ChatMessage.cs

@@ -0,0 +1,42 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Pieces
+{
+    public class ChatMessage : Container
+    {
+        public ChatMessage(ChatPacket packet)
+        {
+            Anchor = Anchor.TopLeft;
+            Origin = Anchor.TopLeft;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Children = new Drawable[]
+            {
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Colour = OsuColour.FromHex(packet.AuthorColor),
+                    TextSize = 24,
+                    Text = packet.Author + ":"
+                },
+                new OsuTextFlowContainer(t => { t.TextSize = 24; })
+                {
+                    Position = new OpenTK.Vector2(140, 0),
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Text = packet.Message
+                }
+            };
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Pieces/MatchPlayer.cs

@@ -0,0 +1,123 @@
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Users;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+using System.Diagnostics;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Pieces
+{
+    public class MatchPlayer : ClickableContainer, IHasContextMenu
+    {
+        public readonly RulesetClientInfo ClientInfo;
+
+        private readonly Box dim;
+
+        private readonly DrawableFlag countryFlag;
+        private readonly UserCoverBackground profileBackground;
+        private readonly UpdateableAvatar profilePicture;
+
+        public MatchPlayer(RulesetClientInfo clientInfo)
+        {
+            ClientInfo = clientInfo;
+
+            Alpha = 0;
+            Masking = true;
+            RelativeSizeAxes = Axes.X;
+            Height = 40f;
+            CornerRadius = 10;
+
+            Country country = new Country
+            {
+                FullName = ClientInfo.UserCountry,
+                FlagName = ClientInfo.CountryFlagName,
+            };
+
+            User user = new User
+            {
+                Username = ClientInfo.Username,
+                Id = ClientInfo.UserID,
+                Country = country,
+                AvatarUrl = ClientInfo.UserPic,
+                CoverUrl = ClientInfo.UserBackground,
+            };
+
+            Children = new Drawable[]
+            {
+                profileBackground = new UserCoverBackground(user)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    FillMode = FillMode.Fill,
+                    OnLoadComplete = d => d.FadeInFromZero(200),
+                },
+                dim = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                    Alpha = 0.8f
+                },
+                profilePicture = new UpdateableAvatar
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Size = new Vector2(Height * 0.8f),
+                    Position = new Vector2(6, 0),
+                    User = user,
+                    Masking = true,
+                    CornerRadius = 6,
+                },
+                countryFlag = new DrawableFlag(country)
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Size = new Vector2(Height * 0.9f, (Height * 0.9f) * 0.66f),
+                    Position = new Vector2(-10, 0)
+                },
+                new SpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Position = new Vector2(Height * 1.1f, 0),
+                    TextSize = Height * 0.9f,
+                    Text = user.Username
+                }
+            };
+
+            Action = () =>
+            {
+                Process.Start("https://osu.ppy.sh/users/" + user.Id);
+            };
+        }
+
+        protected override bool OnHover(InputState state)
+        {
+            dim.FadeTo(0.6f, 200);
+
+            return base.OnHover(state);
+        }
+
+        protected override void OnHoverLost(InputState state)
+        {
+            base.OnHoverLost(state);
+
+            dim.FadeTo(0.8f, 200);
+        }
+
+        public MenuItem[] ContextMenuItems => new MenuItem[]
+        {
+            new OsuMenuItem("View Profile", MenuItemType.Standard, () => { }),
+            new OsuMenuItem("Promote to Host", MenuItemType.Highlighted, () => { }),
+            new OsuMenuItem("Kick", MenuItemType.Destructive, () => { }),
+            new OsuMenuItem("Ban", MenuItemType.Destructive, () => { }),
+        };
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Pieces/MatchPlayerList.cs

@@ -0,0 +1,110 @@
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using OpenTK;
+using Symcol.Core.Networking;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Pieces
+{
+    public class MatchPlayerList : Container
+    {
+        private readonly RulesetNetworkingClientHandler rulesetNetworkingClientHandler;
+
+        public readonly List<MatchPlayer> MatchPlayers = new List<MatchPlayer>();
+
+        public readonly FillFlowContainer MatchPlayersContianer;
+
+        public MatchPlayerList(RulesetNetworkingClientHandler rulesetNetworkingClientHandler)
+        {
+            this.rulesetNetworkingClientHandler = rulesetNetworkingClientHandler;
+
+            Masking = true;
+            CornerRadius = 16;
+            Anchor = Anchor.TopLeft;
+            Origin = Anchor.TopLeft;
+            RelativeSizeAxes = Axes.Both;
+            Width = 0.49f;
+            Height = 0.45f;
+            Position = new Vector2(10);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black.Opacity(0.8f)
+                },
+                MatchPlayersContianer = new FillFlowContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Width = 0.98f,
+                    Height = 0.96f
+                }
+            };
+
+            rulesetNetworkingClientHandler.OnReceivePlayerList += (players) =>
+            {
+                restart:
+                foreach (MatchPlayer matchPlayer in MatchPlayers)
+                    foreach (ClientInfo clientInfo in players)
+                        if (clientInfo is RulesetClientInfo rulesetClientInfo)
+                            if (rulesetClientInfo.IP + rulesetClientInfo.Port != matchPlayer.ClientInfo.IP + matchPlayer.ClientInfo.Port)
+                            {
+                                Add(rulesetClientInfo);
+                                players.Remove(clientInfo);
+                                goto restart;
+                            }
+            };
+            rulesetNetworkingClientHandler.RequestPlayerList();
+
+            rulesetNetworkingClientHandler.OnClientJoin += (clientInfo) =>
+            {
+                foreach (MatchPlayer matchPlayer in MatchPlayers)
+                    if (clientInfo is RulesetClientInfo rulesetClientInfo)
+                        if (rulesetClientInfo.IP + rulesetClientInfo.Port != matchPlayer.ClientInfo.IP + matchPlayer.ClientInfo.Port)
+                        {
+                            Add(rulesetClientInfo);
+                            break;
+                        }
+            };
+
+            rulesetNetworkingClientHandler.OnClientDisconnect += (clientInfo) =>
+            {
+                foreach (MatchPlayer matchPlayer in MatchPlayers)
+                    if (clientInfo is RulesetClientInfo rulesetClientInfo)
+                        if (rulesetClientInfo.IP + rulesetClientInfo.Port == matchPlayer.ClientInfo.IP + matchPlayer.ClientInfo.Port)
+                        {
+                            Remove(matchPlayer);
+                            break;
+                        }
+            };
+        }
+
+        public void Add(RulesetClientInfo clientInfo)
+        {
+            MatchPlayer matchPlayer = new MatchPlayer(clientInfo);
+
+            Add(matchPlayer);
+        }
+
+        public void Add(MatchPlayer matchPlayer)
+        {
+            MatchPlayers.Add(matchPlayer);
+            MatchPlayersContianer.Add(matchPlayer);
+            matchPlayer.FadeInFromZero(200);
+        }
+
+        public void Remove(MatchPlayer matchPlayer)
+        {
+            MatchPlayers.Remove(matchPlayer);
+            matchPlayer.FadeOutFromOne(200)
+                .Expire();
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Pieces/MatchTools.cs

@@ -0,0 +1,372 @@
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Configuration;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input;
+using osu.Framework.MathUtils;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Screens.Symcol.Pieces;
+using Symcol.Rulesets.Core.Multiplayer.Options;
+using System;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Pieces
+{
+    public class MatchTools : Container
+    {
+        public readonly Bindable<MatchScreenMode> Mode = new Bindable<MatchScreenMode>() { Default = MatchScreenMode.MapDetails };
+
+        public readonly Bindable<MatchGamemode> GameMode = new Bindable<MatchGamemode>() { Default = MatchGamemode.HeadToHead };
+
+        public readonly OsuTabControl<MatchScreenMode> TabControl;
+
+        public readonly Container SelectedContent;
+
+        public readonly Container MapDetails;
+
+        public Container RulesetSettings;
+
+        public readonly Container SoundBoard;
+
+        private WorkingBeatmap selectedBeatmap;
+
+        private int selectedBeatmapSetID;
+
+        public MatchTools()
+        {
+            Masking = true;
+            CornerRadius = 16;
+            Anchor = Anchor.TopRight;
+            Origin = Anchor.TopRight;
+            RelativeSizeAxes = Axes.Both;
+            Width = 0.49f;
+            Height = 0.45f;
+            Position = new Vector2(-10, 10);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black.Opacity(0.8f)
+                },
+                TabControl = new OsuTabControl<MatchScreenMode>
+                {
+                    Position = new Vector2(72, 0),
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.08f,
+                    Width = 0.8f
+                },
+                SelectedContent = new Container
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.92f
+                }
+            };
+            TabControl.Current.Value = MatchScreenMode.MapDetails;
+
+            Mode.ValueChanged += (value) =>
+            {
+                switch (value)
+                {
+                    case MatchScreenMode.MapDetails:
+                        if (selectedBeatmap != null)
+                            SelectedContent.Child = new MapDetailsSection(selectedBeatmap);
+                        else if (selectedBeatmapSetID != 0)
+                            SelectedContent.Child = new MapDetailsSection(selectedBeatmapSetID);
+                        else
+                            SelectedContent.Child = new MapDetailsSection(true);
+                        break;
+                    case MatchScreenMode.MatchSettings:
+                        SelectedContent.Child = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+
+                            Children = new Drawable[]
+                            {
+                                new MultiplayerDropdownEnumOption<MatchGamemode>(GameMode, "Match Gamemode", 1)
+                            }
+                        };
+                        break;
+                    case MatchScreenMode.SoundBoard:
+                        SelectedContent.Child = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Child = new HitSoundBoard
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                ButtonSize = 80
+                            }
+                        };
+                        break;
+                }
+            };
+            Mode.BindTo(TabControl.Current);
+        }
+
+        public void MapChange(WorkingBeatmap workingBeatmap)
+        {
+            if (workingBeatmap == null)
+            {
+                MapChange(-1);
+                return;
+            }
+
+            selectedBeatmap = workingBeatmap;
+            selectedBeatmapSetID = (int)workingBeatmap.BeatmapSetInfo.OnlineBeatmapSetID;
+
+            if (Mode.Value == MatchScreenMode.MapDetails)
+                SelectedContent.Child = new MapDetailsSection(selectedBeatmap);
+        }
+
+        public void MapChange(int onlineBeatmapSetID)
+        {
+            selectedBeatmap = null;
+            selectedBeatmapSetID = onlineBeatmapSetID;
+
+            if (Mode.Value == MatchScreenMode.MapDetails)
+            {
+                if (selectedBeatmapSetID != 0 && selectedBeatmapSetID != -1)
+                    SelectedContent.Child = new MapDetailsSection(selectedBeatmapSetID);
+                else
+                    SelectedContent.Child = new MapDetailsSection(true);
+            }
+        }
+    }
+
+    public class MapDetailsSection : ClickableContainer
+    {
+        private Sprite beatmapBG;
+        private SpriteText name;
+        private SpriteText artist;
+        private SpriteText difficulty;
+        private SpriteText time;
+
+        private Box dim;
+
+        public MapDetailsSection(WorkingBeatmap workingBeatmap)
+        {
+            draw();
+
+            HitObject lastObject = workingBeatmap.Beatmap.HitObjects.LastOrDefault();
+            double endTime = (lastObject as IHasEndTime)?.EndTime ?? lastObject?.StartTime ?? 0;
+
+            beatmapBG.Texture = workingBeatmap.Background;
+            name.Text = workingBeatmap.BeatmapSetInfo.Metadata.Title;
+            artist.Text = "By: " + workingBeatmap.BeatmapSetInfo.Metadata.Artist;
+            difficulty.Text = workingBeatmap.BeatmapInfo.Version + " (" + Math.Round(workingBeatmap.BeatmapInfo.StarDifficulty, 2) + " stars) mapped by " + workingBeatmap.BeatmapInfo.Metadata.AuthorString;
+            time.Text = getBPMRange(workingBeatmap.Beatmap) + " bpm for " + TimeSpan.FromMilliseconds(endTime - workingBeatmap.Beatmap.HitObjects.First().StartTime).ToString(@"m\:ss");
+
+            BorderColour = getColour(workingBeatmap.BeatmapInfo);
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Radius = 16,
+                Type = EdgeEffectType.Shadow,
+                Colour = getColour(workingBeatmap.BeatmapInfo).Opacity(0.2f)
+            };
+            Action = () => Process.Start("https://osu.ppy.sh/beatmapsets/" + workingBeatmap.BeatmapSetInfo.OnlineBeatmapSetID);
+        }
+
+        public MapDetailsSection(int onlineBeatmapSetID)
+        {
+            draw();
+            name.Text = "Missing Map!";
+            artist.Text = "Click to open in Browser";
+            Action = () => Process.Start("https://osu.ppy.sh/beatmapsets/" + onlineBeatmapSetID);
+        }
+
+        public MapDetailsSection(bool invalid)
+        {
+            draw();
+            name.Text = "Invalid / No Map Selected!";
+            artist.Text = "Don't hit start, weird things might happen";
+            Action = () => Process.Start("https://osu.ppy.sh/home");
+        }
+
+        private void draw()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.Both;
+
+            Width = 0.95f;
+            Height = 0.9f;
+
+            Masking = true;
+            BorderColour = Color4.LightBlue;
+            BorderThickness = 4;
+            CornerRadius = 10;
+
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Radius = 16,
+                Type = EdgeEffectType.Shadow,
+                Colour = Color4.LightBlue.Opacity(0.2f)
+            };
+
+            Children = new Drawable[]
+            {
+                beatmapBG = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fill,
+                },
+                dim = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                    Alpha = 0.6f
+                },
+                name = new SpriteText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(10, 0),
+                    Font = @"Exo2.0-SemiBoldItalic",
+                    TextSize = 40
+                },
+                artist = new SpriteText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(10, 38),
+                    Font = @"Exo2.0-MediumItalic",
+                    TextSize = 24
+                },
+                difficulty = new SpriteText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(10, 64),
+                    Font = "Exo2.0-Bold",
+                    TextSize = 16
+                },
+                time = new SpriteText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(10, 84),
+                    TextSize = 16
+                }
+            };
+        }
+
+        protected override bool OnHover(InputState state)
+        {
+            dim.FadeTo(0.4f, 200);
+
+            return base.OnHover(state);
+        }
+
+        protected override void OnHoverLost(InputState state)
+        {
+            base.OnHoverLost(state);
+
+            dim.FadeTo(0.6f, 200);
+        }
+
+        //"Borrowed" stuff
+        private string getBPMRange(Beatmap beatmap)
+        {
+            double bpmMax = beatmap.ControlPointInfo.BPMMaximum;
+            double bpmMin = beatmap.ControlPointInfo.BPMMinimum;
+
+            if (Precision.AlmostEquals(bpmMin, bpmMax))
+                return $"{bpmMin:0}";
+
+            return $"{bpmMin:0}-{bpmMax:0} (mostly {beatmap.ControlPointInfo.BPMMode:0})";
+        }
+
+        private enum DifficultyRating
+        {
+            Easy,
+            Normal,
+            Hard,
+            Insane,
+            Expert,
+            ExpertPlus
+        }
+
+        private DifficultyRating getDifficultyRating(BeatmapInfo beatmap)
+        {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+
+            var rating = beatmap.StarDifficulty;
+
+            if (rating < 1.5) return DifficultyRating.Easy;
+            if (rating < 2.25) return DifficultyRating.Normal;
+            if (rating < 3.75) return DifficultyRating.Hard;
+            if (rating < 5.25) return DifficultyRating.Insane;
+            if (rating < 6.75) return DifficultyRating.Expert;
+            return DifficultyRating.ExpertPlus;
+        }
+
+        private Color4 getColour(BeatmapInfo beatmap)
+        {
+            OsuColour palette = new OsuColour();
+            switch (getDifficultyRating(beatmap))
+            {
+                case DifficultyRating.Easy:
+                    return palette.Green;
+                default:
+                case DifficultyRating.Normal:
+                    return palette.Blue;
+                case DifficultyRating.Hard:
+                    return palette.Yellow;
+                case DifficultyRating.Insane:
+                    return palette.Pink;
+                case DifficultyRating.Expert:
+                    return palette.Purple;
+                case DifficultyRating.ExpertPlus:
+                    return palette.Gray0;
+            }
+        }
+    }
+
+    public enum MatchGamemode
+    {
+        [System.ComponentModel.Description("Head to Head")]
+        HeadToHead,
+        [System.ComponentModel.Description("Head to Head with Live Spectator")]
+        HeadToHeadSpectator,
+        [System.ComponentModel.Description("Team Versus")]
+        TeamVS,
+        [System.ComponentModel.Description("TAG4")]
+        TAG4,
+        [System.ComponentModel.Description("Team TAG4")]
+        TeamTAG4,
+        [System.ComponentModel.Description("Tourny Mode")]
+        Tournement,
+    }
+
+    public enum MatchScreenMode
+    {
+        [System.ComponentModel.Description("Map Details")]
+        MapDetails,
+        [System.ComponentModel.Description("Match Settings")]
+        MatchSettings,
+        [System.ComponentModel.Description("Ruleset Settings")]
+        RulesetSettings,
+        [System.ComponentModel.Description("Sound Board")]
+        SoundBoard
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Pieces/MultiplayerScoreboard.cs

@@ -0,0 +1,93 @@
+using OpenTK;
+using OpenTK.Input;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Game.Rulesets.Scoring;
+using Symcol.Core.Networking;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+using System.Collections.Generic;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Pieces
+{
+    public class MultiplayerScoreboard : Container
+    {
+        public readonly Container<MultiplayerScoreboardItem> ScoreboardItems;
+
+        private readonly RulesetNetworkingClientHandler rulesetNetworkingClientHandler;
+
+        private readonly ScoreProcessor scoreProcessor;
+
+        private double updateScoreTime = 0;
+
+        public MultiplayerScoreboard(RulesetNetworkingClientHandler rulesetNetworkingClientHandler, List<ClientInfo> playerList, ScoreProcessor scoreProcessor)
+        {
+            this.rulesetNetworkingClientHandler = rulesetNetworkingClientHandler;
+            this.scoreProcessor = scoreProcessor;
+
+            AlwaysPresent = true;
+            AutoSizeAxes = Axes.Y;
+            Width = 120;
+
+            Position = new Vector2(0, -200);
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.TopLeft;
+
+            Child = ScoreboardItems = new Container<MultiplayerScoreboardItem>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+            };
+
+            int i = 1;
+            foreach (ClientInfo clientInfo in playerList)
+            {
+                if (clientInfo is RulesetClientInfo rulesetClientInfo)
+                {
+                    ScoreboardItems.Add(new MultiplayerScoreboardItem(rulesetClientInfo, i) { });
+                    i++;
+                }
+            }
+
+            rulesetNetworkingClientHandler.OnPacketReceive += (Packet packet) =>
+            {
+                if (packet is ScorePacket scorePacket)
+                {
+                    rulesetNetworkingClientHandler.ShareWithOtherPeers(scorePacket);
+                    foreach (MultiplayerScoreboardItem item in ScoreboardItems)
+                        if (scorePacket.ClientInfo == item.ClientInfo)
+                            item.Score = scorePacket.Score;
+                }
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (Time.Current >= updateScoreTime)
+            {
+                updateScoreTime = Time.Current + 500;
+                foreach (MultiplayerScoreboardItem item in ScoreboardItems)
+                    if (rulesetNetworkingClientHandler.ClientInfo == item.ClientInfo)
+                        item.Score = (int)scoreProcessor.TotalScore.Value;
+
+                rulesetNetworkingClientHandler.SendToHost(new ScorePacket(rulesetNetworkingClientHandler.ClientInfo, (int)scoreProcessor.TotalScore.Value));
+                rulesetNetworkingClientHandler.SendToInGameClients(new ScorePacket(rulesetNetworkingClientHandler.ClientInfo, (int)scoreProcessor.TotalScore.Value));
+            }
+        }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Key == Key.Tab)
+            {
+                if (Alpha > 0)
+                    this.FadeOut(100);
+                else
+                    this.FadeIn(100);
+            }
+
+            return base.OnKeyDown(state, args);
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Pieces/MultiplayerScoreboardItem.cs

@@ -0,0 +1,107 @@
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+using System.Collections.Generic;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Pieces
+{
+    public class MultiplayerScoreboardItem : Container
+    {
+        public int Score
+        {
+            get { return score; }
+            set
+            {
+                if (value != score)
+                {
+                    score = value;
+                    scoreText.Text = value.ToString();
+
+                    foreach(MultiplayerScoreboardItem item in itemList)
+                        if (value > item.Score && Place > item.Place)
+                        {
+                            Place = item.Place;
+                            foreach (MultiplayerScoreboardItem i in itemList)
+                                if (i.Place < Place)
+                                    i.Place -= 1;
+                        }
+                }
+            }
+        }
+
+        public int Place
+        {
+            get { return place; }
+            set
+            {
+                if (Place != place)
+                {
+                    place = value;
+                    this.MoveTo(new Vector2(0, (-height - 8) * (value - 1)), 200, Easing.OutQuint);
+                }
+            }
+        }
+
+        private int place = 0;
+
+        private int score = 0;
+
+        private const int height = 60;
+
+        public readonly RulesetClientInfo ClientInfo;
+
+        private readonly SpriteText scoreText;
+
+        private static List<MultiplayerScoreboardItem> itemList = new List<MultiplayerScoreboardItem>();
+
+        public MultiplayerScoreboardItem(RulesetClientInfo clientInfo, int place)
+        {
+            ClientInfo = clientInfo;
+            this.place = place;
+
+            itemList.Add(this);
+
+            RelativeSizeAxes = Axes.X;
+            Height = height;
+
+            Masking = true;
+            CornerRadius = 8;
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                    Alpha = 0.8f,
+                },
+                new SpriteText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(4),
+                    Text = clientInfo.Username
+                },
+                scoreText = new SpriteText
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Position = new Vector2(-4),
+                    Text = Score.ToString()
+                }
+            };
+
+            this.MoveTo(new Vector2(0, (-height - 8) * (Place - 1)), 200, Easing.OutQuint);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            itemList.Remove(this);
+            base.Dispose(isDisposing);
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Screens/MatchSongSelect.cs

@@ -0,0 +1,47 @@
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Select;
+using System;
+using osu.Game.Screens;
+using osu.Framework.Screens;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Screens
+{
+    public class MatchSongSelect : SongSelect
+    {
+        public WorkingBeatmap SelectedMap;
+
+        private bool exiting;
+
+        protected override BackgroundScreen CreateBackground() => null;
+
+        public Action Action;
+
+        public readonly RulesetNetworkingClientHandler RulesetNetworkingClientHandler;
+
+        public MatchSongSelect(RulesetNetworkingClientHandler rulesetNetworkingClientHandler)
+        {
+            RulesetNetworkingClientHandler = rulesetNetworkingClientHandler;
+        }
+
+        protected override void OnEntering(Screen last)
+        {
+            Add(RulesetNetworkingClientHandler);
+            base.OnEntering(last);
+        }
+
+        protected override bool OnSelectionFinalised()
+        {
+            if (!exiting)
+            {
+                RulesetNetworkingClientHandler.OnMapChange?.Invoke(null);
+                SelectedMap = Beatmap.Value;
+                Action();
+                exiting = true;
+                Remove(RulesetNetworkingClientHandler);
+                Exit();
+            }
+            return true;
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Screens/MultiPlayer.cs

@@ -0,0 +1,383 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Input;
+using osu.Framework.Logging;
+using osu.Framework.Screens;
+using osu.Framework.Threading;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Cursor;
+using osu.Game.Online.API;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Backgrounds;
+using osu.Game.Screens.Ranking;
+using osu.Game.Storyboards.Drawables;
+using OpenTK;
+using osu.Game.Screens;
+using osu.Game.Screens.Play;
+using OpenTK.Input;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+using Symcol.Rulesets.Core.Multiplayer.Pieces;
+using System.Collections.Generic;
+using Symcol.Core.Networking;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Screens
+{
+    public class MultiPlayer : ScreenWithBeatmapBackground, IProvideCursor
+    {
+        public readonly RulesetNetworkingClientHandler RulesetNetworkingClientHandler;
+
+        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
+
+        protected override float BackgroundParallaxAmount => 0.1f;
+
+        public override bool ShowOverlaysOnEnter => false;
+
+        public Action RestartRequested;
+
+        public override bool AllowBeatmapRulesetChange => false;
+
+        public bool HasFailed { get; private set; }
+
+        public bool AllowPause { get; set; } = false;
+        public bool AllowLeadIn { get; set; } = true;
+        public bool AllowResults { get; set; } = true;
+
+        public int RestartCount;
+
+        public CursorContainer Cursor => RulesetContainer.Cursor;
+        public bool ProvidingUserCursor => RulesetContainer?.Cursor != null && !RulesetContainer.HasReplayLoaded.Value;
+
+        private IAdjustableClock sourceClock;
+        private DecoupleableInterpolatingFramedClock adjustableClock;
+
+        private RulesetInfo ruleset;
+
+        private APIAccess api;
+
+        private ScoreProcessor scoreProcessor;
+        protected RulesetContainer RulesetContainer;
+
+        #region User Settings
+
+        private Bindable<double> dimLevel;
+        private Bindable<double> blurLevel;
+        private Bindable<bool> showStoryboard;
+        private Bindable<bool> mouseWheelDisabled;
+        private Bindable<double> userAudioOffset;
+
+        private SampleChannel sampleRestart;
+
+        #endregion
+
+        private Container storyboardContainer;
+        private DrawableStoryboard storyboard;
+
+        private HUDOverlay hudOverlay;
+
+        private MultiplayerScoreboard scoreboard;
+
+        private bool loadedSuccessfully => RulesetContainer?.Objects.Any() == true;
+
+        private readonly List<ClientInfo> playerList;
+
+        public MultiPlayer(RulesetNetworkingClientHandler rulesetNetworkingClientHandler, List<ClientInfo> playerList)//, WorkingBeatmap beatmap = null)
+        {
+            RulesetNetworkingClientHandler = rulesetNetworkingClientHandler;
+            RulesetNetworkingClientHandler.OnAbort = () => Exit();
+            RulesetNetworkingClientHandler.StartGame = () => start();
+            this.playerList = playerList;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, APIAccess api, OsuConfigManager config)
+        {
+            this.api = api;
+
+            dimLevel = config.GetBindable<double>(OsuSetting.DimLevel);
+            blurLevel = config.GetBindable<double>(OsuSetting.BlurLevel);
+            showStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
+
+            mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
+
+            sampleRestart = audio.Sample.Get(@"Gameplay/restart");
+            userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
+
+            WorkingBeatmap working = Beatmap.Value;
+            Beatmap beatmap;
+
+            try
+            {
+                beatmap = working.Beatmap;
+
+                if (beatmap == null)
+                    throw new InvalidOperationException("Beatmap was not loaded");
+
+                ruleset = Ruleset.Value ?? beatmap.BeatmapInfo.Ruleset;
+                var rulesetInstance = ruleset.CreateInstance();
+
+                try
+                {
+                    RulesetContainer = rulesetInstance.CreateRulesetContainerWith(working, ruleset.ID == beatmap.BeatmapInfo.Ruleset.ID);
+                }
+                catch (BeatmapInvalidForRulesetException)
+                {
+                    // we may fail to create a RulesetContainer if the beatmap cannot be loaded with the user's preferred ruleset
+                    // let's try again forcing the beatmap's ruleset.
+                    ruleset = beatmap.BeatmapInfo.Ruleset;
+                    rulesetInstance = ruleset.CreateInstance();
+                    RulesetContainer = rulesetInstance.CreateRulesetContainerWith(Beatmap, true);
+                }
+
+                if (!RulesetContainer.Objects.Any())
+                    throw new InvalidOperationException("Beatmap contains no hit objects!");
+            }
+            catch (Exception e)
+            {
+                Logger.Error(e, "Could not load beatmap sucessfully!");
+
+                //couldn't load, hard abort!
+                Exit();
+                return;
+            }
+
+            sourceClock = (IAdjustableClock)working.Track ?? new StopwatchClock();
+            adjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
+
+            var firstObjectTime = RulesetContainer.Objects.First().StartTime;
+            adjustableClock.Seek(AllowLeadIn
+                ? Math.Min(0, firstObjectTime - Math.Max(beatmap.ControlPointInfo.TimingPointAt(firstObjectTime).BeatLength * 4, beatmap.BeatmapInfo.AudioLeadIn))
+                : firstObjectTime);
+
+            adjustableClock.ProcessFrame();
+
+            // the final usable gameplay clock with user-set offsets applied.
+            var offsetClock = new FramedOffsetClock(adjustableClock);
+
+            userAudioOffset.ValueChanged += v => offsetClock.Offset = v;
+            userAudioOffset.TriggerChange();
+
+            scoreProcessor = RulesetContainer.CreateScoreProcessor();
+
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Clock = offsetClock,
+                    Children = new Drawable[]
+                    {
+                        storyboardContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                        },
+                        RulesetContainer,
+                        hudOverlay = new HUDOverlay(scoreProcessor, RulesetContainer, working, offsetClock, adjustableClock)
+                        {
+                            Clock = Clock, // hud overlay doesn't want to use the audio clock directly
+                            ProcessCustomClock = false,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre
+                        },
+                        new BreakOverlay(beatmap.BeatmapInfo.LetterboxInBreaks, scoreProcessor)
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            ProcessCustomClock = false,
+                            Breaks = beatmap.Breaks
+                        },
+                        scoreboard = new MultiplayerScoreboard(RulesetNetworkingClientHandler, playerList, scoreProcessor)
+                    }
+                }
+            };
+
+            if (showStoryboard)
+                initializeStoryboard(false);
+
+            // Bind ScoreProcessor to ourselves
+            scoreProcessor.AllJudged += onCompletion;
+            scoreProcessor.Failed += onFail;
+
+            foreach (var mod in Beatmap.Value.Mods.Value.OfType<IApplicableToScoreProcessor>())
+                mod.ApplyToScoreProcessor(scoreProcessor);
+        }
+
+        private void applyRateFromMods()
+        {
+            if (sourceClock == null) return;
+
+            sourceClock.Rate = 1;
+            foreach (var mod in Beatmap.Value.Mods.Value.OfType<IApplicableToClock>())
+                mod.ApplyToClock(sourceClock);
+        }
+
+        private void initializeStoryboard(bool asyncLoad)
+        {
+            if (storyboardContainer == null)
+                return;
+
+            var beatmap = Beatmap.Value;
+
+            storyboard = beatmap.Storyboard.CreateDrawable();
+            storyboard.Masking = true;
+
+            if (asyncLoad)
+                LoadComponentAsync(storyboard, storyboardContainer.Add);
+            else
+                storyboardContainer.Add(storyboard);
+        }
+
+        private ScheduledDelegate onCompletionEvent;
+
+        private void onCompletion()
+        {
+            // Only show the completion screen if the player hasn't failed
+            if (scoreProcessor.HasFailed || onCompletionEvent != null)
+                return;
+
+            ValidForResume = false;
+
+            if (!AllowResults) return;
+
+            using (BeginDelayedSequence(1000))
+            {
+                onCompletionEvent = Schedule(delegate
+                {
+                    if (!IsCurrentScreen) return;
+
+                    var score = new Score
+                    {
+                        Beatmap = Beatmap.Value.BeatmapInfo,
+                        Ruleset = ruleset
+                    };
+                    scoreProcessor.PopulateScore(score);
+                    score.User = RulesetContainer.Replay?.User ?? api.LocalUser.Value;
+                    Push(new Results(score));
+                });
+            }
+        }
+
+        private bool onFail()
+        {
+            if (Beatmap.Value.Mods.Value.OfType<IApplicableFailOverride>().Any(m => !m.AllowFail))
+                return false;
+
+            HasFailed = true;
+            return true;
+        }
+
+        protected override void OnEntering(Screen last)
+        {
+            base.OnEntering(last);
+
+            Add(RulesetNetworkingClientHandler);
+
+            if (!loadedSuccessfully)
+                return;
+
+            Content.Alpha = 0;
+            Content
+                .ScaleTo(0.7f)
+                .ScaleTo(1, 750, Easing.OutQuint)
+                .Delay(250)
+                .FadeIn(250);
+
+            Task.Run(() =>
+            {
+                sourceClock.Reset();
+
+                Schedule(() =>
+                {
+                    adjustableClock.ChangeSource(sourceClock);
+                    applyRateFromMods();
+
+                    this.Delay(750).Schedule(() =>
+                    {
+                        Logger.Log("Client finnished loading", LoggingTarget.Network, LogLevel.Verbose);
+                        RulesetNetworkingClientHandler.GameLoaded();
+                    });
+                });
+            });
+        }
+
+        private void start()
+        {
+            adjustableClock.Start();
+        }
+
+        protected override void OnSuspending(Screen next)
+        {
+            fadeOut();
+            base.OnSuspending(next);
+        }
+
+        protected override bool OnExiting(Screen next)
+        {
+            Remove(RulesetNetworkingClientHandler);
+            fadeOut();
+            return base.OnExiting(next);
+        }
+
+        protected override void UpdateBackgroundElements()
+        {
+            if (!IsCurrentScreen) return;
+
+            base.UpdateBackgroundElements();
+
+            if (ShowStoryboard && storyboard == null)
+                initializeStoryboard(true);
+
+            var beatmap = Beatmap.Value;
+            var storyboardVisible = ShowStoryboard && beatmap.Storyboard.HasDrawable;
+
+            storyboardContainer?
+                .FadeColour(OsuColour.Gray(BackgroundOpacity), BACKGROUND_FADE_DURATION, Easing.OutQuint)
+                .FadeTo(storyboardVisible && BackgroundOpacity > 0 ? 1 : 0, BACKGROUND_FADE_DURATION, Easing.OutQuint);
+
+            if (storyboardVisible && beatmap.Storyboard.ReplacesBackground)
+                Background?.FadeTo(0, BACKGROUND_FADE_DURATION, Easing.OutQuint);
+        }
+
+        private void fadeOut()
+        {
+            const float fade_out_duration = 250;
+
+            RulesetContainer?.FadeOut(fade_out_duration);
+            Content.FadeOut(fade_out_duration);
+
+            hudOverlay?.ScaleTo(0.7f, fade_out_duration * 3, Easing.In);
+
+            Background?.FadeTo(1f, fade_out_duration);
+        }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Key == Key.Escape)
+                BackOut();
+
+            return base.OnKeyDown(state, args);
+        }
+
+        public void BackOut()
+        {
+            RulesetNetworkingClientHandler.AbortGame();
+            RulesetNetworkingClientHandler.OnAbort();
+        }
+
+        protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value;
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Screens/RulesetLobbyScreen.cs

@@ -0,0 +1,228 @@
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
+using osu.Game.Screens;
+using System;
+using osu.Framework.Screens;
+using System.Collections.Generic;
+using Symcol.Core.Networking;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Screens
+{
+    public abstract class RulesetLobbyScreen : OsuScreen
+    {
+        public abstract string RulesetName { get; }
+
+        public abstract RulesetMatchScreen MatchScreen { get; }
+
+        public RulesetNetworkingClientHandler RulesetNetworkingClientHandler;
+
+        public readonly SettingsButton HostGameButton;
+        public readonly SettingsButton DirectConnectButton;
+        public readonly SettingsButton JoinGameButton;
+
+        public readonly Container NewGame;
+        protected readonly TextBox HostIP;
+        protected readonly TextBox HostPort;
+        //protected readonly TextBox PublicIp;
+        protected readonly TextBox LocalIp;
+
+        public readonly Container JoinIP;
+
+        public RulesetLobbyScreen()
+        {
+            AlwaysPresent = true;
+            RelativeSizeAxes = Axes.Both;
+
+            Children = new Drawable[]
+            {
+                HostGameButton = new SettingsButton
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.3f,
+                    Text = "Host Game",
+                    Action = HostGame
+                },
+                DirectConnectButton = new SettingsButton
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.3f,
+                    Text = "Direct Connect",
+                    Action = DirectConnect
+                },
+                JoinGameButton = new SettingsButton
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.3f,
+                    Text = "Join Game"
+                },
+                NewGame = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Masking = true,
+                    Size = new Vector2(400, 300),
+
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.Blue,
+                            RelativeSizeAxes = Axes.Both
+                        },
+                        new Box
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                            Colour = Color4.Black,
+                            Alpha = 0.9f,
+                            RelativeSizeAxes = Axes.X,
+                            Width = 0.48f,
+                            Height = 20,
+                        },
+                        HostIP = new TextBox
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                            RelativeSizeAxes = Axes.X,
+                            Width = 0.48f,
+                            Height = 20,
+                            Text = "Host IP Address"
+                        },
+                        new Box
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            Colour = Color4.Black,
+                            Alpha = 0.9f,
+                            RelativeSizeAxes = Axes.X,
+                            Width = 0.48f,
+                            Height = 20,
+                        },
+                        HostPort = new TextBox
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            RelativeSizeAxes = Axes.X,
+                            Width = 0.48f,
+                            Height = 20,
+                            Text = "25570"
+                        },
+                        /*
+                        new Box
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                            Colour = Color4.Black,
+                            Alpha = 0.9f,
+                            RelativeSizeAxes = Axes.X,
+                            Position = new Vector2(0, 22),
+                            Width = 0.48f,
+                            Height = 20,
+                        },
+                        PublicIp = new TextBox
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                            RelativeSizeAxes = Axes.X,
+                            Position = new Vector2(0, 22),
+                            Width = 0.48f,
+                            Height = 20,
+                            Text = "You're Public IP Address"
+                        },
+                        */
+                        new Box
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                            Colour = Color4.Black,
+                            Alpha = 0.9f,
+                            RelativeSizeAxes = Axes.X,
+                            Position = new Vector2(0, 44),
+                            Width = 0.48f,
+                            Height = 20,
+                        },
+                        LocalIp = new TextBox
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                            RelativeSizeAxes = Axes.X,
+                            Position = new Vector2(0, 44),
+                            Width = 0.48f,
+                            Height = 20,
+                            Text = "You're Local IP Address"
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void OnEntering(Screen last)
+        {
+            base.OnEntering(last);
+            MakeCurrent();
+        }
+
+        protected override void OnResuming(Screen last)
+        {
+            base.OnResuming(last);
+            MakeCurrent();
+        }
+
+        protected override bool OnExiting(Screen next)
+        {
+            if (RulesetNetworkingClientHandler != null)
+            {
+                Remove(RulesetNetworkingClientHandler);
+                RulesetNetworkingClientHandler.Dispose();
+            }
+
+            return base.OnExiting(next);
+        }
+
+        protected virtual void HostGame()
+        {
+            if (RulesetNetworkingClientHandler != null)
+            {
+                Remove(RulesetNetworkingClientHandler);
+                RulesetNetworkingClientHandler.Dispose();
+            }
+            Add(RulesetNetworkingClientHandler = new RulesetNetworkingClientHandler(ClientType.Host, LocalIp.Text, Int32.Parse(HostPort.Text)));
+
+            List<ClientInfo> list = new List<ClientInfo>();
+            list.Add(RulesetNetworkingClientHandler.RulesetClientInfo);
+
+            JoinMatch(list);
+        }
+
+        protected virtual void DirectConnect()
+        {
+            if (RulesetNetworkingClientHandler != null)
+            {
+                Remove(RulesetNetworkingClientHandler);
+                RulesetNetworkingClientHandler.Dispose();
+            }
+            Add(RulesetNetworkingClientHandler = new RulesetNetworkingClientHandler(ClientType.Peer, HostIP.Text, Int32.Parse(HostPort.Text), LocalIp.Text));
+
+            RulesetNetworkingClientHandler.OnConnectedToHost += (p) => JoinMatch(p);
+        }
+
+        protected virtual void JoinMatch(List<ClientInfo> clientInfos)
+        {
+            Remove(RulesetNetworkingClientHandler);
+            MakeCurrent();
+            Push(MatchScreen);
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Screens/RulesetMatchScreen.cs

@@ -0,0 +1,151 @@
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Screens;
+using osu.Game;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays.Settings;
+using osu.Game.Screens;
+using Symcol.Core.Networking;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+using Symcol.Rulesets.Core.Multiplayer.Pieces;
+using System.Collections.Generic;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Screens
+{
+    public abstract class RulesetMatchScreen : OsuScreen
+    {
+        public readonly RulesetNetworkingClientHandler RulesetNetworkingClientHandler;
+
+        private readonly MatchPlayerList playerList;
+
+        private BeatmapManager beatmaps;
+
+        protected MatchTools MatchTools;
+
+        private readonly Chat chat;
+
+        public RulesetMatchScreen(RulesetNetworkingClientHandler rulesetNetworkingClientHandler)
+        {
+            RulesetNetworkingClientHandler = rulesetNetworkingClientHandler;
+
+            Children = new Drawable[]
+            {
+                new SettingsButton
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.35f,
+                    Text = "Leave",
+                    Action = () => Exit()
+                },
+                new SettingsButton
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.3f,
+                    Text = "Open Song Select",
+                    Action = () => openSongSelect()
+                },
+                new SettingsButton
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.35f,
+                    Text = "Start Match",
+                    Action = () => RulesetNetworkingClientHandler.StartLoadingGame()
+                },
+                playerList = new MatchPlayerList(RulesetNetworkingClientHandler),
+                MatchTools = new MatchTools(),
+                chat = new Chat(RulesetNetworkingClientHandler)
+            };
+
+            RulesetNetworkingClientHandler.OnPacketReceive += (Packet packet) =>
+            {
+                if (packet is RulesetPacket rulesetPacket && rulesetPacket.OnlineBeatmapID != -1)
+                    foreach (BeatmapSetInfo beatmapSet in beatmaps.GetAllUsableBeatmapSets())
+                        if (beatmapSet.OnlineBeatmapSetID == rulesetPacket.OnlineBeatmapSetID)
+                        {
+                            foreach (BeatmapInfo beatmap in beatmapSet.Beatmaps)
+                                if (beatmap.OnlineBeatmapID == rulesetPacket.OnlineBeatmapID)
+                                {
+                                    Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, Beatmap.Value);
+                                    Beatmap.Value.Track.Start();
+                                    MatchTools.MapChange(Beatmap);
+                                    RulesetNetworkingClientHandler.OnMapChange?.Invoke(Beatmap);
+                                    break;
+                                }
+                            break;
+                        }
+                        else
+                            MatchTools.MapChange(rulesetPacket.OnlineBeatmapSetID);
+            };
+
+            RulesetNetworkingClientHandler.OnMapChange += (beatmap) => MatchTools.MapChange(beatmap);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            playerList.Add(RulesetNetworkingClientHandler.RulesetClientInfo);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(BeatmapManager beatmaps)
+        {
+            this.beatmaps = beatmaps;
+        }
+
+        protected override void OnEntering(Screen last)
+        {
+            base.OnEntering(last);
+            MakeCurrent();
+            Add(RulesetNetworkingClientHandler);
+            RulesetNetworkingClientHandler.OnLoadGame = (i) => Load(i);
+        }
+
+        protected override void OnResuming(Screen last)
+        {
+            base.OnResuming(last);
+            MakeCurrent();
+            if (RulesetNetworkingClientHandler != null)
+                Add(RulesetNetworkingClientHandler);
+        }
+
+        protected override void OnSuspending(Screen next)
+        {
+            base.OnSuspending(next);
+            Remove(RulesetNetworkingClientHandler);
+        }
+
+        protected override bool OnExiting(Screen next)
+        {
+            RulesetNetworkingClientHandler.Disconnect();
+            Remove(RulesetNetworkingClientHandler);
+            RulesetNetworkingClientHandler.Dispose();
+
+            return base.OnExiting(next);
+        }
+
+        protected virtual void Load(List<ClientInfo> playerList)
+        {
+            MakeCurrent();
+            Push(new MultiPlayer(RulesetNetworkingClientHandler, playerList));
+        }
+
+        private void openSongSelect()
+        {
+            MatchSongSelect songSelect = new MatchSongSelect(RulesetNetworkingClientHandler);
+            MakeCurrent();
+            Push(songSelect);
+            songSelect.Action = () => RulesetNetworkingClientHandler.SetMap(songSelect.SelectedMap);
+        }
+    }
+}

Symcol.Rulesets.Core/Multiplayer/Screens/RulesetMultiplayerSelection.cs

@@ -0,0 +1,108 @@
+//osu.Game.Screens.Symcol.SymcolMenu
+//Symcol.Rulesets.Core.SymcolSettingsSubsection
+#define SymcolMods
+
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Screens;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Screens;
+using osu.Game.Screens.Symcol;
+
+namespace Symcol.Rulesets.Core.Multiplayer.Screens
+{
+    public class RulesetMultiplayerSelection : OsuScreen
+    {
+        public static readonly FillFlowContainer<RulesetLobbyItem> LobbyItems = new FillFlowContainer<RulesetLobbyItem>
+        {
+            RelativeSizeAxes = Axes.Both,
+            Width = 0.85f,
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopCentre,
+        };
+
+        public RulesetMultiplayerSelection()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            Add(LobbyItems);
+        }
+
+        protected override void OnEntering(Screen last)
+        {
+            base.OnEntering(last);
+            foreach (RulesetLobbyItem item in LobbyItems)
+                item.Action = () => Push(item.RulesetLobbyScreen);
+        }
+
+        protected override bool OnExiting(Screen next)
+        {
+            Remove(LobbyItems);
+
+#if SymcolMods
+            SymcolSettingsSubsection.RulesetMultiplayerSelection = new RulesetMultiplayerSelection();
+
+            SymcolMenu.RulesetMultiplayerScreen = SymcolSettingsSubsection.RulesetMultiplayerSelection;
+#endif
+
+            return base.OnExiting(next);
+        }
+    }
+
+    public abstract class RulesetLobbyItem : ClickableContainer
+    {
+        public abstract Texture Icon { get; }
+
+        public abstract string RulesetName { get; }
+
+        public virtual Texture Background { get; }
+
+        public abstract RulesetLobbyScreen RulesetLobbyScreen { get; }
+
+        public RulesetLobbyItem()
+        {
+            CornerRadius = 20;
+            Masking = true;
+            RelativeSizeAxes = Axes.X;
+            Height = 100;
+
+            Children = new Drawable[]
+            {
+                new Sprite
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode  = FillMode.Fill,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = Background
+                },
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                    Alpha = 0.5f,
+                },
+                new Sprite
+                {
+                    Size = new Vector2(Height),
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Texture = Icon
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Text = RulesetName,
+                    TextSize = 60,
+                    Position = new Vector2(-20, 0)
+                }
+            };
+        }
+    }
+}

Symcol.Rulesets.Core/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Symcol.Rulesets.Core")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Symcol.Rulesets.Core")]
+[assembly: AssemblyCopyright("Copyright © Shawdooow 2018")]
+[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("552b5940-c647-4060-aa4d-61baac415c72")]
+
+// 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")]

Symcol.Rulesets.Core/Skinning/SkinElement.cs

@@ -0,0 +1,97 @@
+using osu.Framework.Configuration;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
+
+namespace Symcol.Rulesets.Core.Skinning
+{
+    public abstract class SkinElement : Container
+    {
+        private static string loadedSkin;
+
+        private static ResourceStore<byte[]> skinResources;
+        private static TextureStore skinTextures;
+
+        /// <summary>
+        /// Will attempt to get a skin element fron the skin, if no element is found return the default element
+        /// </summary>
+        /// <param name="stockTextures"></param>
+        /// <param name="skin"></param>
+        /// <param name="fileName"></param>
+        /// <param name="storage"></param>
+        /// <returns></returns>
+        public static Texture GetSkinElement(TextureStore stockTextures, Bindable<string> skin, string fileName, Storage storage)
+        {
+            Texture texture = null;
+
+            string fileNameHd = fileName + "@2x";
+
+            Storage skinStorage = storage.GetStorageForDirectory("Skins\\" + skin);
+
+            if (skin.Value == "default")
+            {
+                texture = stockTextures.Get(fileName + ".png");
+
+                if (texture == null)
+                    texture = stockTextures.Get(fileNameHd + ".png");
+
+                return texture;
+            }
+
+            if (loadedSkin != skin.ToString())
+            {
+                loadedSkin = skin.ToString();
+                skinResources = new ResourceStore<byte[]>(new StorageBackedResourceStore(skinStorage));
+                skinTextures = new TextureStore(new RawTextureLoaderStore(skinResources));
+            }
+
+            if (skinStorage.Exists(fileNameHd + ".png"))
+                texture = skinTextures.Get(fileNameHd + ".png");
+            else if (skinStorage.Exists(fileName + ".png"))
+            {
+                texture = skinTextures.Get(fileName + ".png");
+                texture.ScaleAdjust = 1f;
+            }
+            else
+                texture = stockTextures.Get(fileNameHd + ".png");
+
+            return texture;
+        }
+
+        /// <summary>
+        /// Will attempt to get a skin element from the skin, if no element is found return null
+        /// </summary>
+        /// <param name="skin"></param>
+        /// <param name="fileName"></param>
+        /// <param name="storage"></param>
+        /// <returns></returns>
+        public static Texture GetElement(Bindable<string> skin, string fileName, Storage storage)
+        {
+            Texture texture = null;
+
+            string fileNameHd = fileName + "@2x";
+
+            Storage skinStorage = storage.GetStorageForDirectory("Skins\\" + skin);
+
+            if (loadedSkin != skin.ToString())
+            {
+                loadedSkin = skin.ToString();
+                skinResources = new ResourceStore<byte[]>(new StorageBackedResourceStore(skinStorage));
+                skinTextures = new TextureStore(new RawTextureLoaderStore(skinResources));
+            }
+
+            if (skinStorage.Exists(fileNameHd + ".png"))
+                texture = skinTextures.Get(fileNameHd + ".png");
+            else if (skinStorage.Exists(fileName + ".png"))
+            {
+                texture = skinTextures.Get(fileName + ".png");
+                texture.ScaleAdjust = 1f;
+            }
+            else
+                texture = null;
+
+            return texture;
+        }
+    }
+}

Symcol.Rulesets.Core/Skinning/SkinIniReader.cs

@@ -0,0 +1,25 @@
+using osu.Framework.Configuration;
+using osu.Framework.Platform;
+
+namespace Symcol.Rulesets.Core.Skinning
+{
+    public class SkinConfigReader<T> : IniConfigManager<T>
+        where T : struct
+    {
+        protected override string Filename => @"skin.ini";
+
+        public SkinConfigReader(Storage storage) : base(storage) { }
+
+        protected override bool PerformSave() { return false; }
+    }
+
+    //wildly incomplete
+    public enum ClassicIniParameters
+    {
+        Name,
+        Author,
+        CursorRotate,
+        CursorExpand,
+        CursorCentre
+    }
+}

Symcol.Rulesets.Core/Symcol.Rulesets.Core.csproj

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" 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>{552B5940-C647-4060-AA4D-61BAAC415C72}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Symcol.Rulesets.Core</RootNamespace>
+    <AssemblyName>Symcol.Rulesets.Core</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4" />
+    <Reference Include="System" />
+    <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="Containers\LinkText.cs" />
+    <Compile Include="Containers\ProfileLink.cs" />
+    <Compile Include="HitObjects\DrawableSymcolHitObject.cs" />
+    <Compile Include="Multiplayer\Networking\ScorePacket.cs" />
+    <Compile Include="Multiplayer\Pieces\Chat.cs" />
+    <Compile Include="Multiplayer\Pieces\ChatMessage.cs" />
+    <Compile Include="Multiplayer\Networking\ChatPacket.cs" />
+    <Compile Include="Multiplayer\Pieces\MatchTools.cs" />
+    <Compile Include="Multiplayer\Networking\RulesetClientInfo.cs" />
+    <Compile Include="Multiplayer\Pieces\MatchPlayer.cs" />
+    <Compile Include="Multiplayer\Pieces\MatchPlayerList.cs" />
+    <Compile Include="Multiplayer\Options\MultiplayerDropdownEnumOption.cs" />
+    <Compile Include="Multiplayer\Options\MultiplayerOption.cs" />
+    <Compile Include="Multiplayer\Options\MultiplayerToggleOption.cs" />
+    <Compile Include="Multiplayer\Pieces\MultiplayerScoreboard.cs" />
+    <Compile Include="Multiplayer\Pieces\MultiplayerScoreboardItem.cs" />
+    <Compile Include="Multiplayer\Screens\MatchSongSelect.cs" />
+    <Compile Include="Multiplayer\Screens\MultiPlayer.cs" />
+    <Compile Include="Multiplayer\Screens\RulesetLobbyScreen.cs" />
+    <Compile Include="Multiplayer\Screens\RulesetMatchScreen.cs" />
+    <Compile Include="Multiplayer\Screens\RulesetMultiplayerSelection.cs" />
+    <Compile Include="Multiplayer\Networking\RulesetNetworkingClientHandler.cs" />
+    <Compile Include="Multiplayer\Networking\RulesetPacket.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Skinning\SkinElement.cs" />
+    <Compile Include="Skinning\SkinIniReader.cs" />
+    <Compile Include="SymcolConfigManager.cs" />
+    <Compile Include="SymcolPlayfield.cs" />
+    <Compile Include="SymcolSettingsSubsection.cs" />
+    <Compile Include="SymcolInputManager.cs" />
+    <Compile Include="VectorVideos\VectorVideo.cs" />
+    <Compile Include="Wiki\WikiOptionEnumExplanation.cs" />
+    <Compile Include="Wiki\WikiParagraph.cs" />
+    <Compile Include="Wiki\WikiSubSectionHeader.cs" />
+    <Compile Include="Wiki\WikiOverlay.cs" />
+    <Compile Include="Wiki\WikiHeader.cs" />
+    <Compile Include="Wiki\WikiSection.cs" />
+    <Compile Include="Wiki\WikiSubSectionLinkHeader.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu-Framework\osu.Framework\osu.Framework.csproj">
+      <Project>{c76bf5b3-985e-4d39-95fe-97c9c879b83a}</Project>
+      <Name>osu.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj">
+      <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
+      <Name>osu.Game.Resources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
+      <Project>{2a66dd92-adb1-4994-89e2-c94e04acda0d}</Project>
+      <Name>osu.Game</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Symcol.Core\Symcol.Core.csproj">
+      <Project>{F34AC16C-E590-4D70-A069-A748326852BF}</Project>
+      <Name>Symcol.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

Symcol.Rulesets.Core/SymcolConfigManager.cs

@@ -0,0 +1,22 @@
+using osu.Framework.Configuration;
+using osu.Framework.Platform;
+
+namespace Symcol.Rulesets.Core
+{
+    public class SymcolConfigManager : IniConfigManager<SymcolSetting>
+    {
+        protected override string Filename => "symcol.ini";
+
+        public SymcolConfigManager(Storage storage) : base(storage) { }
+
+        protected override void InitialiseDefaults()
+        {
+            Set(SymcolSetting.PlayerColor, "#ffffff");
+        }
+    }
+
+    public enum SymcolSetting
+    {
+        PlayerColor
+    }
+}

Symcol.Rulesets.Core/SymcolInputManager.cs

@@ -0,0 +1,19 @@
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.UI;
+using Symcol.Rulesets.Core.VectorVideos;
+
+namespace Symcol.Rulesets.Core
+{
+    public class SymcolInputManager<T> : RulesetInputManager<T>
+        where T : struct
+    {
+        protected virtual bool VectorVideo => false;
+
+        public SymcolInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique) : base(ruleset, variant, unique)
+        {
+            Child = new VectorVideo();
+        }
+    }
+}

Symcol.Rulesets.Core/SymcolPlayfield.cs

@@ -0,0 +1,15 @@
+using OpenTK;
+using osu.Game.Rulesets.UI;
+using Symcol.Rulesets.Core.Multiplayer.Networking;
+
+namespace Symcol.Rulesets.Core
+{
+    public class SymcolPlayfield : Playfield
+    {
+        public static RulesetNetworkingClientHandler RulesetNetworkingClientHandler;
+
+        public SymcolPlayfield(Vector2 size) : base(size.X)
+        {
+        }
+    }
+}

Symcol.Rulesets.Core/SymcolSettingsSubsection.cs

@@ -0,0 +1,65 @@
+//osu.Game.Screens.Symcol.SymcolMenu
+//Symcol.Rulesets.Core.Multiplayer.Screens.RulesetMultiplayerSelection
+#define SymcolMods
+
+using osu.Framework.Allocation;
+using osu.Game;
+using osu.Game.Overlays.Settings;
+using Symcol.Rulesets.Core.Wiki;
+using osu.Game.Screens.Symcol;
+using Symcol.Rulesets.Core.Multiplayer.Screens;
+using osu.Framework.Platform;
+using osu.Framework.Logging;
+
+namespace Symcol.Rulesets.Core
+{
+    public abstract class SymcolSettingsSubsection : SettingsSubsection
+    {
+        public virtual WikiOverlay Wiki => null;
+
+        public virtual RulesetLobbyItem RulesetLobbyItem => null;
+
+#if SymcolMods
+        public static RulesetMultiplayerSelection RulesetMultiplayerSelection;
+#endif
+
+        public static SymcolConfigManager SymcolConfigManager;
+
+        private OsuGame osu;
+
+        public SymcolSettingsSubsection()
+        {
+
+#if SymcolMods
+                if (RulesetLobbyItem != null)
+                    RulesetMultiplayerSelection.LobbyItems.Add(RulesetLobbyItem);
+
+                if (RulesetMultiplayerSelection == null)
+                    RulesetMultiplayerSelection = new RulesetMultiplayerSelection();
+
+                SymcolMenu.RulesetMultiplayerScreen = RulesetMultiplayerSelection;
+#endif
+#if !SymcolMods
+            Logger.Log("osu.Game mods not installed! Online Multiplayer will not be avalible without them. . .", LoggingTarget.Information, LogLevel.Important);
+#endif
+
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuGame osu, Storage storage)
+        {
+            this.osu = osu;
+
+            if (SymcolConfigManager == null)
+                SymcolConfigManager = new SymcolConfigManager(storage);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (Wiki != null)
+                osu.Add(Wiki);
+        }
+    }
+}

Symcol.Rulesets.Core/VectorVideos/VectorVideo.cs

@@ -0,0 +1,59 @@
+using OpenTK;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Logging;
+using osu.Framework.Platform;
+using osu.Game.Graphics.Containers;
+
+namespace Symcol.Rulesets.Core.VectorVideos
+{
+    public class VectorVideo : BeatSyncedContainer
+    {
+        public const string FILE_NAME = "VectorVideo.symcol";
+
+        [BackgroundDependencyLoader]
+        private void load(Storage storage)
+        {
+        }
+
+        protected void LoadContent(string args)
+        {
+            string[] parameters = args.Split(',');
+
+            ObjectType objectType = ObjectType.LogoVisualizer;
+            Anchor anchor = Anchor.Centre;
+            Anchor origin = Anchor.Centre;
+
+            bool checkingType = false;
+
+            foreach (string parameter in parameters)
+            {
+                string[] subParameters = parameter.Split('=');
+
+                foreach (string subParameter in subParameters)
+                {
+                    if (subParameter == "Type")
+                        checkingType = true;
+
+                    if (checkingType)
+                        switch (subParameter)
+                        {
+                            case "LogoVisualizer":
+                                objectType = ObjectType.LogoVisualizer;
+                                break;
+                        }
+                }
+            }
+        }
+
+        private void loadLogoVisualizer()
+        {
+
+        }
+    }
+
+    public enum ObjectType
+    {
+        LogoVisualizer
+    }
+}

Symcol.Rulesets.Core/Wiki/WikiHeader.cs

@@ -0,0 +1,114 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Users;
+using osu.Game.Graphics.Containers;
+using OpenTK;
+using osu.Framework.Graphics.Shapes;
+using OpenTK.Graphics;
+using Symcol.Rulesets.Core.Containers;
+
+namespace Symcol.Rulesets.Core.Wiki
+{
+    public abstract class WikiHeader : Container
+    {
+        protected abstract Texture RulesetIcon { get; }
+
+        protected abstract string RulesetName { get; }
+
+        protected abstract string RulesetDescription { get; }
+
+        protected virtual string RulesetUrl => $@"https://osu.ppy.sh/home";
+
+        protected virtual User Creator => null;
+
+        protected virtual User Maintainer => null;
+
+        protected virtual string DiscordInvite => $@"https://discord.gg/ppy";
+
+        protected virtual Texture HeaderBackground => null;
+
+        private const float description_height = 150;
+        private const float description_width = 220;
+        private const float icon_size = 200;
+        private const float header_margin = 50;
+        private const float rulesetname_height = 60;
+
+        public WikiHeader()
+        {
+            Masking = true;
+            RelativeSizeAxes = Axes.X;
+            Height = header_margin + icon_size + rulesetname_height;
+
+
+            var user = Creator;
+            bool maintainer = false;
+            string userTitle = "Creator";
+            if (Creator == null)
+            {
+                user = Maintainer;
+                maintainer = true;
+                userTitle = "Maintainer";
+            }
+
+            Children = new Drawable[]
+            {
+                new Sprite
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode  = FillMode.Fill,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = HeaderBackground
+                },
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                    Alpha = 0.5f,
+                },
+                new Sprite
+                {
+                    Size = new Vector2(icon_size),
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Texture = RulesetIcon
+                },
+                new LinkText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(10, icon_size),
+                    Text = RulesetName,
+                    Url = RulesetUrl,
+                    Font = @"Exo2.0-RegularItalic",
+                    TextSize = rulesetname_height
+                },
+                new ProfileLink(user, maintainer)
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(10, icon_size + rulesetname_height),
+                },
+                new LinkText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(10, icon_size + rulesetname_height + 20),
+                    Text = userTitle + "'s Discord server",
+                    Url = DiscordInvite,
+                    Font = @"Exo2.0-RegularItalic",
+                    TextSize = 16
+                },
+                new OsuTextFlowContainer(t => { t.TextSize = 20; })
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Size = new Vector2(description_width, description_height),
+                    Text = RulesetDescription
+                }
+            };
+        }
+    }
+}

Symcol.Rulesets.Core/Wiki/WikiOptionEnumExplanation.cs

@@ -0,0 +1,78 @@
+using OpenTK;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Overlays.Settings;
+
+namespace Symcol.Rulesets.Core.Wiki
+{
+    public class WikiOptionEnumExplanation<T> : Container
+        where T : struct
+    {
+        public OsuTextFlowContainer Description;
+
+        public WikiOptionEnumExplanation(Bindable<T> bindable)
+        {
+            OsuColour osu = new OsuColour();
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+            Masking = true;
+
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Colour = osu.Yellow,
+                    Masking = true,
+                    RelativeSizeAxes = Axes.Y,
+                    Size = new Vector2(10, 0.98f),
+                    CornerRadius = 5,
+
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    }
+                },
+                new Container
+                {
+                    Position = new Vector2(-10, 0),
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.45f,
+
+                    Child = new SettingsEnumDropdown<T>
+                    {
+                        Bindable = bindable
+                    }
+                },
+                new Container
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.45f,
+                    AutoSizeAxes = Axes.Y,
+                    AutoSizeDuration = 100,
+                    AutoSizeEasing = Easing.OutQuint,
+
+                    Child = Description = new OsuTextFlowContainer(t => { t.TextSize = 20; })
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y
+                    }
+                }
+            };
+        }
+    }
+}

Symcol.Rulesets.Core/Wiki/WikiOverlay.cs

@@ -0,0 +1,147 @@
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using System.Linq;
+
+namespace Symcol.Rulesets.Core.Wiki
+{
+    public abstract class WikiOverlay : WaveOverlayContainer
+    {
+        protected abstract WikiHeader Header { get; }
+        protected abstract WikiSection[] Sections { get; }
+
+        private WikiSection lastSection;
+        private SectionsContainer<WikiSection> sectionsContainer;
+        private WikiTabControl tabs;
+
+        public const float CONTENT_X_MARGIN = 100;
+
+        public WikiOverlay()
+        {
+            FirstWaveColour = OsuColour.Gray(0.4f);
+            SecondWaveColour = OsuColour.Gray(0.3f);
+            ThirdWaveColour = OsuColour.Gray(0.2f);
+            FourthWaveColour = OsuColour.Gray(0.1f);
+
+            RelativeSizeAxes = Axes.Both;
+            RelativePositionAxes = Axes.Both;
+            Width = 0.85f;
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+
+            Masking = true;
+            AlwaysPresent = true;
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Colour = Color4.Black.Opacity(0),
+                Type = EdgeEffectType.Shadow,
+                Radius = 10
+            };
+
+            tabs = new WikiTabControl
+            {
+                RelativeSizeAxes = Axes.X,
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                Height = 30
+            };
+
+            Add(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = OsuColour.Gray(0.2f)
+            });
+
+            Add(sectionsContainer = new SectionsContainer<WikiSection>
+            {
+                RelativeSizeAxes = Axes.Both,
+                ExpandableHeader = Header,
+                FixedHeader = tabs,
+                HeaderBackground = new Box
+                {
+                    Colour = OsuColour.Gray(34),
+                    RelativeSizeAxes = Axes.Both
+                }
+            });
+
+            sectionsContainer.SelectedSection.ValueChanged += s =>
+            {
+                if (lastSection != s)
+                {
+                    lastSection = s;
+                    tabs.Current.Value = lastSection;
+                }
+            };
+
+            tabs.Current.ValueChanged += s =>
+            {
+                if (lastSection == null)
+                {
+                    lastSection = sectionsContainer.Children.FirstOrDefault();
+                    if (lastSection != null)
+                        tabs.Current.Value = lastSection;
+                    return;
+                }
+                if (lastSection != s)
+                {
+                    lastSection = s;
+                    sectionsContainer.ScrollTo(lastSection);
+                }
+            };
+
+            foreach (WikiSection sec in Sections)
+            {
+                if (sec != null)
+                {
+                    sectionsContainer.Add(sec);
+                    tabs.AddItem(sec);
+                }
+            }
+
+            sectionsContainer.ScrollToTop();
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+            FadeEdgeEffectTo(0.5f, APPEAR_DURATION, Easing.In);
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+            FadeEdgeEffectTo(0, DISAPPEAR_DURATION, Easing.Out);
+        }
+
+        private class WikiTabControl : PageTabControl<WikiSection>
+        {
+            public WikiTabControl()
+            {
+                TabContainer.RelativeSizeAxes &= ~Axes.X;
+                TabContainer.AutoSizeAxes |= Axes.X;
+                TabContainer.Anchor |= Anchor.x1;
+                TabContainer.Origin |= Anchor.x1;
+            }
+
+            protected override TabItem<WikiSection> CreateTabItem(WikiSection value) => new WikiTabItem(value);
+
+            protected override Dropdown<WikiSection> CreateDropdown() => null;
+
+            private class WikiTabItem : PageTabItem
+            {
+                public WikiTabItem(WikiSection value) : base(value)
+                {
+                    Text.Text = value.Title;
+                }
+            }
+        }
+
+    }
+}

Symcol.Rulesets.Core/Wiki/WikiParagraph.cs

@@ -0,0 +1,63 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+
+namespace Symcol.Rulesets.Core.Wiki
+{
+    public class WikiParagraph : Container
+    {
+        public WikiParagraph(string text, float textsize = 20)
+        {
+            paragraphNoMarkdown(text, textsize);
+        }
+
+        public WikiParagraph(string text, bool markdown)
+        {
+            if (!markdown)
+                paragraphNoMarkdown(text, 20);
+            else
+                paragraphMarkdown(text, 20);
+        }
+        public WikiParagraph(string text, float textsize, bool markdown)
+        {
+            if (!markdown)
+                paragraphNoMarkdown(text, textsize);
+            else
+                paragraphMarkdown(text, textsize);
+        }
+
+        private void paragraphNoMarkdown(string text, float textsize)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+
+            Child = new OsuTextFlowContainer(t => { t.TextSize = textsize; })
+            {
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Text = text
+            };
+        }
+
+        private void paragraphMarkdown(string text, float textsize)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+
+            Child = new OsuTextFlowContainer(t => { t.TextSize = textsize; })
+            {
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Text = text
+            };
+        }
+    }
+}

Symcol.Rulesets.Core/Wiki/WikiSection.cs

@@ -0,0 +1,59 @@
+using OpenTK;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace Symcol.Rulesets.Core.Wiki
+{
+    public abstract class WikiSection : FillFlowContainer
+    {
+        public abstract string Title { get; }
+
+        private readonly FillFlowContainer content;
+
+        protected override Container<Drawable> Content => content;
+
+        protected WikiSection()
+        {
+            OsuColour osu = new OsuColour();
+            Direction = FillDirection.Vertical;
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+            InternalChildren = new Drawable[]
+            {
+                new OsuSpriteText
+                {
+                    Colour = osu.Yellow,
+                    Text = Title,
+                    TextSize = 32,
+                    Font = @"Exo2.0-Bold",
+                    Margin = new MarginPadding
+                    {
+                        Horizontal = WikiOverlay.CONTENT_X_MARGIN,
+                        Vertical = 12
+                    }
+                },
+                content = new FillFlowContainer
+                {
+                    Direction = FillDirection.Vertical,
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Padding = new MarginPadding
+                    {
+                        Horizontal = WikiOverlay.CONTENT_X_MARGIN,
+                        Bottom = 20
+                    }
+                },
+                new Box
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 1,
+                    Colour = OsuColour.Gray(34),
+                    EdgeSmoothness = new Vector2(1)
+                }
+            };
+        }
+    }
+}

Symcol.Rulesets.Core/Wiki/WikiSubSectionHeader.cs

@@ -0,0 +1,22 @@
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace Symcol.Rulesets.Core.Wiki
+{
+    public class WikiSubSectionHeader : OsuSpriteText
+    {
+        public WikiSubSectionHeader(string text)
+        {
+            OsuColour osu = new OsuColour();
+            Colour = osu.Pink;
+            Text = text;
+            TextSize = 24;
+            Font = @"Exo2.0-BoldItalic";
+            Margin = new MarginPadding
+            {
+                Vertical = 10
+            };
+        }
+    }
+}

Symcol.Rulesets.Core/Wiki/WikiSubSectionLinkHeader.cs

@@ -0,0 +1,28 @@
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using Symcol.Rulesets.Core.Containers;
+
+namespace Symcol.Rulesets.Core.Wiki
+{
+    public class WikiSubSectionLinkHeader : LinkText
+    {
+        public override string Tooltip => tooltip;
+
+        private string tooltip = "";
+
+        public WikiSubSectionLinkHeader(string text, string url, string tooltip = "")
+        {
+            this.tooltip = tooltip;
+            Url = url;
+            OsuColour osu = new OsuColour();
+            Colour = osu.Pink;
+            Text = text;
+            TextSize = 24;
+            Font = @"Exo2.0-BoldItalic";
+            Margin = new MarginPadding
+            {
+                Vertical = 10
+            };
+        }
+    }
+}

appveyor.yml

@@ -1,8 +1,29 @@
-clone_depth: 1
-version: '{branch}-{build}'
-image: Previous Visual Studio 2017
-test: off
-install:
-  - cmd: git submodule update --init --recursive --depth=5
-build_script:
-  - cmd: PowerShell -Version 2.0 .\build.ps1
+# 2017-09-14
+clone_depth: 1
+version: '{branch}-{build}'
+image: Visual Studio 2017
+configuration: Debug
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - inspectcode -> appveyor.yml
+  - packages -> **\packages.config
+install:
+  - cmd: git submodule update --init --recursive --depth=5
+  - cmd: choco install resharper-clt -y
+  - cmd: choco install nvika -y
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.4/CodeFileSanity.exe
+before_build:
+  - cmd: CodeFileSanity.exe
+  - cmd: nuget restore -verbosity quiet
+build:
+  project: osu.sln
+  parallel: true
+  verbosity: minimal
+test:
+  assemblies:
+    only:
+      - 'osu.Desktop\**\*.dll'
+after_build:
+  - cmd: inspectcode --o="inspectcodereport.xml" --projects:osu.Game* --caches-home="inspectcode" osu.sln > NUL
+  - cmd: NVika parsereport "inspectcodereport.xml" --treatwarningsaserrors

build.ps1

@@ -1,82 +0,0 @@
-##########################################################################
-# This is a customized Cake bootstrapper script for PowerShell.
-##########################################################################
-
-<#
-
-.SYNOPSIS
-This is a Powershell script to bootstrap a Cake build.
-
-.DESCRIPTION
-This Powershell script restores NuGet tools (including Cake)
-and execute your Cake build script with the parameters you provide.
-
-.PARAMETER Script
-The build script to execute.
-.PARAMETER Target
-The build script target to run.
-.PARAMETER Configuration
-The build configuration to use.
-.PARAMETER Verbosity
-Specifies the amount of information to be displayed.
-.PARAMETER ShowDescription
-Shows description about tasks.
-.PARAMETER DryRun
-Performs a dry run.
-.PARAMETER ScriptArgs
-Remaining arguments are added here.
-
-.LINK
-https://cakebuild.net
-
-#>
-
-[CmdletBinding()]
-Param(
-    [string]$Script = "build.cake",
-    [string]$Target,
-    [string]$Configuration,
-    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
-    [string]$Verbosity,
-    [switch]$ShowDescription,
-    [Alias("WhatIf", "Noop")]
-    [switch]$DryRun,
-    [Parameter(Position = 0, Mandatory = $false, ValueFromRemainingArguments = $true)]
-    [string[]]$ScriptArgs
-)
-
-Write-Host "Preparing to run build script..."
-
-# Determine the script root for resolving other paths.
-if(!$PSScriptRoot) {
-    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-}
-
-# Resolve the paths for resources used for debugging.
-$BUILD_DIR = Join-Path $PSScriptRoot "build"
-$TOOLS_DIR = Join-Path $BUILD_DIR "tools"
-$CAKE_CSPROJ = Join-Path $BUILD_DIR "cakebuild.csproj"
-
-# Install the required tools locally.
-Write-Host "Restoring cake tools..."
-Invoke-Expression "dotnet restore `"$CAKE_CSPROJ`" --packages `"$TOOLS_DIR`"" | Out-Null
-
-# Find the Cake executable
-$CAKE_EXECUTABLE = (Get-ChildItem -Path "$TOOLS_DIR/cake.coreclr/" -Filter Cake.dll -Recurse).FullName
-
-# Build Cake arguments
-$cakeArguments = @("$Script");
-if ($Target) { $cakeArguments += "-target=$Target" }
-if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
-if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
-if ($ShowDescription) { $cakeArguments += "-showdescription" }
-if ($DryRun) { $cakeArguments += "-dryrun" }
-if ($Experimental) { $cakeArguments += "-experimental" }
-$cakeArguments += $ScriptArgs
-
-# Start Cake
-Write-Host "Running build script..."
-Push-Location -Path $BUILD_DIR
-Invoke-Expression "dotnet `"$CAKE_EXECUTABLE`" $cakeArguments"
-Pop-Location
-exit $LASTEXITCODE

build.sh

@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-##########################################################################
-# This is a customized Cake bootstrapper script for Shell.
-##########################################################################
-
-echo "Preparing to run build script..."
-
-cd build
-SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-TOOLS_DIR=$SCRIPT_DIR/tools
-CAKE_BINARY_PATH=$TOOLS_DIR/"cake.coreclr"
-
-SCRIPT="build.cake"
-CAKE_CSPROJ=$SCRIPT_DIR/"cakebuild.csproj"
-
-# Parse arguments.
-CAKE_ARGUMENTS=()
-for i in "$@"; do
-    case $1 in
-        -s|--script) SCRIPT="$2"; shift ;;
-        --) shift; CAKE_ARGUMENTS+=("$@"); break ;;
-        *) CAKE_ARGUMENTS+=("$1") ;;
-    esac
-    shift
-done
-
-# Install the required tools locally.
-echo "Restoring cake tools..."
-dotnet restore $CAKE_CSPROJ --packages $TOOLS_DIR > /dev/null 2>&1
-
-# Search for the CakeBuild binary.
-CAKE_BINARY=$(find $CAKE_BINARY_PATH -name "Cake.dll")
-
-# Start Cake
-echo "Running build script..."
-
-dotnet "$CAKE_BINARY" $SCRIPT "${CAKE_ARGUMENTS[@]}"

build/build.cake

@@ -1,67 +0,0 @@
-#addin "nuget:?package=CodeFileSanity&version=0.0.21"
-#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.1.1"
-#tool "nuget:?package=NVika.MSBuild&version=1.0.1"
-var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
-
-///////////////////////////////////////////////////////////////////////////////
-// ARGUMENTS
-///////////////////////////////////////////////////////////////////////////////
-
-var target = Argument("target", "Build");
-var configuration = Argument("configuration", "Release");
-
-var rootDirectory = new DirectoryPath("..");
-var solution = rootDirectory.CombineWithFilePath("osu.sln");
-
-///////////////////////////////////////////////////////////////////////////////
-// TASKS
-///////////////////////////////////////////////////////////////////////////////
-
-Task("Compile")
-    .Does(() => {
-        DotNetCoreBuild(solution.FullPath, new DotNetCoreBuildSettings {
-            Configuration = configuration,
-        });
-    });
-
-Task("Test")
-    .IsDependentOn("Compile")
-    .Does(() => {
-        var testAssemblies = GetFiles(rootDirectory + "/**/*.Tests/bin/**/*.Tests.dll");
-
-        DotNetCoreVSTest(testAssemblies, new DotNetCoreVSTestSettings {
-            Logger = AppVeyor.IsRunningOnAppVeyor ? "Appveyor" : $"trx",
-            Parallel = true,
-            ToolTimeout = TimeSpan.FromMinutes(10),
-        });
-    });
-
-// windows only because both inspectcore and nvika depend on net45
-Task("InspectCode")
-    .WithCriteria(IsRunningOnWindows())
-    .IsDependentOn("Compile")
-    .Does(() => {
-        InspectCode(solution, new InspectCodeSettings {
-            CachesHome = "inspectcode",
-            OutputFile = "inspectcodereport.xml",
-        });
-
-        int returnCode = StartProcess(nVikaToolPath, $@"parsereport ""inspectcodereport.xml"" --treatwarningsaserrors");
-        if (returnCode != 0)
-            throw new Exception($"inspectcode failed with return code {returnCode}");
-    });
-
-Task("CodeFileSanity")
-    .Does(() => {
-        ValidateCodeSanity(new ValidateCodeSanitySettings {
-            RootDirectory = rootDirectory.FullPath,
-            IsAppveyorBuild = AppVeyor.IsRunningOnAppVeyor
-        });
-    });
-
-Task("Build")
-    .IsDependentOn("CodeFileSanity")
-    .IsDependentOn("InspectCode")
-    .IsDependentOn("Test");
-
-RunTarget(target);

build/cakebuild.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <PackAsTool>true</PackAsTool>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Cake" Version="0.30.0" />
-    <PackageReference Include="Cake.CoreCLR" Version="0.30.0" />
-  </ItemGroup>
-</Project>

cake.config

@@ -1,5 +0,0 @@
-
-[Nuget]
-Source=https://api.nuget.org/v3/index.json
-UseInProcessClient=true
-LoadDependencies=true

fastlane/Appfile

@@ -1,2 +0,0 @@
-app_identifier("sh.ppy.osulazer") # The bundle identifier of your app
-apple_id("apple-dev@ppy.sh") # Your Apple email address

fastlane/Fastfile

@@ -1,65 +0,0 @@
-update_fastlane
-
-default_platform(:ios)
-
-platform :ios do
-  lane :testflight_prune_dry do
-    clean_testflight_testers(days_of_inactivity:45, dry_run: true)
-  end
-
-  # Specify a custom number for what's "inactive"
-  lane :testflight_prune do
-    clean_testflight_testers(days_of_inactivity: 45) # 120 days, so about 4 months
-  end
-
-  lane :update_version do |options|
-    options[:plist_path] = '../osu.iOS/Info.plist'
-    app_version(options)
-  end
-
-  desc 'Deploy to testflight'
-  lane :beta do |options|
-    update_version(options)
-
-    provision(
-      type: 'appstore'
-    )
-
-    build(
-      build_configuration: 'Release', 
-      build_platform: 'iPhone'
-    )
-
-    client = HTTPClient.new
-    changelog = client.get_content 'https://gist.githubusercontent.com/peppy/ab89c29dcc0dce95f39eb218e8fad197/raw'
-    changelog.gsub!('$BUILD_ID', options[:build])
-
-    pilot(
-      wait_processing_interval: 1800,
-      changelog: changelog,
-      ipa: './osu.iOS/bin/iPhone/Release/osu.iOS.ipa'
-    )
-  end
-
-  desc 'Compile the project'
-  lane :build do
-    nuget_restore(
-      project_path: 'osu.iOS.sln'
-    )
-
-    souyuz(
-      platform: "ios",
-      build_target: "osu_iOS",
-      plist_path: "../osu.iOS/Info.plist"
-    )
-  end
-
-  desc 'Install provisioning profiles using match'
-  lane :provision do |options|
-    if Helper.is_ci?
-      options[:readonly] = true
-    end
-
-    match(options)
-  end
-end

fastlane/Matchfile

@@ -1 +0,0 @@
-git_url('https://github.com/peppy/apple-certificates')

fastlane/Pluginfile

@@ -1,7 +0,0 @@
-# Autogenerated by fastlane
-#
-# Ensure this file is checked in to source control!
-
-gem 'fastlane-plugin-clean_testflight_testers'
-gem 'fastlane-plugin-souyuz'
-gem 'fastlane-plugin-xamarin'

fastlane/README.md

@@ -1,54 +0,0 @@
-fastlane documentation
-================
-# Installation
-
-Make sure you have the latest version of the Xcode command line tools installed:
-
-```
-xcode-select --install
-```
-
-Install _fastlane_ using
-```
-[sudo] gem install fastlane -NV
-```
-or alternatively using `brew cask install fastlane`
-
-# Available Actions
-## iOS
-### ios testflight_prune_dry
-```
-fastlane ios testflight_prune_dry
-```
-
-### ios testflight_prune
-```
-fastlane ios testflight_prune
-```
-
-### ios update_version
-```
-fastlane ios update_version
-```
-
-### ios beta
-```
-fastlane ios beta
-```
-Deploy to testflight
-### ios build
-```
-fastlane ios build
-```
-Compile the project
-### ios provision
-```
-fastlane ios provision
-```
-Install provisioning profiles using match
-
-----
-
-This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
-More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
-The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

osu.Desktop.Deploy/App.config

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
+<configuration>
+  <appSettings>
+    <add key="StagingFolder" value="Staging" />
+    <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="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="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.18.1.0" newVersion="0.18.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

osu.Desktop.Deploy/GitHubObject.cs

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

osu.Desktop.Deploy/GitHubRelease.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using Newtonsoft.Json;
+
+namespace osu.Desktop.Deploy
+{
+    public class GitHubRelease
+    {
+        [JsonProperty(@"id")]
+        public int Id;
+
+        [JsonProperty(@"tag_name")]
+        public string TagName => $"v{Name}";
+
+        [JsonProperty(@"name")]
+        public string Name;
+
+        [JsonProperty(@"draft")]
+        public bool Draft;
+
+        [JsonProperty(@"prerelease")]
+        public bool PreRelease;
+
+        [JsonProperty(@"upload_url")]
+        public string UploadUrl;
+    }
+}

osu.Desktop.Deploy/Program.cs

@@ -0,0 +1,431 @@
+// Copyright (c) 2007-2018 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.Configuration;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+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.4.3.0\tools\NuGet.exe";
+        private const string squirrel_path = @"packages\squirrel.windows.1.7.8\tools\Squirrel.exe";
+        private const string msbuild_path = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.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 TargetNames = ConfigurationManager.AppSettings["TargetName"];
+        public static string PackageName = ConfigurationManager.AppSettings["PackageName"];
+        public static string IconName = ConfigurationManager.AppSettings["IconName"];
+        public static string CodeSigningCertificate = ConfigurationManager.AppSettings["CodeSigningCertificate"];
+
+        public static string GitHubApiEndpoint => $"https://api.github.com/repos/{GitHubUsername}/{GitHubRepoName}/releases";
+        public static string GitHubReleasePage => $"https://github.com/{GitHubUsername}/{GitHubRepoName}/releases";
+
+        /// <summary>
+        /// How many previous build deltas we want to keep when publishing.
+        /// </summary>
+        private const int keep_delta_count = 3;
+
+        private static string codeSigningCmd => string.IsNullOrEmpty(codeSigningPassword) ? "" : $"-n \"/a /f {codeSigningCertPath} /p {codeSigningPassword} /t http://timestamp.comodoca.com/authenticode\"";
+
+        private static string homeDir => Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        private static string codeSigningCertPath => Path.Combine(homeDir, CodeSigningCertificate);
+        private static string solutionPath => Environment.CurrentDirectory;
+        private static string stagingPath => Path.Combine(solutionPath, StagingFolder);
+        private static string iconPath => Path.Combine(solutionPath, ProjectName, IconName);
+
+        private static string nupkgFilename(string ver) => $"{PackageName}.{ver}.nupkg";
+        private static string nupkgDistroFilename(string ver) => $"{PackageName}-{ver}-full.nupkg";
+
+        private static readonly Stopwatch sw = new Stopwatch();
+
+        private static string codeSigningPassword;
+
+        public static void Main(string[] args)
+        {
+            displayHeader();
+
+            findSolutionPath();
+
+            if (!Directory.Exists(ReleasesFolder))
+            {
+                write("WARNING: No release directory found. Make sure you want this!", ConsoleColor.Yellow);
+                Directory.CreateDirectory(ReleasesFolder);
+            }
+
+            checkGitHubReleases();
+
+            refreshDirectory(StagingFolder);
+
+            //increment build number until we have a unique one.
+            string verBase = DateTime.Now.ToString("yyyy.Mdd.");
+            int increment = 0;
+            while (Directory.GetFiles(ReleasesFolder, $"*{verBase}{increment}*").Any())
+                increment++;
+
+            string version = $"{verBase}{increment}";
+
+            Console.ForegroundColor = ConsoleColor.White;
+            Console.Write($"Ready to deploy {version}: ");
+            Console.ReadLine();
+
+            sw.Start();
+
+            if (!string.IsNullOrEmpty(CodeSigningCertificate))
+            {
+                Console.Write("Enter code signing password: ");
+                codeSigningPassword = readLineMasked();
+            }
+
+            write("Restoring NuGet packages...");
+            runCommand(nuget_path, "restore " + solutionPath);
+
+            write("Updating AssemblyInfo...");
+            updateAssemblyInfo(version);
+
+            write("Running build process...");
+            foreach (string targetName in TargetNames.Split(','))
+                runCommand(msbuild_path, $"/v:quiet /m /t:{targetName.Replace('.', '_')} /p:OutputPath={stagingPath};Targets=\"Clean;Build\";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()
+        {
+            if (!canGitHub) return;
+
+            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()
+        {
+            if (!canGitHub) return;
+
+            write("Pruning RELEASES...");
+
+            var releaseLines = getReleaseLines().ToList();
+
+            var fulls = releaseLines.Where(l => l.Filename.Contains("-full")).Reverse().Skip(1);
+
+            //remove any FULL releases (except most recent)
+            foreach (var l in fulls)
+            {
+                write($"- Removing old release {l.Filename}", ConsoleColor.Yellow);
+                File.Delete(Path.Combine(ReleasesFolder, l.Filename));
+                releaseLines.Remove(l);
+            }
+
+            //remove excess deltas
+            var deltas = releaseLines.Where(l => l.Filename.Contains("-delta")).ToArray();
+            if (deltas.Length > keep_delta_count)
+            {
+                foreach (var l in deltas.Take(deltas.Length - keep_delta_count))
+                {
+                    write($"- Removing old delta {l.Filename}", ConsoleColor.Yellow);
+                    File.Delete(Path.Combine(ReleasesFolder, l.Filename));
+                    releaseLines.Remove(l);
+                }
+            }
+
+            var lines = new List<string>();
+            releaseLines.ForEach(l => lines.Add(l.ToString()));
+            File.WriteAllLines(Path.Combine(ReleasesFolder, "RELEASES"), lines);
+        }
+
+        private static void uploadBuild(string version)
+        {
+            if (!canGitHub || string.IsNullOrEmpty(CodeSigningCertificate))
+                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,
+                    Timeout = 240000,
+                    ContentType = "application/octet-stream",
+                };
+
+                upload.AddRaw(File.ReadAllBytes(a));
+                upload.AuthenticatedBlockingPerform();
+            }
+
+            openGitHubReleasePage();
+        }
+
+        private static void openGitHubReleasePage() => Process.Start(GitHubReleasePage);
+
+        private static bool canGitHub => !string.IsNullOrEmpty(GitHubAccessToken);
+
+        private static void checkGitHubReleases()
+        {
+            if (!canGitHub) return;
+
+            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 version'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)
+            {
+                if (a.Name.EndsWith(".exe")) continue;
+
+                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,
+                RedirectStandardError = true,
+                UseShellExecute = false,
+                WindowStyle = ProcessWindowStyle.Hidden
+            };
+
+            Process p = Process.Start(psi);
+            if (p == null) return false;
+
+            string output = p.StandardOutput.ReadToEnd();
+            output += p.StandardError.ReadToEnd();
+
+            if (p.ExitCode == 0) return true;
+
+            write(output);
+            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.Perform();
+        }
+    }
+
+    internal class RawFileWebRequest : WebRequest
+    {
+        public RawFileWebRequest(string url) : base(url)
+        {
+        }
+
+        protected override string Accept => "application/octet-stream";
+    }
+
+    internal class ReleaseLine
+    {
+        public string Hash;
+        public string Filename;
+        public int Filesize;
+
+        public ReleaseLine(string line)
+        {
+            var split = line.Split(' ');
+            Hash = split[0];
+            Filename = split[1];
+            Filesize = int.Parse(split[2]);
+        }
+
+        public override string ToString() => $"{Hash} {Filename} {Filesize}";
+    }
+}

osu.Desktop.Deploy/Properties/AssemblyInfo.cs

@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("osu.Desktop.Deploy")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("osu.Desktop.Deploy")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("baea2f74-0315-4667-84e0-acac0b4bf785")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

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

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\osu.Game.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.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>osu.Desktop.Deploy.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.1.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.8\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.18.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.18.1\lib\net45\SharpCompress.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Squirrel, Version=1.7.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.8\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">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
+      <Project>{C76BF5B3-985E-4D39-95FE-97C9C879B83A}</Project>
+      <Name>osu.Framework</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

osu.Desktop.Deploy/packages.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
+<packages>
+  <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net452" />
+  <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
+  <package id="NuGet.CommandLine" version="4.3.0" targetFramework="net461" developmentDependency="true" />
+  <package id="SharpCompress" version="0.18.1" targetFramework="net461" />
+  <package id="Splat" version="2.0.0" targetFramework="net452" />
+  <package id="squirrel.windows" version="1.7.8" targetFramework="net461" />
+</packages>

osu.Desktop/OpenTK.dll.config

@@ -0,0 +1,25 @@
+<configuration>
+  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
+  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
+  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
+  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
+  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
+  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
+  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
+  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
+  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
+  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
+  <!-- XQuartz compatibility (X11 on Mac) -->
+  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
+  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
+  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
+  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
+  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
+  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
+</configuration>

osu.Desktop/OsuGameDesktop.cs

@@ -1,151 +1,121 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using osu.Desktop.Overlays;
-using osu.Framework.Platform;
-using osu.Game;
-using osuTK.Input;
-using Microsoft.Win32;
-using osu.Desktop.Updater;
-using osu.Framework;
-using osu.Framework.Logging;
-using osu.Framework.Platform.Windows;
-using osu.Framework.Screens;
-using osu.Game.Screens.Menu;
-
-namespace osu.Desktop
-{
-    internal class OsuGameDesktop : OsuGame
-    {
-        private readonly bool noVersionOverlay;
-        private VersionManager versionManager;
-
-        public OsuGameDesktop(string[] args = null)
-            : base(args)
-        {
-            noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
-        }
-
-        public override Storage GetStorageForStableInstall()
-        {
-            try
-            {
-                if (Host is DesktopGameHost desktopHost)
-                    return new StableStorage(desktopHost);
-            }
-            catch (Exception e)
-            {
-                Logger.Error(e, "Error while searching for stable install");
-            }
-
-            return null;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            if (!noVersionOverlay)
-            {
-                LoadComponentAsync(versionManager = new VersionManager { Depth = int.MinValue }, v =>
-                {
-                    Add(v);
-                    v.Show();
-                });
-
-                if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
-                    Add(new SquirrelUpdateManager());
-                else
-                    Add(new SimpleUpdateManager());
-            }
-        }
-
-        protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
-        {
-            base.ScreenChanged(lastScreen, newScreen);
-
-            switch (newScreen)
-            {
-                case Intro _:
-                case MainMenu _:
-                    versionManager?.Show();
-                    break;
-
-                default:
-                    versionManager?.Hide();
-                    break;
-            }
-        }
-
-        public override void SetHost(GameHost host)
-        {
-            base.SetHost(host);
-
-            if (host.Window is DesktopGameWindow desktopWindow)
-            {
-                desktopWindow.CursorState |= CursorState.Hidden;
-
-                desktopWindow.SetIconFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
-                desktopWindow.Title = Name;
-
-                desktopWindow.FileDrop += fileDrop;
-            }
-        }
-
-        private void fileDrop(object sender, FileDropEventArgs e)
-        {
-            var filePaths = e.FileNames;
-
-            var firstExtension = Path.GetExtension(filePaths.First());
-
-            if (filePaths.Any(f => Path.GetExtension(f) != firstExtension)) return;
-
-            Task.Factory.StartNew(() => Import(filePaths), TaskCreationOptions.LongRunning);
-        }
-
-        /// <summary>
-        /// A method of accessing an osu-stable install in a controlled fashion.
-        /// </summary>
-        private class StableStorage : WindowsStorage
-        {
-            protected override string LocateBasePath()
-            {
-                bool checkExists(string p) => Directory.Exists(Path.Combine(p, "Songs"));
-
-                string stableInstallPath;
-
-                try
-                {
-                    using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                        stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(String.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
-
-                    if (checkExists(stableInstallPath))
-                        return stableInstallPath;
-                }
-                catch
-                {
-                }
-
-                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
-
-                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
-
-                return null;
-            }
-
-            public StableStorage(DesktopGameHost host)
-                : base(string.Empty, host)
-            {
-            }
-        }
-    }
-}
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.Win32;
+using osu.Desktop.Overlays;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Platform;
+using osu.Game;
+using OpenTK.Input;
+
+namespace osu.Desktop
+{
+    internal class OsuGameDesktop : OsuGame
+    {
+        private readonly bool noVersionOverlay;
+
+        public OsuGameDesktop(string[] args = null)
+            : base(args)
+        {
+            noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
+        }
+
+        public override Storage GetStorageForStableInstall()
+        {
+            try
+            {
+                return new StableStorage();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// A method of accessing an osu-stable install in a controlled fashion.
+        /// </summary>
+        private class StableStorage : DesktopStorage
+        {
+            protected override string LocateBasePath()
+            {
+                bool checkExists(string p) => Directory.Exists(Path.Combine(p, "Songs"));
+
+                string stableInstallPath;
+
+                try
+                {
+                    using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                        stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(String.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+
+                    if (checkExists(stableInstallPath))
+                        return stableInstallPath;
+                }
+                catch
+                {
+                }
+
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                return null;
+            }
+
+            public StableStorage()
+                : base(string.Empty)
+            {
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (!noVersionOverlay)
+            {
+                LoadComponentAsync(new VersionManager { Depth = int.MinValue }, v =>
+                {
+                    Add(v);
+                    v.State = Visibility.Visible;
+                });
+            }
+        }
+
+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+            var desktopWindow = host.Window as DesktopGameWindow;
+            if (desktopWindow != null)
+            {
+                desktopWindow.CursorState |= CursorState.Hidden;
+
+                desktopWindow.Icon = new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
+                desktopWindow.Title = Name;
+
+                desktopWindow.FileDrop += fileDrop;
+            }
+        }
+
+        private void fileDrop(object sender, FileDropEventArgs e)
+        {
+            var filePaths = new [] { e.FileName };
+
+            var firstExtension = Path.GetExtension(filePaths.First());
+
+            if (filePaths.Any(f => Path.GetExtension(f) != firstExtension)) return;
+
+            Task.Factory.StartNew(() => Import(filePaths), TaskCreationOptions.LongRunning);
+        }
+    }
+}

osu.Desktop/OsuTestBrowser.cs

@@ -1,36 +1,30 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics;
-using osu.Framework.Platform;
-using osu.Framework.Screens;
-using osu.Framework.Testing;
-using osu.Game.Graphics;
-using osu.Game.Screens.Backgrounds;
-
-namespace osu.Game.Tests
-{
-    public class OsuTestBrowser : OsuGameBase
-    {
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            LoadComponentAsync(new ScreenStack(new BackgroundScreenDefault { Colour = OsuColour.Gray(0.5f) })
-            {
-                Depth = 10,
-                RelativeSizeAxes = Axes.Both,
-            }, AddInternal);
-
-            // Have to construct this here, rather than in the constructor, because
-            // we depend on some dependencies to be loaded within OsuGameBase.load().
-            Add(new TestBrowser());
-        }
-
-        public override void SetHost(GameHost host)
-        {
-            base.SetHost(host);
-            host.Window.CursorState |= CursorState.Hidden;
-        }
-    }
-}
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game;
+using osu.Game.Screens.Backgrounds;
+
+namespace osu.Desktop
+{
+    internal class OsuTestBrowser : OsuGameBase
+    {
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            LoadComponentAsync(new BackgroundScreenDefault { Depth = 10 }, AddInternal);
+
+            // Have to construct this here, rather than in the constructor, because
+            // we depend on some dependencies to be loaded within OsuGameBase.load().
+            Add(new TestBrowser());
+        }
+
+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+            host.Window.CursorState |= CursorState.Hidden;
+        }
+    }
+}