From 7d2f303e61956698b063250f953950e9ecb7d7f8 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 1 Sep 2016 21:46:19 +0900 Subject: [PATCH] Update font logic to override framework default. # Conflicts: # osu.Game/OsuGame.cs --- osu.Game/Online/API/APIRequest.cs | 1 + osu.Game/Online/API/OAuthToken.cs | 1 + osu.Game/Online/API/SecurePassword.cs | 1 + osu.Game/OsuGame.cs | 5 +++++ 4 files changed, 8 insertions(+) diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs index 63689d5b38..3de942b998 100644 --- a/osu.Game/Online/API/APIRequest.cs +++ b/osu.Game/Online/API/APIRequest.cs @@ -2,6 +2,7 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; +using osu.Framework.Extensions; using osu.Framework.IO.Network; namespace osu.Game.Online.API diff --git a/osu.Game/Online/API/OAuthToken.cs b/osu.Game/Online/API/OAuthToken.cs index aa45020a32..6f2ebbff69 100644 --- a/osu.Game/Online/API/OAuthToken.cs +++ b/osu.Game/Online/API/OAuthToken.cs @@ -4,6 +4,7 @@ using System; using System.Globalization; using Newtonsoft.Json; +using osu.Framework.Extensions; namespace osu.Game.Online.API { diff --git a/osu.Game/Online/API/SecurePassword.cs b/osu.Game/Online/API/SecurePassword.cs index 4e39ce1fff..aabcdc2fd3 100644 --- a/osu.Game/Online/API/SecurePassword.cs +++ b/osu.Game/Online/API/SecurePassword.cs @@ -3,6 +3,7 @@ using System; using System.Security; +using osu.Framework.Extensions; namespace osu.Game.Online.API { diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 066a61c86a..effc01e122 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -13,6 +13,8 @@ using osu.Game.Online.API; using osu.Game.Online.API.Requests; using OpenTK; using osu.Framework.Graphics; +using osu.Framework.Graphics.Textures; +using osu.Framework.IO.Stores; namespace osu.Game { @@ -28,6 +30,9 @@ 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.2f }; + Parent.Size = new Vector2(Config.Get(OsuConfig.Width), Config.Get(OsuConfig.Height)); API = new APIAccess()