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
..
Drawables	Merge branch 'slider-controlpoint-masks' into slider-placement	2018-10-29 15:55:38 +09:00
HitCircle.cs	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
ISliderProgress.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
OsuHitObject.cs	Make circle piece respond to hitobject scale	2018-10-26 15:26:19 +09:00
OsuHitWindows.cs	Move ruleset-specific hitwindows to post-converted hitobjects	2018-05-17 13:35:15 +09:00
RepeatPoint.cs	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
Slider.cs	Make sliders respond to control point changes	2018-10-29 15:36:43 +09:00
SliderCircle.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
SliderTailCircle.cs	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
SliderTick.cs	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
Spinner.cs	Fix spinners providing one extra combo	2018-08-17 09:16:28 +09:00