RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-13 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
3a1fee59fb
osu/osu.Game.Rulesets.Mania/Beatmaps
History
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
..
Patterns Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 16:38:28 +09:00
ManiaBeatmap.cs Remove object counts from mania/taiko/catch 2018-05-07 15:51:08 +09:00
ManiaBeatmapConverter.cs Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 16:38:28 +09:00
StageDefinition.cs