smoogipoo 08b16be3b8 Merge branch 'slider-controlpoint-masks' into slider-placement ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs		2018-10-29 15:55:38 +09:00
..
Drawables	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
Legacy	Pass sub-controlpoints as span slices	2018-10-11 17:44:25 +09:00
Types	Pass sub-controlpoints as span slices	2018-10-11 17:44:25 +09:00
BezierApproximator.cs	Fix some post-rebase issues	2018-10-29 15:26:28 +09:00
CatmullApproximator.cs	Fix some post-rebase issues	2018-10-29 15:26:28 +09:00
CircularArcApproximator.cs	Fix some post-rebase issues	2018-10-29 15:26:28 +09:00
HitObject.cs	Use SortedList again	2018-10-11 20:49:12 +09:00
HitObjectParser.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
HitWindows.cs	Fix hold note hitwindow lenience	2018-05-17 13:59:04 +09:00
LinearApproximator.cs	Fix some post-rebase issues	2018-10-29 15:26:28 +09:00
SliderCurve.cs	Merge branch 'slider-controlpoint-masks' into slider-placement	2018-10-29 15:55:38 +09:00