Dean Herbert ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake ... # Conflicts: # osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs # osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs		2018-08-24 15:26:36 +09:00
..
Drawables	Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake	2018-08-24 15:26:36 +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	Implement combo offsets	2018-08-15 11:47:31 +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