Merge branch 'master' into hit-samples

# Conflicts:
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
This commit is contained in:
Dean Herbert
2016-12-13 17:46:54 +09:00
17 changed files with 216 additions and 67 deletions

View File

@ -83,7 +83,7 @@ namespace osu.Game.Modes.Osu.Objects
s.Curve = new SliderCurve
{
Path = points,
ControlPoints = points,
Length = length,
CurveType = curveType
};