227 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 additional information to the matchmaking queue screen (#37229)

  - [x] Depends on https://github.com/ppy/osu/pull/37226
  - [x] Depends on https://github.com/ppy/osu-server-spectator/pull/464
  
  This adds two new components to the queue screen:
  - A listing of the most recently completed matches (global).
  - A rank distribution graph.
  
  It looks something like this (fake data / test scene):
  
  <img width="1669" height="1005" alt="image"
  src="https://github.com/user-attachments/assets/caa57119-4267-4c6e-9898-2f414de865bf"
  />
  
  It's completely dev-design(TM), but I used Lichess as inspiration for
  the graph, and the original design document as inspiration for the
  panels.
  
  As for the history, because these are _completed_ matches one of the
  player life points will always be 0, but I've designed it so as to
  possibly support showing ongoing matches too in the future. It's only
  supported for ranked play right now, though there is no reason we
  couldn't track quick play rooms too (it's just... I'm not sure how to
  design the panels for quick play).
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dan Balasescu · 2026-04-14 10:54:54 +09:00
  ac620ee375
• 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
• Fix ranked play test failures from adding null playlist items (#37189)

  Example:
  https://github.com/ppy/osu/actions/runs/23900675414/job/69696255970?pr=37178#step:5:38
  
  Regressed in https://github.com/ppy/osu/pull/37172, cc @LiquidPL
  
  Would fail in multiple tests. I'm not going to spend time figuring out
  exactly why, I'm just going to guess that not all tests bother to set up
  the relevant playlist items for the cards or whatever.
  
  Some of the failing tests are flaky but not because the `item` here
  isn't sometimes null in those cases. It's always null, but the callbacks
  are probably scheduled or whatever and therefore have a chance to never
  run. Also some of the failures appear to cascade / spill from other
  tests as well.

  Bartłomiej Dach · 2026-04-03 22:11:50 +09:00
  796877a594
• Update room state on card played in TestMultiplayerClient (#37172)

  Noticed this not updating when working on tests.

  Krzysztof Gutkowski · 2026-04-02 16:19:02 +09:00
  2d85966074
• Rework ranked play chat to reduce overall area (#37097)

  In discussions, we've come to the conclusion to attempt to use a
  chat-bubble system to minimise the effective area of the chat. In
  particular, the results screen doesn't give us enough space to display
  the full chat box without overlapping the main screen content.
  
  This PR both adds the chat to the results screen, and reworks it to use
  such a bubble system (not sure what to call it, IM style?).
  
  
  https://github.com/user-attachments/assets/a8a88c51-8a9d-4a03-92b6-621112a15a41
  
  - New messages are previewed for 3 seconds.
  - When focusing and unfocusing the textbox, the history moves into
  expanded state (show the most recent 10 messages) or collapsed state
  (fade messages out ASAP).
  
  This is a bit of an initial implementation to get a feel of how it
  behaves, and there's more that can be done such as adding colours,
  improving the transforms, perhaps adding it to the intro screen
  (post-animation) but the structure's a bit weird atm.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dan Balasescu · 2026-03-31 03:45:47 +09:00
  fc817627e5
• Various tournament-minded improvements for multiplayer (#37000)

  https://github.com/user-attachments/assets/042311f1-b8c3-479b-a173-13b93fe2c5cc
  
  - `/roll` command is now supported in multiplayer chat for all players
  (don't need to be a referee).
  - Referees are shown in the room with a special status.
  - Tournament mode rooms can be locked, which prevents users from
  changing team (and slot, whenever those get brought back). When the room
  is locked, the user team indicator shows a padlock icon on top to
  indicate the lock state.
  
  ---
  
  - Related: https://github.com/ppy/osu-server-spectator/issues/406
  
  Grab-bag because I really don't think splitting this into 3 PRs is very
  helpful.
  
  I was going to add an animation for rolling but I had a go on Friday and
  my attempt got more or less the same reception as a wet fart so I'm not
  trying again. Someone else can if so inclined. I have completely lost
  trust in my design senses.
  
  Contrary to stable the roll results are completely ephemeral and go away
  when the room is re-entered. This could be both considered good and bad.
  Not for me to say.

  Bartłomiej Dach · 2026-03-20 18:56:45 +09:00
  43c53b5a8d
• 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
• Add type parameter to pool retrieval method
  Dan Balasescu · 2026-01-28 13:42:58 +09:00
  c1fc1edd9c
• Adjust vote-to-skip to be explicit about states
  Dan Balasescu · 2025-12-06 13:23:16 +09:00
  2be50d917a
• Suffix introp methods with "Intro"
  Dan Balasescu · 2025-11-04 11:05:41 +09:00
  f4049c7ec1
• Resolve CI inspections
  Dan Balasescu · 2025-10-31 21:48:24 +09:00
  a9ca4634fc
• Add simple multiplayer skip overlay
  Dan Balasescu · 2025-10-31 21:39:41 +09:00
  b20a41c1e8
• 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
• Add very simple countdown timer for quick play stages (#35433)
  Dean Herbert · 2025-10-24 23:07:04 +09:00
  1af462b692
• Add ability to jump in quick play
  Dan Balasescu · 2025-09-30 18:38:30 +09:00
  e636a09e0f
• Fix incorrect default room types
  Dan Balasescu · 2025-09-24 14:28:04 +09:00
  83dafb4ef9
• Add stage-changing helper, use in test scenes
  Dan Balasescu · 2025-09-24 14:28:01 +09:00
  9df3bd9a98
• Set initial matchmaking room state
  Dan Balasescu · 2025-09-24 13:42:55 +09:00
  597a06ac38
• Query for available pools for selection (#131)
  Dan Balasescu · 2025-09-07 16:17:27 +09:00
  e0c11504a2
• 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
• Add matchmaking model types required for server-side deploy
  Dan Balasescu · 2025-09-04 18:26:56 +09:00
  815bf9c37b
• Clone countdown objects in test client

  Beyond isolation, this stuff is also used to test (de-)serialisation.
  Much-of-a-muchness in this case since it isn't too thoroughly tested,
  but best do it anyway.

  Dan Balasescu · 2025-04-08 18:42:25 +09:00
  874ec49590
• Add failing countdown start test
  Dan Balasescu · 2025-04-08 18:35:22 +09:00
  968fe6e618
• Add tests for multiplayer implementation
  Dan Balasescu · 2025-03-25 16:03:56 +09:00
  a1894c9193
• Replace superfluous method with concrete implementation
  Dan Balasescu · 2025-03-19 15:32:29 +09:00
  23fa3060b2
• Split out methods so retrieving the room is not a callback function
  Dean Herbert · 2025-03-04 19:19:53 +09:00
  918315aa65
• Remove unused method
  Dan Balasescu · 2025-02-13 00:04:33 +09:00
  d923a478e9
• Remove SelectedRoom abstraction from OnlinePlayTestScene
  Dan Balasescu · 2025-02-12 22:55:19 +09:00
  205d6ecffb
• Merge branch 'master' into room-management-lio
  Dan Balasescu · 2025-02-11 21:19:32 +09:00
  38cd4fa56a
• Rename methods
  Dan Balasescu · 2025-01-23 16:27:38 +09:00
  7c38089c75
• Adjust + fix tests
  Dan Balasescu · 2025-01-23 16:27:38 +09:00
  9a623257f5
• 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
• 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
• Enable NRT in TestMultiplayerRoomManager
  Dan Balasescu · 2024-11-21 21:03:12 +09:00
  209380cbac
• Make Room.Playlist non-bindable
  Dan Balasescu · 2024-11-15 15:51:01 +09:00
  34c0f72dd6
• Make Room.AutoStartDuration non-bindable
  Dan Balasescu · 2024-11-15 14:42:45 +09:00
  89de4f0f87
• Make Room.Password & Room.HasPassword non-bindable
  Dan Balasescu · 2024-11-15 14:42:18 +09:00
  ec5be6dbc3
• Make Room.QueueMode non-bindable
  Dan Balasescu · 2024-11-15 14:42:18 +09:00
  198681e644
• Make Room.Type non-bindable
  Dan Balasescu · 2024-11-15 14:42:18 +09:00
  81e4cb348f
• Make Room.Name non-bindable
  Dan Balasescu · 2024-11-15 14:29:15 +09:00
  6160df1586
• Make RoomID non-bindable

  Most important changes are to `RoomSubScreen` and `PlaylistsRoomSubScreen`, because those are the only two cases that now bind to the event instead.

  Dan Balasescu · 2024-11-13 16:28:54 +09:00
  99762da7b8
• Make CurrentPlaylistItem not a bindable
  Dan Balasescu · 2024-11-12 18:17:24 +09:00
  72564b5c98
• More hardening of TestMultiplayerClient to attempt to fix test failures
  Dean Herbert · 2024-08-19 04:04:24 +09:00
  e75ae4a37b
• Revert unnecessary changes
  Dan Balasescu · 2024-02-02 21:05:50 +09:00
  20ae88b0a0
• Update R# + fix inspections
  Dan Balasescu · 2024-02-02 21:00:28 +09:00
  b44f77cee1