smoogipoo a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs		2018-11-05 16:38:28 +09:00
..
Drawables	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
Legacy	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
Types	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
HitObject.cs	Use SortedList again	2018-10-11 20:49:12 +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
SliderPath.cs	Use framework helper functions for path approximation	2018-11-02 19:26:29 +09:00