Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spectator mode not showing when a spectated user quits correctly #25548

Closed
wants to merge 11 commits into from
Closed

Fix spectator mode not showing when a spectated user quits correctly #25548

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cd9b249
Apply NRT to `SpectatorScreen`
peppy Nov 22, 2023
3ef932e
Rename `SoloSpectator` to `SoloSpectatorScreen`
peppy Nov 22, 2023
9b4036c
Apply NRT to `SoloSpecatorScreen`
peppy Nov 22, 2023
dc080e5
Update tests to work with nested screen
peppy Nov 22, 2023
a972ef9
Reduce access to various fields and events in `SpectatorClient`
peppy Nov 22, 2023
25ffc0f
Switch `SoloSpectatorScreen` to use a nested screen for gameplay
peppy Nov 22, 2023
43afafe
Create a new stack each time for isolation and safety
peppy Nov 22, 2023
82b5dc2
Restore some `virtual` specs to appease Moq
peppy Nov 23, 2023
bce3210
Add test coverage of remote player quitting immediately quitting locally
peppy Nov 23, 2023
2169976
Fix potential async misordering
peppy Nov 23, 2023
87d7184
Fix osu logo weirdness
peppy Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore some virtual specs to appease Moq
  • Loading branch information
@peppy
peppy committed Nov 23, 2023
commit 82b5dc213c4e0c7e171f031bc93959f538c5b7fb
6 changes: 3 additions & 3 deletions osu.Game/Online/Spectator/SpectatorClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public abstract partial class SpectatorClient : Component, ISpectatorClient
/// <summary>
/// The states of all users currently being watched.
/// </summary>
public IBindableDictionary<int, SpectatorState> WatchedUserStates => watchedUserStates;
public virtual IBindableDictionary<int, SpectatorState> WatchedUserStates => watchedUserStates;

/// <summary>
/// A global list of all players currently playing.
Expand All @@ -53,7 +53,7 @@ public abstract partial class SpectatorClient : Component, ISpectatorClient
/// <summary>
/// Called whenever new frames arrive from the server.
/// </summary>
public event Action<int, FrameDataBundle>? OnNewFrames;
public virtual event Action<int, FrameDataBundle>? OnNewFrames;

/// <summary>
/// Called whenever a user starts a play session, or immediately if the user is being watched and currently in a play session.
Expand Down Expand Up @@ -249,7 +249,7 @@ public void EndPlaying(GameplayState state)
});
}

public void WatchUser(int userId)
public virtual void WatchUser(int userId)
{
Debug.Assert(ThreadSafety.IsUpdateThread);

Expand Down