Merge branch 'master' into catch-drawable-namespace

This commit is contained in:
Dean Herbert
2020-02-21 10:31:31 +09:00
82 changed files with 1725 additions and 732 deletions

View File

@ -16,10 +16,10 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
private Color4? colour;
protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours)
{
// override any external colour changes with banananana
AccentColour.Value = (colour ??= getBananaColour());
return colour ??= getBananaColour();
}
private Color4 getBananaColour()