Merge branch 'master' into storyboard-improvements

This commit is contained in:
Dean Herbert 2018-02-19 17:28:53 +09:00 committed by GitHub
commit fae6ea1ee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -118,6 +118,7 @@ namespace osu.Game
dependencies.Cache(new OsuColour());
fileImporters.Add(BeatmapManager);
fileImporters.Add(ScoreStore);
//this completely overrides the framework default. will need to change once we make a proper FontStore.
dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 });