Merge branch 'master' into mania-endtime-object-conversion

This commit is contained in:
Dean Herbert
2017-05-22 12:14:53 +09:00
committed by GitHub
16 changed files with 521 additions and 44 deletions

View File

@ -87,9 +87,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
Patterns.PatternGenerator conversion = null;
if (distanceData != null)
{
// Slider
}
conversion = new DistanceObjectPatternGenerator(random, original, beatmap, lastPattern);
else if (endTimeData != null)
conversion = new EndTimeObjectPatternGenerator(random, original, beatmap);
else if (positionData != null)