mirror of
https://github.com/ppy/osu
synced 2024-12-15 11:25:29 +00:00
54ab256c8e
# Conflicts: # osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs # osu.Game.Rulesets.Catch/Objects/JuiceStream.cs # osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs # osu.Game/Rulesets/Objects/Legacy/Catch/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 # osu.Game/Rulesets/Objects/SliderPath.cs |
||
---|---|---|
.. | ||
.vscode | ||
osu.Game.Rulesets.Osu.Tests.csproj | ||
OsuBeatmapConversionTest.cs | ||
StackingTest.cs | ||
TestCaseEditor.cs | ||
TestCaseGameplayCursor.cs | ||
TestCaseHitCircle.cs | ||
TestCaseHitCircleHidden.cs | ||
TestCaseHitCirclePlacementBlueprint.cs | ||
TestCaseHitCircleSelectionBlueprint.cs | ||
TestCaseShaking.cs | ||
TestCaseSlider.cs | ||
TestCaseSliderHidden.cs | ||
TestCaseSliderPlacementBlueprint.cs | ||
TestCaseSliderSelectionBlueprint.cs | ||
TestCaseSpinner.cs | ||
TestCaseSpinnerHidden.cs | ||
TestCaseSpinnerPlacementBlueprint.cs | ||
TestCaseSpinnerSelectionBlueprint.cs |