Merge remote-tracking branch 'refs/remotes/upstream/master' into beatmap_framework

# Conflicts:
#	osu.Game/GameModes/Menu/ButtonSystem.cs
#	osu.Game/OsuGame.cs

osu-framework

@@ -1 +1 @@
-Subproject commit 556bf7e3c1f50cac0b9924300eaf97ecae4aece7
+Subproject commit 05c40c281741f81ea09f05fce9a1b22c7589dc8e

osu-resources

@@ -1 +1 @@
-Subproject commit 7ad9b5fcb00d5886792314847f88cee082421a4b
+Subproject commit 5cc6e0a311145a9871fb90d0d91226f3858bdce4

osu.Desktop.VisualTests/Program.cs

@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
+
+using System;
+using osu.Framework.Desktop;
+using osu.Framework.OS;
+
+namespace osu.Framework.VisualTests
+{
+    public static class Program
+    {
+        [STAThread]
+        public static void Main(string[] args)
+        {
+            BasicGameHost host = Host.GetSuitableHost();
+            host.Load(new VisualTestGame());
+            host.Run();
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs

@@ -0,0 +1,54 @@
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.GameModes.Testing;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.MathUtils;
+using osu.Game.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu.Desktop.Tests
+{
+    class TestCaseTextAwesome : TestCase
+    {
+        public override string Name => @"TextAwesome";
+
+        public override string Description => @"Tests display of icons";
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            FlowContainer flow;
+
+            Add(flow = new FlowContainer()
+            {
+                SizeMode = InheritMode.XY,
+                Size = new Vector2(0.5f),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            });
+
+            int i = 50;
+            foreach (FontAwesome fa in Enum.GetValues(typeof(FontAwesome)))
+            {
+                flow.Add(new TextAwesome
+                {
+                    Icon = fa,
+                    TextSize = 60,
+                    Colour = new Color4(
+                        Math.Max(0.5f, RNG.NextSingle()),
+                        Math.Max(0.5f, RNG.NextSingle()),
+                        Math.Max(0.5f, RNG.NextSingle()),
+                        1)
+                });
+
+                if (i-- == 0) break;
+            }
+        }
+    }
+}

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
+
+using osu.Framework.GameModes.Testing;
+using osu.Framework.Graphics.Cursor;
+using osu.Game;
+
+namespace osu.Framework.VisualTests
+{
+    class VisualTestGame : OsuGameBase
+    {
+        public override void Load()
+        {
+            base.Load();
+
+            Add(new TestBrowser());
+
+            ShowPerformanceOverlay = true;
+        }
+    }
+}

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

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectGuid>{69051C69-12AE-4E7D-A3E6-460D2E282312}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>osu.Desktop</RootNamespace>
+    <AssemblyName>osu!</AssemblyName>
+    <ManifestCertificateThumbprint>3CF060CD28877D0E3112948951A64B2A7CEEC909</ManifestCertificateThumbprint>
+    <ManifestKeyFile>codesigning.pfx</ManifestKeyFile>
+    <GenerateManifests>false</GenerateManifests>
+    <SignManifests>false</SignManifests>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <StartupObject>osu.Framework.VisualTests.Program</StartupObject>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <SignAssembly>false</SignAssembly>
+    <TargetZone>LocalIntranet</TargetZone>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <ProductVersion>12.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>0</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CuttingEdge NoUpdate</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Win32Resource>
+    </Win32Resource>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+    <OutputPath>bin\Deploy\</OutputPath>
+    <DefineConstants>CuttingEdge</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="OpenTK, Version=1.2.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4" />
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu-framework\osu.Framework.Desktop\osu.Framework.Desktop.csproj">
+      <Project>{65dc628f-a640-4111-ab35-3a5652bc1e17}</Project>
+      <Name>osu.Framework.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
+      <Project>{c76bf5b3-985e-4d39-95fe-97c9c879b83a}</Project>
+      <Name>osu.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj">
+      <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
+      <Name>osu.Game.Resources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
+      <Project>{0d3fbf8a-7464-4cf7-8c90-3e7886df2d4d}</Project>
+      <Name>osu.Game</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Tests\TestCaseTextAwesome.cs" />
+    <Compile Include="VisualTestGame.cs" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>

osu.Desktop/Properties/app.manifest

@@ -25,14 +25,16 @@
   </trustInfo>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      *  <!-- Windows 8.1 -->
-      *  <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!-- Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
       <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
       <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
     </application>
   </compatibility>
   <asmv3:application>
@@ -40,4 +42,16 @@
       <dpiAware>true</dpiAware>
     </asmv3:windowsSettings>
   </asmv3:application>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
 </asmv1:assembly>

osu.Game/GameModes/Menu/ButtonSystem.cs

@@ -76,21 +76,21 @@ namespace osu.Game.GameModes.Menu
                                 backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -wedge_width, Key.Escape),
                                 iconFacade = new Container //need a container to make the osu! icon flow properly.
 								{
-									Size = new Vector2(0, button_area_height)
-								}
+                                    Size = new Vector2(0, button_area_height)
+                                }
                             },
                             CentreTarget = iconFacade
                         }
                     }
                 },
-				osuLogo = new OsuLogo(onOsuLogo)
-				{
-					Origin = Anchor.Centre,
-					Anchor = Anchor.Centre
-				}
+                osuLogo = new OsuLogo(onOsuLogo)
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre
+                }
             };
 
-			buttonFlow.Position = new Vector2(wedge_width * 2 - (button_width + osuLogo.SizeForFlow / 4), 0);
+            buttonFlow.Position = new Vector2(wedge_width * 2 - (button_width + osuLogo.SizeForFlow / 4), 0);
 
             buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"solo", @"freeplay", FontAwesome.user, new Color4(102, 68, 204, 255), onSolo, wedge_width, Key.P)));
             buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"multi", @"multiplayer", FontAwesome.users, new Color4(94, 63, 186, 255), onMulti, 0, Key.M)));
@@ -289,43 +289,43 @@ namespace osu.Game.GameModes.Menu
             {
                 base.Load();
 
-				Sprite ripple;
+                Sprite ripple;
 
 
-				Children = new Drawable[]
-				{
-					logoBounceContainer = new AutoSizeContainer
-					{
-						Children = new Drawable[]
-						{
-							logo = new Sprite
-							{
+                Children = new Drawable[]
+                {
+                    logoBounceContainer = new AutoSizeContainer
+                    {
+                        Children = new Drawable[]
+                        {
+                            logo = new Sprite()
+                            {
                                 Texture = Game.Textures.Get(@"menu-osu"),
                                 Anchor = Anchor.Centre,
-								Origin = Anchor.Centre
-							},
-							ripple = new Sprite
-							{
+                                Origin = Anchor.Centre
+                            },
+                            ripple = new Sprite()
+                            {
                                 Texture = Game.Textures.Get(@"menu-osu"),
                                 Anchor = Anchor.Centre,
-								Origin = Anchor.Centre,
-								Alpha = 0.4f
-							},
-							vis = new MenuVisualisation
-							{
-								Anchor = Anchor.Centre,
-								Origin = Anchor.Centre,
-								Size = logo.Size,
-								Additive = true,
-								Alpha = 0.2f,
-							}
-						}
-					}
-				};
+                                Origin = Anchor.Centre,
+                                Alpha = 0.4f
+                            },
+                            vis = new MenuVisualisation
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = logo.Size,
+                                Additive = true,
+                                Alpha = 0.2f,
+                            }
+                        }
+                    }
+                };
 
-				ripple.ScaleTo(1.1f, 500);
-				ripple.FadeOut(500);
-				ripple.Loop(300);
+                ripple.ScaleTo(1.1f, 500);
+                ripple.FadeOut(500);
+                ripple.Loop(300);
             }
 
             public OsuLogo(Action action)
@@ -423,40 +423,46 @@ namespace osu.Game.GameModes.Menu
                 this.text = text;
             }
 
-			public override void Load()
-			{
-				base.Load();
-				Alpha = 0;
+            public override void Load()
+            {
+                base.Load();
+                Alpha = 0;
 
-				Children = new Drawable[]
-				{
-					box = new WedgedBox(new Vector2(button_width + Math.Abs(extraWidth), button_area_height), wedge_width)
-					{
-						Anchor = Anchor.Centre,
-						Origin = Anchor.Centre,
-						Colour = colour,
-						Scale = new Vector2(0, 1)
-					},
-					iconText = new AutoSizeContainer
-					{
-						Position = new Vector2(extraWidth / 2, 0),
-						Anchor = Anchor.Centre,
-						Origin = Anchor.Centre,
-						Children = new Drawable[]
-						{
-							icon = new TextAwesome(symbol, 40, Vector2.Zero),
-							new SpriteText
-							{
-								Direction = FlowDirection.HorizontalOnly,
-								Anchor = Anchor.Centre,
-								Origin = Anchor.Centre,
-								Position = new Vector2(0, 25),
-								Text = text
-							}
-						}
-					}
-				};
-			}
+                Children = new Drawable[]
+                {
+                    box = new WedgedBox(new Vector2(button_width + Math.Abs(extraWidth), button_area_height), wedge_width)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Colour = colour,
+                        Scale = new Vector2(0, 1)
+                    },
+                    iconText = new AutoSizeContainer
+                    {
+                        Position = new Vector2(extraWidth / 2, 0),
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Children = new Drawable[]
+                        {
+                            icon = new TextAwesome
+                            {
+                                Anchor = Anchor.Centre,
+                                TextSize = 40,
+                                Position = new Vector2(0, 0),
+                                Icon = symbol
+                            },
+                            new SpriteText
+                            {
+                                Direction = FlowDirection.HorizontalOnly,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Position = new Vector2(0, 35),
+                                Text = text
+                            }
+                        }
+                    }
+                };
+            }
 
             protected override bool OnHover(InputState state)
             {

osu.Game/GameModes/Menu/MainMenu.cs

@@ -1,13 +1,10 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.GameModes;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.GameModes.Menu
 {
@@ -26,18 +23,6 @@ namespace osu.Game.GameModes.Menu
 			Children = new Drawable[]
 			{
 				new ButtonSystem(),
-				new TextBox
-				{
-					Text = @"The quick brown fox jumped over the lazy dog.",
-					Position = new Vector2(50, 50),
-					Size = new Vector2(300, 20)
-				},
-				new SpriteText
-				{
-					Text = @"The quick brown fox jumped over the lazy dog.",
-					Position = new Vector2(50, 80),
-					Size = new Vector2(300, 20)
-				}
 			};
 		}
     }

osu.Game/Graphics/TextAwesome.cs

@@ -6,9 +6,9 @@ using OpenTK;
 
 namespace osu.Game.Graphics
 {
-    internal class TextAwesome : SpriteText
+    public class TextAwesome : SpriteText
     {
-        //internal override FontFace FontFace => (int)Icon < 0xf000 ? FontFace.OsuFont : FontFace.FontAwesome;
+        //public override FontFace FontFace => (int)Icon < 0xf000 ? FontFace.OsuFont : FontFace.FontAwesome;
 
         private FontAwesome icon;
 
@@ -28,15 +28,13 @@ namespace osu.Game.Graphics
             }
         }
 
-        internal TextAwesome(FontAwesome icon = FontAwesome.circle, float size = 10, Vector2? position = null)
-            : base(null)
+        public TextAwesome()
         {
-            Icon = icon;
-            Origin = osu.Framework.Graphics.Anchor.Centre;
+            Origin = Framework.Graphics.Anchor.Centre;
         }
     }
 
-    internal enum FontAwesome
+    public enum FontAwesome
     {
         glass = 0xf000,
         music = 0xf001,

osu.Game/Online/API/OAuth.cs

@@ -65,7 +65,7 @@ namespace osu.Game.Online.API
                 Token = req.ResponseObject;
                 return true;
             }
-            catch (Exception e)
+            catch
             {
                 //todo: potentially only kill the refresh token on certain exception types.
                 Token = null;

osu.Game/OsuGame.cs

@@ -1,31 +1,17 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
 using osu.Game.Configuration;
 using osu.Game.GameModes.Menu;
-using osu.Game.Graphics.Processing;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using OpenTK;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
 using osu.Framework.OS;
 using osu.Game.GameModes.Play;
 
 namespace osu.Game
 {
-    public class OsuGame : Framework.Game
+    public class OsuGame : OsuGameBase
     {
-        internal OsuConfigManager Config = new OsuConfigManager();
-
-        protected override string MainResourceFile => @"osu.Game.Resources.dll";
-
-        internal APIAccess API;
-
         public override void SetHost(BasicGameHost host)
         {
             base.SetHost(host);
@@ -37,33 +23,7 @@ namespace osu.Game
         {
             base.Load();
 
-            //this completely overrides the framework default. will need to change once we make a proper FontStore.
-            Fonts = new TextureStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular")) { ScaleAdjust = 0.01f };
-
-            API = new APIAccess()
-            {
-                Username = Config.Get<string>(OsuConfig.Username),
-                Password = Config.Get<string>(OsuConfig.Password),
-                Token = Config.Get<string>(OsuConfig.Token)
-            };
-
-			//var req = new ListChannelsRequest();
-			//req.Success += content =>
-			//{
-			//};
-			//API.Queue(req);
-
-			Children = new Drawable[]
-			{
-				new RatioAdjust
-				{
-					Children = new Drawable[]
-					{
-						new PlayTest(),
-						new CursorContainer()
-					}
-				}
-			};
+            Add(new MainMenu());
         }
 
         protected override void Dispose(bool isDisposing)
@@ -77,7 +37,7 @@ namespace osu.Game
         public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
         {
             if (!base.Invalidate(invalidation, source, shallPropagate)) return false;
-            
+
             if (Parent != null)
             {
                 Config.Set(OsuConfig.Width, ActualSize.X);

osu.Game/OsuGameBase.cs

@@ -0,0 +1,53 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using osu.Game.Configuration;
+using osu.Game.Graphics.Processing;
+using osu.Game.Online.API;
+
+namespace osu.Game
+{
+    public class OsuGameBase : Framework.Game
+    {
+        internal OsuConfigManager Config = new OsuConfigManager();
+
+        protected override string MainResourceFile => @"osu.Game.Resources.dll";
+
+        internal APIAccess API;
+
+        protected override Container AddTarget => ratioContainer?.IsLoaded == true ? ratioContainer : base.AddTarget;
+
+        private RatioAdjust ratioContainer;
+
+        public override void Load()
+        {
+            base.Load();
+
+            //this completely overrides the framework default. will need to change once we make a proper FontStore.
+            Fonts = new TextureStore() { ScaleAdjust = 0.01f };
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
+
+            API = new APIAccess()
+            {
+                Username = Config.Get<string>(OsuConfig.Username),
+                Password = Config.Get<string>(OsuConfig.Password),
+                Token = Config.Get<string>(OsuConfig.Token)
+            };
+
+            Add(new Drawable[]
+            {
+                ratioContainer = new RatioAdjust
+                {
+                    Children = new Drawable[]
+                    {
+                        new CursorContainer()
+                    }
+                }
+            });
+        }
+    }
+}

osu.Game/osu.Game.csproj

@@ -97,6 +97,7 @@
     <Compile Include="Online\Chat\Channel.cs" />
     <Compile Include="Online\Chat\Message.cs" />
     <Compile Include="OsuGame.cs" />
+    <Compile Include="OsuGameBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Users\User.cs" />
   </ItemGroup>

osu.sln

@@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.Desktop", "osu-framework\osu.Framework.Desktop\osu.Framework.Desktop.csproj", "{65DC628F-A640-4111-AB35-3A5652BC1E17}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Desktop.VisualTests", "osu.Desktop.VisualTests\osu.Desktop.VisualTests.csproj", "{69051C69-12AE-4E7D-A3E6-460D2E282312}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -54,6 +56,12 @@ Global
 		{65DC628F-A640-4111-AB35-3A5652BC1E17}.Deploy|Any CPU.Build.0 = Debug|Any CPU
 		{65DC628F-A640-4111-AB35-3A5652BC1E17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{65DC628F-A640-4111-AB35-3A5652BC1E17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69051C69-12AE-4E7D-A3E6-460D2E282312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69051C69-12AE-4E7D-A3E6-460D2E282312}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69051C69-12AE-4E7D-A3E6-460D2E282312}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
+		{69051C69-12AE-4E7D-A3E6-460D2E282312}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
+		{69051C69-12AE-4E7D-A3E6-460D2E282312}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69051C69-12AE-4E7D-A3E6-460D2E282312}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,5 +72,6 @@ Global
 		{0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D} = {0D37A2AD-80A4-464F-A1DE-1560B70F1CE3}
 		{D9A367C9-4C1A-489F-9B05-A0CEA2B53B58} = {0D37A2AD-80A4-464F-A1DE-1560B70F1CE3}
 		{65DC628F-A640-4111-AB35-3A5652BC1E17} = {7A75DFA2-DE65-4458-98AF-26AF96FFD6DC}
+		{69051C69-12AE-4E7D-A3E6-460D2E282312} = {0D37A2AD-80A4-464F-A1DE-1560B70F1CE3}
 	EndGlobalSection
 EndGlobal