Merge branch 'note-placement' into inter-column-movements

# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
This commit is contained in:
smoogipoo
2018-11-26 11:47:22 +09:00
7 changed files with 49 additions and 36 deletions

View File

@ -13,7 +13,7 @@ using osu.Framework.Input.Bindings;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.UI.Components;
using osu.Game.Rulesets.UI.Scrolling;
using OpenTK;
using osuTK;
namespace osu.Game.Rulesets.Mania.UI
{