smoogipoo 08b16be3b8 Merge branch 'slider-controlpoint-masks' into slider-placement ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs		2018-10-29 15:55:38 +09:00
..
Masks	Merge branch 'slider-controlpoint-masks' into slider-placement	2018-10-29 15:55:38 +09:00
HitCircleCompositionTool.cs	Merge branch 'mask-separation' into editor-mask-placement	2018-10-26 14:05:30 +09:00
OsuEditRulesetContainer.cs	Reduce complexity of creating edit ruleset containers	2018-10-17 18:06:00 +09:00
OsuHitObjectComposer.cs	Implement initial slider placement (linear)	2018-10-29 15:26:06 +09:00
SliderCompositionTool.cs	Fix some post-rebase issues	2018-10-29 15:26:28 +09:00