mirror of https://github.com/ppy/osu
Merge branch 'master' into tournament-design-gameplay
This commit is contained in:
commit
8b16dadfe5
|
@ -27,7 +27,7 @@ public class TournamentBeatmapPanel : CompositeDrawable
|
|||
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 @@ private void updateState()
|
|||
|
||||
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)
|
||||
{
|
||||
|
|
|
@ -42,6 +42,11 @@ public MapPoolScreen()
|
|||
{
|
||||
InternalChildren = new Drawable[]
|
||||
{
|
||||
new TourneyVideo("gameplay")
|
||||
{
|
||||
Loop = true,
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
},
|
||||
new MatchHeader(),
|
||||
mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue