h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 20:32:55 +08:00
Code Issues Releases Wiki Activity

Update font loading to use new method (#7000)

Browse Source 
Update font loading to use new method
This commit is contained in:
Dean Herbert 2019-11-29 02:20:35 +09:00 committed by GitHub
commit b02ff010e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -54,8 +54,8 @@ namespace osu.Game.Tournament
{ {
Resources.AddStore(new DllResourceStore(@"osu.Game.Tournament.dll")); Resources.AddStore(new DllResourceStore(@"osu.Game.Tournament.dll"));
Fonts.AddStore(new GlyphStore(Resources, @"Resources/Fonts/Aquatico-Regular")); AddFont(Resources, @"Resources/Fonts/Aquatico-Regular");
Fonts.AddStore(new GlyphStore(Resources, @"Resources/Fonts/Aquatico-Light")); AddFont(Resources, @"Resources/Fonts/Aquatico-Light");
Textures.AddStore(new TextureLoaderStore(new ResourceStore<byte[]>(new StorageBackedResourceStore(storage)))); Textures.AddStore(new TextureLoaderStore(new ResourceStore<byte[]>(new StorageBackedResourceStore(storage))));

40
osu.Game/OsuGameBase.cs
View File

@ -131,29 +131,29 @@ namespace osu.Game
dependencies.CacheAs(this); dependencies.CacheAs(this);
dependencies.Cache(LocalConfig); dependencies.Cache(LocalConfig);
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont")); AddFont(Resources, @"Fonts/osuFont");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Medium")); AddFont(Resources, @"Fonts/Exo2.0-Medium");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-MediumItalic")); AddFont(Resources, @"Fonts/Exo2.0-MediumItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Noto-Basic")); AddFont(Resources, @"Fonts/Noto-Basic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Noto-Hangul")); AddFont(Resources, @"Fonts/Noto-Hangul");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Noto-CJK-Basic")); AddFont(Resources, @"Fonts/Noto-CJK-Basic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Noto-CJK-Compatibility")); AddFont(Resources, @"Fonts/Noto-CJK-Compatibility");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular")); AddFont(Resources, @"Fonts/Exo2.0-Regular");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-RegularItalic")); AddFont(Resources, @"Fonts/Exo2.0-RegularItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-SemiBold")); AddFont(Resources, @"Fonts/Exo2.0-SemiBold");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-SemiBoldItalic")); AddFont(Resources, @"Fonts/Exo2.0-SemiBoldItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Bold")); AddFont(Resources, @"Fonts/Exo2.0-Bold");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BoldItalic")); AddFont(Resources, @"Fonts/Exo2.0-BoldItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Light")); AddFont(Resources, @"Fonts/Exo2.0-Light");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-LightItalic")); AddFont(Resources, @"Fonts/Exo2.0-LightItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Black")); AddFont(Resources, @"Fonts/Exo2.0-Black");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic")); AddFont(Resources, @"Fonts/Exo2.0-BlackItalic");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera")); AddFont(Resources, @"Fonts/Venera");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Light")); AddFont(Resources, @"Fonts/Venera-Light");
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Medium")); AddFont(Resources, @"Fonts/Venera-Medium");
runMigrations(); runMigrations();