Damnae e2fae24ad5 Merge branch 'master' into slider_ticks ...

Conflicts:
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Slider.cs

2017-02-15 10:53:42 +01:00

..

Drawables

Merge branch 'master' into slider_ticks

2017-02-15 10:53:42 +01:00

BezierApproximator.cs

Naming standardisation and enforcing.

2017-02-07 16:20:36 +09:00

CircularArcApproximator.cs

Naming standardisation and enforcing.

2017-02-07 16:20:36 +09:00

HitCircle.cs

Update and standardise license headers.

2017-02-07 14:27:41 +09:00

OsuHitObject.cs

Make HitObjectType more accessible.

2017-02-15 01:23:19 +09:00

OsuHitObjectConverter.cs

Add hit object stacking.

2017-02-09 07:28:40 +01:00

OsuHitObjectParser.cs

Throw exception on unknown hitobject.

2017-02-15 11:37:23 +09:00

Slider.cs

Merge branch 'master' into slider_ticks

2017-02-15 10:53:42 +01:00

SliderCurve.cs

Better slider defaults.

2017-02-15 01:23:19 +09:00

SliderTick.cs

Add slider ticks.

2017-02-14 11:26:24 +01:00

Spinner.cs

Add spinners and improve TestCaseHitObjects.

2017-02-15 01:23:20 +09:00