sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tournament-drawable-team-tidy

Browse Source
This commit is contained in:
Dan Balasescu
2020-03-09 13:26:20 +09:00
committed by GitHub
parent 414e704d37 a04b651fea
commit ab79f36c41
10 changed files with 174 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
View File

@ -66,6 +66,10 @@ namespace osu.Game.Tournament.Components
}
}
public void Expand() => this.FadeIn(300);
public void Contract() => this.FadeOut(200);
protected override ChatLine CreateMessage(Message message) => new MatchMessage(message);
protected class MatchMessage : StandAloneMessage

6
osu.Game.Tournament/Components/TourneyVideo.cs
View File

@ -38,7 +38,8 @@ namespace osu.Game.Tournament.Components
{
RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit,
Clock = new FramedClock(manualClock = new ManualClock())
Clock = new FramedClock(manualClock = new ManualClock()),
Loop = loop,
};
}
else if (drawFallbackGradient)
@ -51,10 +52,13 @@ namespace osu.Game.Tournament.Components
}
}
private bool loop;
public bool Loop
{
set
{
loop = value;
if (video != null)
video.Loop = value;
}