Merge branch 'master' into skin-components-list

This commit is contained in:
Dean Herbert
2021-05-06 14:17:30 +09:00
57 changed files with 952 additions and 356 deletions

View File

@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("add editor overlay", () =>
{
skinEditor?.Expire();
Player.ScaleTo(SkinEditorContainer.VISIBLE_TARGET_SCALE);
Player.ScaleTo(SkinEditorOverlay.VISIBLE_TARGET_SCALE);
LoadComponentAsync(skinEditor = new SkinEditor(Player), Add);
});
}