Dean Herbert 46865bbacd Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix ... # Conflicts: # osu.Game/Audio/SampleInfo.cs		2017-12-23 14:50:35 +09:00
..
Drawables	Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix	2017-12-23 14:50:35 +09:00
Legacy	Make HitObjects construct nested hit objects	2017-12-22 21:42:54 +09:00
Types	Add hold note conversion.	2017-05-17 13:09:07 +09:00
BezierApproximator.cs	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
CircularArcApproximator.cs	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
HitObject.cs	Make HitObjects construct nested hit objects	2017-12-22 21:42:54 +09:00
HitObjectParser.cs	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
SliderCurve.cs	Fix code review issues	2017-10-12 22:27:22 +09:00