Merge branch 'master' into spectator-consistency-frames

This commit is contained in:
Dan Balasescu
2022-02-01 14:35:30 +09:00
13 changed files with 222 additions and 64 deletions

View File

@ -25,6 +25,8 @@ namespace osu.Game.Rulesets.UI
public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler, IHasRecordingHandler
where T : struct
{
public readonly KeyBindingContainer<T> KeyBindingContainer;
private readonly Ruleset ruleset;
[Resolved(CanBeNull = true)]
@ -49,8 +51,6 @@ namespace osu.Game.Rulesets.UI
protected override InputState CreateInitialState() => new RulesetInputManagerInputState<T>(base.CreateInitialState());
protected readonly KeyBindingContainer<T> KeyBindingContainer;
protected override Container<Drawable> Content => content;
private readonly Container content;