Merge branch 'master' into fix-perfect-judgements

This commit is contained in:
Dean Herbert
2020-03-06 00:18:05 +09:00
111 changed files with 2477 additions and 1118 deletions

View File

@ -9,7 +9,6 @@ using osu.Framework.Testing;
using osu.Game.Configuration;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Play;
namespace osu.Game.Tests.Visual
{
@ -22,7 +21,7 @@ namespace osu.Game.Tests.Visual
private readonly Ruleset ruleset;
protected Player Player;
protected TestPlayer Player;
protected PlayerTestScene(Ruleset ruleset)
{
@ -69,6 +68,8 @@ namespace osu.Game.Tests.Visual
Beatmap.Value = CreateWorkingBeatmap(beatmap);
Ruleset.Value = ruleset.RulesetInfo;
SelectedMods.Value = Array.Empty<Mod>();
if (!AllowFail)
{
var noFailMod = ruleset.GetAllMods().FirstOrDefault(m => m is ModNoFail);
@ -87,6 +88,6 @@ namespace osu.Game.Tests.Visual
LoadScreen(Player);
}
protected virtual Player CreatePlayer(Ruleset ruleset) => new TestPlayer(false, false);
protected virtual TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(false, false);
}
}