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	ControlPoint -> PathControlPoint	2018-11-01 03:56:51 +09:00
Edit	Merge branch 'master' into slider-placement	2018-11-02 19:45:34 +09:00
Judgements	Make Rulesets.Osu use the new judgement result structure	2018-08-02 20:36:38 +09:00
Mods	ControlPoint -> PathControlPoint	2018-11-01 03:56:51 +09:00
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
Scoring	CreateJudgementResult -> CreateResult	2018-08-06 11:07:41 +09:00
UI	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
osu.Game.Rulesets.Osu.csproj
OsuInputManager.cs	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
OsuRuleset.cs	Merge remote-tracking branch 'upstream/master' into ArrangeMod	2018-09-14 18:48:32 +09:00