h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-15 14:47:18 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-reconnect-new-spectator-session

Browse Source
This commit is contained in:
Salman Ahmed 2022-07-18 09:55:19 +03:00 committed by GitHub
commit 045602b27d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
View File

@ -54,7 +54,7 @@ namespace osu.Game.Online.API.Requests.Responses
public DateTimeOffset? StartedAt { get; set; } public DateTimeOffset? StartedAt { get; set; }
[JsonProperty("ended_at")] [JsonProperty("ended_at")]
public DateTimeOffset? EndedAt { get; set; } public DateTimeOffset EndedAt { get; set; }
[JsonProperty("mods")] [JsonProperty("mods")]
public APIMod[] Mods { get; set; } = Array.Empty<APIMod>(); public APIMod[] Mods { get; set; } = Array.Empty<APIMod>();
@ -128,7 +128,7 @@ namespace osu.Game.Online.API.Requests.Responses
MaxCombo = MaxCombo, MaxCombo = MaxCombo,
Rank = Rank, Rank = Rank,
Statistics = Statistics, Statistics = Statistics,
Date = EndedAt ?? DateTimeOffset.Now, Date = EndedAt,
Hash = HasReplay ? "online" : string.Empty, // TODO: temporary? Hash = HasReplay ? "online" : string.Empty, // TODO: temporary?
Mods = mods, Mods = mods,
PP = PP, PP = PP,

8
osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -257,10 +257,14 @@ namespace osu.Game.Overlays.Chat
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(UserProfileOverlay? profile, ChannelManager? chatManager) private void load(UserProfileOverlay? profile, ChannelManager? chatManager, ChatOverlay? chatOverlay)
{ {
Action = () => profile?.ShowUser(sender); Action = () => profile?.ShowUser(sender);
startChatAction = () => chatManager?.OpenPrivateChannel(sender); startChatAction = () =>
{
chatManager?.OpenPrivateChannel(sender);
chatOverlay?.Show();
};
} }
public MenuItem[] ContextMenuItems public MenuItem[] ContextMenuItems

2
osu.Game/Screens/Ranking/RetryButton.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Screens.Ranking
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(13), Size = new Vector2(13),
Icon = FontAwesome.Solid.ArrowCircleLeft, Icon = FontAwesome.Solid.Redo,
}, },
}; };