sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +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

4
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -33,7 +33,6 @@ namespace osu.Game.Tournament
private DependencyContainer dependencies;
[Cached]
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
private Bindable<Size> windowSize;
@ -130,6 +129,7 @@ namespace osu.Game.Tournament
foreach (var id in group.Pairings)
{
var found = ladder.Pairings.FirstOrDefault(p => p.ID == id);
if (found != null)
{
found.Grouping.Value = group;
@ -174,6 +174,7 @@ namespace osu.Game.Tournament
private bool addBeatmaps()
{
bool addedInfo = false;
foreach (var g in ladder.Groupings)
foreach (var b in g.Beatmaps)
if (b.BeatmapInfo == null)
@ -228,6 +229,7 @@ namespace osu.Game.Tournament
{
base.Update();
var minWidth = (int)(windowSize.Value.Height / 9f * 16 + 400);
if (windowSize.Value.Width < minWidth)
{
// todo: can be removed after ppy/osu-framework#1975