1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 06:33:32 +08:00
osu-lazer/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components
smoogipoo 29422345f7 Merge remote-tracking branch 'origin/master' into fix-mask-disposal
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
#	osu.Game.Rulesets.Osu/Objects/Slider.cs
2018-11-14 14:03:25 +09:00
..
PathControlPointPiece.cs Make sure control points is internally initialised 2018-11-12 17:14:06 +09:00
PathControlPointVisualiser.cs Merge remote-tracking branch 'origin/master' into fix-mask-disposal 2018-11-14 14:03:25 +09:00
SliderBodyPiece.cs Merge remote-tracking branch 'origin/master' into fix-mask-disposal 2018-11-14 14:03:25 +09:00
SliderCirclePiece.cs Instantiate a new path rather than setting properties on it 2018-11-12 13:50:19 +09:00