Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player

This commit is contained in:
Dean Herbert
2018-06-29 20:30:42 +09:00
62 changed files with 1042 additions and 251 deletions

View File

@ -156,7 +156,8 @@ namespace osu.Game.Screens.Play
userAudioOffset.TriggerChange();
ScoreProcessor = RulesetContainer.CreateScoreProcessor();
config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
if (!ScoreProcessor.Mode.Disabled)
config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
Children = new Drawable[]
{