Merge branch 'master' into better-hitsounds

This commit is contained in:
Dean Herbert
2017-04-06 16:00:56 +09:00
committed by GitHub
90 changed files with 1424 additions and 1162 deletions

View File

@ -56,13 +56,17 @@ namespace osu.Game.Modes.Objects.Drawables
Samples.ForEach(s => s?.Play());
}
protected override void LoadComplete()
[BackgroundDependencyLoader]
private void load()
{
base.LoadComplete();
//we may be setting a custom judgement in test cases or what not.
if (Judgement == null)
Judgement = CreateJudgement();
}
protected override void LoadComplete()
{
base.LoadComplete();
//force application of the state that was set before we loaded.
UpdateState(State);