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
..
Beatmaps	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
Difficulty	Apply review feedback	2018-07-17 16:33:08 +09:00
Judgements	Make Rulesets.Catch use the new judgement result structure	2018-08-02 20:37:07 +09:00
MathUtils
Mods
Objects	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
Properties
Replays	Update framework	2018-07-21 16:21:53 +09:00
Resources/Testing/Beatmaps	Oops fix incorrectly changed file	2018-06-14 21:38:08 +09:00
Scoring	Rename judgement-related methods/events + commenting	2018-08-06 10:55:25 +09:00
UI	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
CatchInputManager.cs
CatchRuleset.cs	Split out Special mods into Automation and Conversion	2018-07-31 18:00:42 +09:00
osu.Game.Rulesets.Catch.csproj