Merge branch 'master' into adjust-beatmap-overlay

This commit is contained in:
Dean Herbert
2020-02-21 09:52:44 +09:00
committed by GitHub
247 changed files with 6452 additions and 3014 deletions

View File

@ -150,12 +150,12 @@ namespace osu.Game.Beatmaps.Drawables
};
}
private OsuColour colours;
[Resolved]
private OsuColour colours { get; set; }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private void load()
{
this.colours = colours;
background.Colour = colours.Gray3;
}