sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 08:33:55 +09: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
parent e7ef919b0b 072e424b0f
commit b20e62096d
2 changed files with 4 additions and 0 deletions
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(); ladder = new LadderInfo();
} }
if (ladder.Ruleset.Value == null)
ladder.Ruleset.Value = RulesetStore.AvailableRulesets.First();
Ruleset.BindTo(ladder.Ruleset); Ruleset.BindTo(ladder.Ruleset);
dependencies.Cache(ladder); dependencies.Cache(ladder);

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

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