smoogipoo 70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs		2018-10-16 17:28:16 +09:00
..
Drawables	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +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	Fix StackHeight changes not causing position updates	2018-10-03 17:06:18 +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 HitObject not store the judgement	2018-08-06 11:50:18 +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