Merge branch 'master' into beatmap-track-rework

This commit is contained in:
Dean Herbert
2020-08-13 17:56:50 +09:00
14 changed files with 721 additions and 133 deletions

View File

@ -40,8 +40,8 @@ namespace osu.Game.Tests.Visual
{
var mods = new List<Mod>(SelectedMods.Value);
if (currentTestData.Mod != null)
mods.Add(currentTestData.Mod);
if (currentTestData.Mods != null)
mods.AddRange(currentTestData.Mods);
if (currentTestData.Autoplay)
mods.Add(ruleset.GetAutoplayMod());
@ -85,9 +85,18 @@ namespace osu.Game.Tests.Visual
public Func<bool> PassCondition;
/// <summary>
/// The <see cref="Mod"/> this test case tests.
/// The <see cref="Mod"/>s this test case tests.
/// </summary>
public Mod Mod;
public IReadOnlyList<Mod> Mods;
/// <summary>
/// Convenience property for setting <see cref="Mods"/> if only
/// a single mod is to be tested.
/// </summary>
public Mod Mod
{
set => Mods = new[] { value };
}
}
}
}