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 'origin/master' into non-null-ruleset

Browse Source 
# Conflicts:
#	osu.Game/Screens/Select/FilterControl.cs
This commit is contained in:
smoogipoo
2018-07-02 15:05:34 +09:00
parent 018dcc98b4 154e30fe64
commit 4070c1a888
117 changed files with 3735 additions and 1701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Select.Leaderboards
private FillFlowContainer<LeaderboardScore> scrollFlow;
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
public Action<Score> ScoreSelected;
@ -146,7 +146,7 @@ namespace osu.Game.Screens.Select.Leaderboards
replacePlaceholder(new MessagePlaceholder(@"Please sign in to view online leaderboards!"));
break;
case PlaceholderState.NotSupporter:
replacePlaceholder(new MessagePlaceholder(@"Please invest in a supporter tag to view this leaderboard!"));
replacePlaceholder(new MessagePlaceholder(@"Please invest in an osu!supporter tag to view this leaderboard!"));
break;
default:
replacePlaceholder(null);
@ -193,7 +193,7 @@ namespace osu.Game.Screens.Select.Leaderboards
}
[BackgroundDependencyLoader(permitNulls: true)]
private void load(APIAccess api, Bindable<RulesetInfo> parentRuleset)
private void load(APIAccess api, IBindable<RulesetInfo> parentRuleset)
{
this.api = api;
@ -332,23 +332,4 @@ namespace osu.Game.Screens.Select.Leaderboards
}
}
}
public enum LeaderboardScope
{
Local,
Country,
Global,
Friend,
}
public enum PlaceholderState
{
Successful,
Retrieving,
NetworkFailure,
Unavailable,
NoScores,
NotLoggedIn,
NotSupporter,
}
}