Dean Herbert c420c55291 Merge branch 'master' into hit-samples ... # Conflicts: # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs		2016-12-13 17:57:24 +09:00
..
Drawables	Merge branch 'master' into hit-samples	2016-12-13 17:57:24 +09:00
BezierApproximator.cs	Make bezier approximator slightly more correct (without affecting its behaviour).	2016-12-09 18:03:17 +01:00
CircularArcApproximator.cs	Add circular arc approximator for "perfect" sliders.	2016-12-09 18:04:02 +01:00
HitCircle.cs	Fix incorrect folder name.	2016-12-08 21:36:34 +09:00
OsuHitObject.cs	Wire up CircleSize to hitobjects.	2016-12-11 10:11:22 +01:00
OsuHitObjectConverter.cs	Fix incorrect folder name.	2016-12-08 21:36:34 +09:00
OsuHitObjectParser.cs	Merge branch 'master' into hit-samples	2016-12-13 17:57:24 +09:00
Slider.cs	Wire up CircleSize to hitobjects.	2016-12-11 10:11:22 +01:00
SliderCurve.cs	Add circular arc approximator for "perfect" sliders.	2016-12-09 18:04:02 +01:00
Spinner.cs	Fix incorrect folder name.	2016-12-08 21:36:34 +09:00