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

Merge branch 'master' into update-framework

Browse Source
This commit is contained in:
Dean Herbert
2019-03-18 11:34:59 +09:00
committed by GitHub
parent c496f6e56b 5692b85334
commit 392a0a1d74
36 changed files with 297 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
View File

@ -246,7 +246,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
}
[Resolved]
private APIAccess api { get; set; }
private IAPIProvider api { get; set; }
private GetRoomScoresRequest request;

4
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -54,7 +54,7 @@ namespace osu.Game.Screens.Multi
private OsuGameBase game { get; set; }
[Resolved]
private APIAccess api { get; set; }
private IAPIProvider api { get; set; }
[Resolved(CanBeNull = true)]
private OsuLogo logo { get; set; }
@ -163,7 +163,7 @@ namespace osu.Game.Screens.Multi
this.Push(new PlayerLoader(player));
}
public void APIStateChanged(APIAccess api, APIState state)
public void APIStateChanged(IAPIProvider api, APIState state)
{
if (state != APIState.Online)
forcefullyExit();

2
osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Play
private readonly PlaylistItem playlistItem;
[Resolved]
private APIAccess api { get; set; }
private IAPIProvider api { get; set; }
[Resolved]
private IBindable<RulesetInfo> ruleset { get; set; }

2
osu.Game/Screens/Multi/RoomManager.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Screens.Multi
private Bindable<FilterCriteria> currentFilter { get; set; }
[Resolved]
private APIAccess api { get; set; }
private IAPIProvider api { get; set; }
[Resolved]
private RulesetStore rulesets { get; set; }