Merge branch 'master' into test-efficiency

This commit is contained in:
Dan Balasescu
2021-09-07 16:14:12 +09:00
committed by GitHub
9 changed files with 175 additions and 67 deletions

View File

@ -327,10 +327,7 @@ namespace osu.Game
base.Content.Add(CreateScalingContainer().WithChildren(mainContent));
KeyBindingStore = new RealmKeyBindingStore(realmFactory);
KeyBindingStore.Register(globalBindings);
foreach (var r in RulesetStore.AvailableRulesets)
KeyBindingStore.Register(r);
KeyBindingStore.Register(globalBindings, RulesetStore.AvailableRulesets);
dependencies.Cache(globalBindings);