Thomas Müller e2f279bda4 Merge branch 'master' of github.com:ppy/osu into fix-multi-segment-sliders ...

# Conflicts:
#	osu.Game.Mode.Osu/Objects/Slider.cs

2016-11-29 22:28:48 +01:00

..

Drawables

Adjust slider fadeout slightly.

2016-11-29 22:14:56 +09:00

BezierApproximator.cs

Tidy up Slider class.

2016-11-29 21:29:53 +09:00

HitCircle.cs

Standardise some naming and make hitcircles feel better.

2016-11-19 19:07:57 +09:00

OsuHitObject.cs

Standardise some naming and make hitcircles feel better.

2016-11-19 19:07:57 +09:00

OsuHitObjectConverter.cs

Standardise some naming and make hitcircles feel better.

2016-11-19 19:07:57 +09:00

OsuHitObjectParser.cs

Standardise some naming and make hitcircles feel better.

2016-11-19 19:07:57 +09:00

Slider.cs

Tidy up Slider class.

2016-11-29 21:29:53 +09:00

SliderCurve.cs

Merge branch 'master' of github.com:ppy/osu into fix-multi-segment-sliders

2016-11-29 22:28:48 +01:00

Spinner.cs

Standardise some naming and make hitcircles feel better.

2016-11-19 19:07:57 +09:00