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
..
.vscode	Remove remaining references to net471	2018-08-01 22:07:39 +09:00
osu.Game.Rulesets.Osu.Tests.csproj	Update remaining nuget deps	2018-08-01 19:17:16 +09:00
OsuBeatmapConversionTest.cs	Add common custom words to dotsettings dictionary	2018-07-05 15:54:41 +09:00
StackingTest.cs	Add very simple stacking test	2018-08-21 17:22:28 +09:00
TestCaseEditor.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
TestCaseGameplayCursor.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
TestCaseHitCircle.cs	Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake	2018-08-24 15:26:36 +09:00
TestCaseHitCircleHidden.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
TestCaseShaking.cs	Add test for shaking	2018-07-06 17:38:58 +09:00
TestCaseSlider.cs	Rename judgement-related methods/events + commenting	2018-08-06 10:55:25 +09:00
TestCaseSliderHidden.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
TestCaseSpinner.cs	Rename more judgement-related methods to "result"	2018-08-06 11:31:46 +09:00
TestCaseSpinnerHidden.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00