Thomas Müller 32ee20b843 Merge branch 'master' of github.com:ppy/osu into better-clocks ...

# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs

2016-11-06 10:08:24 +01:00

..

Drawable

Merge branch 'master' of github.com:ppy/osu into better-clocks

2016-11-06 10:08:24 +01:00

Circle.cs

Add HitObject colours back in the mix.

2016-11-04 15:43:53 +09:00

OsuBaseHit.cs

Add HitObject colours back in the mix.

2016-11-04 15:43:53 +09:00

OsuConverter.cs

Fix regressions with HitRenderers, while also cleaning them up.

2016-10-13 10:10:15 +09:00

Slider.cs

Add basic structure for osu! mode objects.

2016-09-06 21:41:16 +09:00

Spinner.cs

Add basic osu! hit object parsing

2016-10-13 12:17:08 +09:00