h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 04:32:57 +08:00
Code Issues Releases Wiki Activity

Update font logic to override framework default.

Browse Source 
# Conflicts:
#	osu.Game/OsuGame.cs
This commit is contained in:
Dean Herbert 2016-09-01 21:46:19 +09:00
parent 56bdfae852
commit 7d2f303e61
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Online/API/APIRequest.cs
View File

@ -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

1
osu.Game/Online/API/OAuthToken.cs
View File

@ -4,6 +4,7 @@
using System;
using System.Globalization;
using Newtonsoft.Json;
using osu.Framework.Extensions;
namespace osu.Game.Online.API
{

1
osu.Game/Online/API/SecurePassword.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Security;
using osu.Framework.Extensions;
namespace osu.Game.Online.API
{

5
osu.Game/OsuGame.cs
View File

@ -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<int>(OsuConfig.Width), Config.Get<int>(OsuConfig.Height));
API = new APIAccess()