mirror of
https://github.com/ppy/osu.git
synced 2024-12-16 09:22:58 +08:00
a4caaf56ef
# 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 |
||
---|---|---|
.. | ||
DistanceObjectPatternGenerator.cs | ||
EndTimeObjectPatternGenerator.cs | ||
HitObjectPatternGenerator.cs | ||
PatternGenerator.cs | ||
PatternType.cs |