Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container

This commit is contained in:
Dean Herbert
2018-07-23 06:36:10 +02:00
162 changed files with 398 additions and 319 deletions

View File

@ -124,6 +124,13 @@ namespace osu.Game.Rulesets.Edit
return dependencies;
}
protected override void LoadComplete()
{
base.LoadComplete();
rulesetContainer.Playfield.DisplayJudgements.Value = false;
}
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();

View File

@ -5,7 +5,8 @@ using System;
using osu.Framework;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Input;
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.States;
using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Objects.Drawables;
using OpenTK;