1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 10:47:24 +08:00
osu-lazer/osu.Game/Rulesets/Objects/Legacy
smoogipoo ace1dce281 Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
2018-11-05 18:10:22 +09:00
..
Catch Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 16:38:28 +09:00
Mania Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 16:38:28 +09:00
Osu Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 16:38:28 +09:00
Taiko Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 16:38:28 +09:00
ConvertHitObjectParser.cs Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 18:10:22 +09:00
ConvertHitObjectType.cs Add combo offset to ConvertHitObjectParser 2018-08-15 10:49:45 +09:00
ConvertSlider.cs Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 16:38:28 +09:00