sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'smoogipoo/spritetext-rewrite' into update-framework-with-everyrthing

Browse Source
This commit is contained in:
Dean Herbert
2018-09-06 18:00:54 +09:00
parent 966101e50e d5acc96efa
commit ab7c0ccd18
4 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/OsuGameBase.cs
View File

@ -137,9 +137,8 @@ namespace osu.Game
fileImporters.Add(SkinManager);
//this completely overrides the framework default. will need to change once we make a proper FontStore.
dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 });
dependencies.Cache(Fonts = new FontStore(new GlyphStore(Resources, @"Fonts/FontAwesome")));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Medium"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-MediumItalic"));