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
..
Drawable	Rename more judgement-related methods to "result"	2018-08-06 11:31:46 +09:00
Banana.cs	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
BananaShower.cs	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
CatchHitObject.cs	Merge branch 'master' into fix_combo	2018-09-14 18:48:13 +02:00
Droplet.cs	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
Fruit.cs	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
JuiceStream.cs	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
TinyDroplet.cs	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00