Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix

This commit is contained in:
Dean Herbert
2018-05-25 19:07:30 +09:00
190 changed files with 3597 additions and 1667 deletions

View File

@ -259,9 +259,9 @@ namespace osu.Game.Tests.Visual
private readonly OsuSpriteText text;
private readonly Score score;
private readonly Beatmap beatmap;
private readonly IBeatmap beatmap;
public PerformanceDisplay(Score score, Beatmap beatmap)
public PerformanceDisplay(Score score, IBeatmap beatmap)
{
this.score = score;
this.beatmap = beatmap;

View File

@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual
}
}
protected virtual Beatmap CreateBeatmap(Ruleset ruleset) => new TestBeatmap(ruleset.RulesetInfo);
protected virtual IBeatmap CreateBeatmap(Ruleset ruleset) => new TestBeatmap(ruleset.RulesetInfo);
private Player loadPlayerFor(RulesetInfo ri) => loadPlayerFor(ri.CreateInstance());