Merge branch 'master' into multiplayer-disable-adaptive-speed

This commit is contained in:
Salman Ahmed
2022-05-04 17:06:36 +03:00
640 changed files with 15562 additions and 4665 deletions

View File

@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mods
public double ApplyToRate(double time, double rate) => rate * SpeedChange.Value;
public override Type[] IncompatibleMods => new[] { typeof(ModTimeRamp), typeof(ModAdaptiveSpeed) };
public override Type[] IncompatibleMods => new[] { typeof(ModTimeRamp), typeof(ModAdaptiveSpeed), typeof(ModRateAdjust) };
public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N2}x";
}