Merge branch 'master' into tournament-design-gameplay

This commit is contained in:
Dean Herbert
2020-03-09 15:09:02 +09:00
2 changed files with 7 additions and 11 deletions

View File

@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Components
private readonly string mods;
private const float horizontal_padding = 10;
private const float vertical_padding = 5;
private const float vertical_padding = 10;
public const float HEIGHT = 50;
@ -163,16 +163,7 @@ namespace osu.Game.Tournament.Components
BorderThickness = 6;
switch (found.Team)
{
case TeamColour.Red:
BorderColour = Color4.Red;
break;
case TeamColour.Blue:
BorderColour = Color4.Blue;
break;
}
BorderColour = TournamentGame.GetTeamColour(found.Team);
switch (found.Type)
{