Merge remote-tracking branch 'upstream/master' into fix-catch-hr

This commit is contained in:
Dean Herbert
2019-08-05 11:19:18 +02:00
25 changed files with 107 additions and 96 deletions

View File

@ -26,10 +26,7 @@ namespace osu.Game.Rulesets.Catch.Tests
[TestCase("hardrock-stream", new[] { typeof(CatchModHardRock) })]
[TestCase("hardrock-repeat-slider", new[] { typeof(CatchModHardRock) })]
[TestCase("hardrock-spinner", new[] { typeof(CatchModHardRock) })]
public new void Test(string name, params Type[] mods)
{
base.Test(name, mods);
}
public new void Test(string name, params Type[] mods) => base.Test(name, mods);
protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
{