Merge branch 'master' into remove-dispose-updates

This commit is contained in:
Dean Herbert
2022-09-01 23:03:19 +09:00
111 changed files with 1638 additions and 878 deletions

View File

@ -30,10 +30,15 @@ namespace osu.Game.Tests.Visual
{
var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
dependencies.CacheAs(new EditorClock());
var playable = GetPlayableBeatmap();
dependencies.CacheAs(new EditorBeatmap(playable));
var editorClock = new EditorClock();
base.Content.Add(editorClock);
dependencies.CacheAs(editorClock);
var editorBeatmap = new EditorBeatmap(playable);
// Not adding to hierarchy as we don't satisfy its dependencies. Probably not good.
dependencies.CacheAs(editorBeatmap);
return dependencies;
}