Thomas Müller 07e74068e7 Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2 ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs		2016-11-05 13:35:15 +01:00
..
Catch	Add async workflow.	2016-11-01 23:24:14 +09:00
Mania	Add async workflow.	2016-11-01 23:24:14 +09:00
Osu	Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2	2016-11-05 13:35:15 +01:00
Taiko	Add async workflow.	2016-11-01 23:24:14 +09:00
DrawableHitObject.cs	Fix draw order of hitobjects.	2016-11-04 15:43:53 +09:00
HitObject.cs	Add HitObject colours back in the mix.	2016-11-04 15:43:53 +09:00
HitObjectConverter.cs	Specify HitObjectConvertException.	2016-10-13 20:53:42 +08:00