244 Commits

• Eagerly connect to latest server instance for best online experience (#37506)

  Client side requirements for making the client connect as soon as
  possible, based on how the client is being used. This is especially
  important with the introduction of ranked play: previously the worst
  case scenario would be that you couldn't join a multiplayer room (or
  spectate a user) and this was [automatically
  handled](https://github.com/ppy/osu/blob/f66e2c432fdb08db46477c4fa08ca74e551d037f/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs#L115-L121)
  mostly*, but now, if you leave the game open for a while, you can
  potentially be stuck queueing in ranked play with no users remaining on
  your server.
  
  Some samples of how this looks follow. Do note that the client is
  showing "Server is shutting down" errors. This is only going to happen
  in local debug environments – In production, when you reconnect to the
  endpoint you will always get a non-shutting-down instance.
  
  Idle scenario:
  
  
  https://github.com/user-attachments/assets/dd47fdf6-8d49-48e3-a19f-b196a581070b
  
  Non-idle scenario:
  
  
  https://github.com/user-attachments/assets/dfc8a41a-83fb-4b08-94b4-9595faf88294
  
  * Spectator isn't handled properly, as one example.

  Dean Herbert · 2026-05-05 16:06:00 +09:00
  51b4e89773
• Implement duels for ranked play (#37556)

  I've seen this suggested quite a bit and is a pretty easy implementation
  all things considered.
  
  For now, while on the queue screen, you can open up the dashboard
  overlay and select another player to duel. This will bring you into an
  unranked lobby.
  
  
  https://github.com/user-attachments/assets/712897a9-9350-4741-899d-59662c722e43

  Dan Balasescu · 2026-04-29 16:12:27 +09:00
  a3b8b9aee9
• Add models for improvements to matchmaking lobby (#37226)

  1. Gives `MatchmakingJoinLobby` parameters.
  2. Adds additional data to lobby status update models.
  
  A further PR will build upon (2) to add more data to the queue screen.

  Dan Balasescu · 2026-04-08 18:43:51 +09:00
  8c6818e275
• Adjust multiplayer logic to accommodate for referees spectating in-game (#37152)

  - Last part of / closes
  https://github.com/ppy/osu-server-spectator/issues/406.
  - Remaining work on slots will be tracked in
  https://github.com/ppy/osu-server-spectator/issues/405.
  
  This PR is a corollary of
  https://github.com/ppy/osu-server-spectator/pull/453 and all of the
  dispensations referee users in a multiplayer have received therein. The
  goal here is to allow access to all relevant room management functions
  even if the referee in question isn't host, as well as to disallow
  access to all non-relevant functions to do with the actual match
  gameplay.
  
  I'm not going to lie, this logic *is* ugly. I would argue that it
  already *was* ugly on `master` and my goal was to operate with as light
  a touch as possible myself. But you could see this as copping out and
  that I should try to refactor some of this. I will try - but only after
  someone else's seen the initial approach and deemed it unsuitable.
  
  The logic in `MatchStartControl` is awful - there are so many moving
  pieces of state that dictate what can happen when with all the buttons,
  and yes, I am making it worse here.
  
  This time there is some test coverage. Not everything is covered, but
  the coverage should be on par in all components and pieces of relevant
  logic I touched that already had tests covering them. On that note,
  please forgive the diffstat size, but the tests *are* most of that size.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Bartłomiej Dach · 2026-04-03 19:38:44 +09:00
  31c1168d76
• Implement ranked play (#36819)

  I don't really have much to say here. Instead, I'll give a brief history
  rundown that lists many pages of documentation you can read, if
  interested.
  
  - Started off as BTMC + Happy24 (Vivi)'s ["The
  Vision"](https://docs.google.com/document/d/1p1IpPmd2RICp8G4OqkCSs7u8Ug8FbFv8qqP0mfSrHf0/edit?tab=t.0#heading=h.fol093d9f9xi)
  - Initial
  [designs](https://www.figma.com/design/f5qqC57t9jFlgpzhRqUNVX/The-Vision?node-id=0-1&p=f)
  were led by Vivi.
  - Designs
  [morphed](https://www.figma.com/design/vtFmLrXKvWNyYiRjTezFTM/Untitled--Copy-?node-id=0-1&p=f)
  during development into what's currently present, led by @minetoblend.
  - There is some more ongoing work creating a [game design
  document](https://docs.google.com/document/d/1iffJFCsIBfYF0D4ogItSBEj6YBmbp-rdCpItAeaJiTA/edit?tab=t.0).
  
  **tl;dr:** Create something with the mechanics of a trading card game
  within osu!. The name of this is "ranked play".
  
  ---
  
  To be frank, a lot of stuff is missing here. Some of it I don't want to
  mention, because the point of this exercise is to get the system into
  the hands of players, gather feedback especially around mechanics, and
  discuss any further direction with the team.
  
  I am expecting a blanket approval on all of the new code, with
  particular attention to changes in existing components that I'll point
  out in a self review.
  
  There is also some [ongoing
  work](https://github.com/smoogipoo/osu/pulls) that may arrive in this
  branch prior to being merged.
  
  ---------
  
  Co-authored-by: maarvin <minetoblend@gmail.com>
  Co-authored-by: Marvin <m.schuerz@hautzy.com>
  Co-authored-by: Jamie Taylor <me@nekodex.net>
  Co-authored-by: ArijanJ <arijanj@proton.me>
  Co-authored-by: Dean Herbert <pe@ppy.sh>
  Co-authored-by: Tim Oliver <git@tim.dev>
  Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
  Co-authored-by: nil <25884226+voidstar0@users.noreply.github.com>
  Co-authored-by: Ботников Максим <mr.botnikoff@ya.ru>
  Co-authored-by: Denis Titovets <den232titovets@yandex.ru>
  Co-authored-by: Michael Middlezong <119022671+mmiddlezong@users.noreply.github.com>
  Co-authored-by: SupDos <6813986+SupDos@users.noreply.github.com>
  Co-authored-by: failaip12 <86018517+failaip12@users.noreply.github.com>

  Dan Balasescu · 2026-03-07 02:30:50 +09:00
  0988552567
• Unimplement legacy compatibility method (#36812)

  The spectator server invokes both legacy and non-legacy methods to keep
  compatibility with older clients:
  
  
  https://github.com/ppy/osu-server-spectator/blob/fe0dad324587c8a12a2f203fd8289ce64182c2d9/osu.Server.Spectator/Hubs/Multiplayer/Matchmaking/Queue/MatchmakingQueueBackgroundService.cs#L292-L299
  
  I thought that it'd be a good idea to implement the legacy method here,
  but it turns out to not be such a good idea because it means ranked-play
  clients will assume they're receiving a quick play invitation.

  Dan Balasescu · 2026-03-05 00:31:43 +09:00
  ae032622ac
• Add pool type to matchmaking room invited event (#36765)

  Rebase of https://github.com/smoogipoo/osu/pull/193
  
  Going forward, the client will have to know the type of pool being
  invited to so that it can enter the appropriate screen when clicking the
  notification.
  
  Unfortunately, SignalR does not support overloading methods, or even
  adding parameters to them, so this PR deprecates the
  `MatchmakingRoomInvited` event and adds its replacement
  `MatchmakingRoomInvitedWithParams` with a complex `invitation` parameter
  that we _can_ extend in the future if required (such as potentially
  adding the name of the pool).
  
  This also prepares the notification by extracting some code to a
  `Complete` method receiving said `invitation` parameter. This part of
  code will be further modified to enter the correct screen:
  
  
  https://github.com/smoogipoo/osu/blob/0a4018045b9d908f66c63dee65d0059d05b26e43/osu.Game/Screens/OnlinePlay/Matchmaking/Queue/QueueController.cs#L200
  
  In particular, I have tested that new clients continue to work with the
  old server (dev.ppy.sh) in quick play
  
  |         | Old Server           | New Server  |
  | ------------- |:-------------:| :-----:|
  | Old Client      | 🟢  | 🟢 |
  | New Client      | 🟢  | 🟢 |

  Dan Balasescu · 2026-02-28 00:42:44 +09:00
  c72b6412ea
• Add type parameter to pool retrieval method
  Dan Balasescu · 2026-01-28 13:42:58 +09:00
  c1fc1edd9c
• Always perform leave room sequence
  Dan Balasescu · 2025-12-11 20:07:36 +09:00
  bbdd70c843
• Merge pull request #35909 from smoogipoo/fix-vote-to-skip

  Adjust vote-to-skip messaging flow to be explicit about states

  Bartłomiej Dach · 2025-12-09 08:59:53 +01:00
  0b06acb29d
• Fix potentially unsafe quick play event handling
  Dan Balasescu · 2025-12-07 02:11:26 +09:00
  c23d6b7fd1
• Adjust vote-to-skip to be explicit about states
  Dan Balasescu · 2025-12-06 13:23:16 +09:00
  2be50d917a
• Merge branch 'master' into mp-vote-to-skip
  Dan Balasescu · 2025-11-05 16:53:44 +09:00
  e8db35a5c9
• Apply one more missed rename
  Bartłomiej Dach · 2025-11-04 12:56:03 +01:00
  f8331e0b28
• Add download progress bars to quick play users
  Dan Balasescu · 2025-11-04 11:37:12 +09:00
  23cb7f3b23
• Suffix introp methods with "Intro"
  Dan Balasescu · 2025-11-04 11:05:41 +09:00
  f4049c7ec1
• Move property reset into GameplayStarted()
  Dan Balasescu · 2025-10-31 21:40:40 +09:00
  6f94b1ab6d
• Add support for vote-to-skip in multiplayer
  Dan Balasescu · 2025-10-31 21:39:41 +09:00
  373162df02
• Add interop models
  Dan Balasescu · 2025-10-30 19:04:49 +09:00
  a435dfe93e
• Ensure all invocations of spectator server hub methods have their errors observed (#35488)

  Fell out when attempting
  https://github.com/ppy/osu-server-spectator/pull/346.
  
  Functionally, if a true non-`HubException` is produced via an invocation
  of a spectator server hub method, this doesn't really do much - the
  error will still log as 'unobserved' due to the default handler, it will
  still show up on sentry, etc. The only difference is that it'll get
  handled via the continuation installed in `FireAndForget()` rather than
  the `TaskScheduler.UnobservedTaskException` event.
  
  The only real case where this is relevant is when the server throws
  `HubException`s, which will now instead bubble up to a more
  human-readable form. Which is relevant to the aforementioned PR because
  that one makes any hub method potentially throw a `HubException` if the
  client version is too old.
  
  Obviously this does nothing for the existing old clients.

  Bartłomiej Dach · 2025-10-29 12:18:23 +09:00
  050c10cec2
• Add ability to jump in quick play
  Dan Balasescu · 2025-09-30 18:38:30 +09:00
  e636a09e0f
• Query for available pools for selection (#131)
  Dan Balasescu · 2025-09-07 16:17:27 +09:00
  e0c11504a2
• Join matchmaking rooms with password
  Dan Balasescu · 2025-09-07 16:17:27 +09:00
  3985596602
• Separate IMatchmakingClient and IMultiplayerClient

  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dan Balasescu · 2025-09-07 16:17:27 +09:00
  3786efaa5e
• Add matchmaking
  Dan Balasescu · 2025-09-07 16:17:27 +09:00
  111b98ef8e
• Eagerly clear the request queue on join
  Dan Balasescu · 2025-09-02 17:57:15 +09:00
  1519084f72
• Configure await calls
  Dan Balasescu · 2025-08-28 13:47:55 +09:00
  9ae6e509b7
• Fix potential loss of room events during join
  Dan Balasescu · 2025-08-28 13:20:02 +09:00
  b95573f97d
• Apply minor refactor to notification classes to be more flexible in usages
  Salman Alshamrani · 2025-07-29 14:35:24 +09:00
  c2ace36348
• Rewrite match subscreen to use full online state
  Dan Balasescu · 2025-04-04 10:48:55 +09:00
  286b3d9f5b
• Merge pull request #32214 from smoogipoo/fix-multi-user-kick-threading

  Fix thread safety when kicking multiplayer users

  Bartłomiej Dach · 2025-03-04 09:24:08 +01:00
  28be0e31c2
• Fix multiplayer not joining correct chat channel
  Dan Balasescu · 2025-03-04 14:45:23 +09:00
  77d5b1d5dd
• Fix thread safety when kicking multiplayer users
  Dan Balasescu · 2025-03-04 14:02:45 +09:00
  4a00662092
• Merge pull request #31637 from smoogipoo/room-management-lio

  Create, join, and part multiplayer rooms only via the multiplayer server

  Dean Herbert · 2025-03-04 13:13:55 +09:00
  58a671decb
• Fix unable to join multiplayer rooms with many users
  Dan Balasescu · 2025-03-04 12:34:11 +09:00
  3024a98658
• Fix API room host not being populated
  Dan Balasescu · 2025-02-28 15:52:02 +09:00
  a09ef5d96d
• Refactor post-join setup to not pass delegates around
  Dan Balasescu · 2025-02-27 14:50:35 +09:00
  47ca5c90a5
• Merge branch 'master' into room-management-lio
  Dan Balasescu · 2025-02-27 14:14:19 +09:00
  a33aff9bbd
• Fix host change sounds playing when exiting multiplayer rooms
  Dan Balasescu · 2025-02-21 16:38:55 +09:00
  f868f03e1b
• Merge branch 'master' into room-management-lio
  Dan Balasescu · 2025-02-11 21:19:32 +09:00
  38cd4fa56a
• Various refactorings and cleanups
  Dan Balasescu · 2025-01-25 19:32:59 +09:00
  ab4162e2aa
• Rename methods
  Dan Balasescu · 2025-01-23 16:27:38 +09:00
  7c38089c75
• Join/Leave rooms via multiplayer server

  Relevant functionality has been removed from `RoomManager` in the
  process.

  Dan Balasescu · 2025-01-22 21:44:45 +09:00
  02369baec4
• Configure awaiters
  Dan Balasescu · 2025-01-21 19:31:51 +09:00
  001d9cacf2
• Merge branch 'master' into multiplayer-free-style
  Dean Herbert · 2025-01-21 17:49:21 +09:00
  c68a0bc7e3
• Create multiplayer rooms via multiplayer server
  Dan Balasescu · 2025-01-17 21:44:40 +09:00
  ad28de8ae3
• Rewrite everything to better support spectator server messaging
  Dan Balasescu · 2024-12-25 22:24:21 +09:00
  0093af8f55
• Improve handling of multiplayer room status
  Dan Balasescu · 2024-11-22 21:21:04 +09:00
  82a63228de
• Make Room.Playlist non-bindable
  Dan Balasescu · 2024-11-15 15:51:01 +09:00
  34c0f72dd6
• Make Room.RecentParticipants non-bindable
  Dan Balasescu · 2024-11-15 15:25:43 +09:00
  b16edbbf52