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

@ -4,12 +4,12 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using System;
using System.Collections.Generic;
using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Mania.Configuration;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using System;
using System.Collections.Generic;
namespace osu.Game.Rulesets.Mania.UI
{