smoogipoo 577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Mania/UI/ManiaStage.cs		2018-07-17 13:13:57 +09:00
..
Drawables	Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks	2018-07-05 14:53:31 +09:00
Legacy	Use Enum.HasFlag	2018-07-16 16:18:46 +09:00
Types	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-07-17 13:13:57 +09:00
BezierApproximator.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
CatmullApproximator.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
CircularArcApproximator.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
HitObject.cs	Don't create nested hitobjects unless absolutely required	2018-05-17 12:29:33 +09:00
HitObjectParser.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
HitWindows.cs	Fix hold note hitwindow lenience	2018-05-17 13:59:04 +09:00
SliderCurve.cs	Re-enable slider distance overflow	2018-05-14 15:14:29 +09:00