Merge remote-tracking branch 'upstream/master' into fix-mania-selections

This commit is contained in:
Dean Herbert
2018-11-09 11:35:46 +09:00
17 changed files with 72 additions and 66 deletions

View File

@ -6,7 +6,6 @@ using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Primitives;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mania.Edit.Masks;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
using osu.Game.Rulesets.Mania.UI;