1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:13:00 +08:00
osu-lazer/osu.Game/Beatmaps/Objects
Dean Herbert fde3ab420a Merge branch 'master'
Conflicts:
	osu.Game/osu.Game.csproj
2016-10-13 12:23:36 +09:00
..
Catch Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00
Mania Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00
Osu Merge branch 'master' 2016-10-13 12:23:36 +09:00
Taiko Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00
HitObject.cs Add TODO regarding parsing. 2016-10-13 12:19:20 +09:00
HitObjectConverter.cs Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00