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

Merge remote-tracking branch 'upstream/master' into tournament-tools

Browse Source
This commit is contained in:
Dean Herbert
2019-05-15 12:08:23 +09:00
parent 1ef2a4c46f 5a9f8e5820
commit 7b56180b8b
477 changed files with 7058 additions and 3496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tournament/Components/SongBar.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Game.Beatmaps;
@ -228,6 +229,7 @@ namespace osu.Game.Tournament.Components
}
bool first = true;
foreach (var t in tuples)
{
if (!first)

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

@ -171,6 +171,7 @@ namespace osu.Game.Tournament.Components
case TeamColour.Red:
BorderColour = Color4.Red;
break;
case TeamColour.Blue:
BorderColour = Color4.Blue;
break;
@ -182,6 +183,7 @@ namespace osu.Game.Tournament.Components
Colour = Color4.White;
Alpha = 1;
break;
case ChoiceType.Ban:
Colour = Color4.Gray;
Alpha = 0.5f;
@ -199,6 +201,7 @@ namespace osu.Game.Tournament.Components
private void picksBansOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
{
var list = (ObservableCollection<BeatmapChoice>)sender;
if (sender != currentMatch.Value.PicksBans)
{
// todo: we need a last attribute in bindable valuechanged events badly.