RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tournament-design-gameplay

This commit is contained in:
Dean Herbert 2020-03-09 15:09:02 +09:00
parent 33f457d663 b4cb4100dd
commit 8b16dadfe5
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
View File

@ -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)
{

5
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -42,6 +42,11 @@ public MapPoolScreen()
{
InternalChildren = new Drawable[]
{
new TourneyVideo("gameplay")
{
Loop = true,
RelativeSizeAxes = Axes.Both,
},
new MatchHeader(),
mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
{