RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 19:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale

Browse Source
This commit is contained in:
Dean Herbert 2019-11-29 01:49:25 +09:00
commit b20e62096d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,6 +129,9 @@ namespace osu.Game.Tournament
ladder = new LadderInfo();
}
if (ladder.Ruleset.Value == null)
ladder.Ruleset.Value = RulesetStore.AvailableRulesets.First();
Ruleset.BindTo(ladder.Ruleset);
dependencies.Cache(ladder);

1
osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
View File

@ -42,5 +42,6 @@ namespace osu.Game.Online.API.Requests
Ranked,
Approved,
Qualified,
Loved
}
}