Merge branch 'master' into editor-load-audio

This commit is contained in:
Dan Balasescu
2020-09-25 14:49:54 +09:00
committed by GitHub
13 changed files with 187 additions and 8 deletions

View File

@ -41,6 +41,11 @@ namespace osu.Game.Screens.Edit.Setup
[Resolved(canBeNull: true)]
private Editor editor { get; set; }
public SetupScreen()
: base(EditorScreenMode.SongSetup)
{
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{