Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility

This commit is contained in:
Andrey Zavadskiy
2017-04-04 17:39:53 +03:00
32 changed files with 91 additions and 185 deletions

View File

@ -187,10 +187,6 @@ namespace osu.Game.Configuration
#pragma warning restore CS0612 // Type or member is obsolete
}
//todo: make a UnicodeString class/struct rather than requiring this helper method.
public string GetUnicodeString(string nonunicode, string unicode)
=> Get<bool>(OsuConfig.ShowUnicode) ? unicode ?? nonunicode : nonunicode ?? unicode;
public OsuConfigManager(Storage storage) : base(storage)
{
}