Merge branch 'master' into bindable-control-points

This commit is contained in:
Dan Balasescu
2019-10-30 16:20:54 +09:00
committed by GitHub
35 changed files with 430 additions and 217 deletions

View File

@ -379,7 +379,7 @@ namespace osu.Game.Beatmaps.Formats
addControlPoint(time, controlPoint, true);
}
addControlPoint(time, new DifficultyControlPoint
addControlPoint(time, new LegacyDifficultyControlPoint
{
SpeedMultiplier = speedMultiplier,
}, timingChange);