osu-lazer

mirror of https://github.com/ppy/osu.git synced 2026-05-18 12:40:18 +08:00

Files

T

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

a4caaf56ef · 2018-11-05 16:38:28 +09:00

History

Drawables

Merge branch 'master' into consistent-terminology-format

2018-10-10 19:19:36 +09:00

Legacy

Merge remote-tracking branch 'origin/master' into fix-slider-samples

2018-11-05 16:38:28 +09:00

Types

Merge remote-tracking branch 'origin/master' into fix-slider-samples

2018-11-05 16:38:28 +09:00

HitObject.cs