Merge branch 'master' of https://github.com/ppy/osu into ppy-master

This commit is contained in:
Aaron Hong
2022-05-31 21:01:04 -07:00
961 changed files with 23843 additions and 11449 deletions

View File

@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Taiko.UI
{
public new BindableDouble TimeRange => base.TimeRange;
public readonly BindableBool LockPlayfieldAspect = new BindableBool(true);
protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;
protected override bool UserScrollSpeedAdjustment => false;
@ -78,7 +80,10 @@ namespace osu.Game.Rulesets.Taiko.UI
public DrumTouchInputArea CreateDrumTouchInputArea() => new DrumTouchInputArea();
public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer();
public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer
{
LockPlayfieldAspect = { BindTarget = LockPlayfieldAspect }
};
protected override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);