Merge branch 'master' into add-textbox-samples-and-fix-distingushing-passwords

This commit is contained in:
Dean Herbert
2020-07-10 17:14:46 +09:00
committed by GitHub
363 changed files with 7925 additions and 2328 deletions

View File

@ -202,7 +202,7 @@ namespace osu.Game.Graphics.UserInterface
};
}
protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
{
if (!hasSelection)
this.FadeTo(0.7f).FadeTo(0.4f, timingPoint.BeatLength, Easing.InOutSine);