18213 Commits

• Refactor ShearedButton to allow easier relative sizing (#36802)

  This commit rearranges the contents of `ShearedButtons` to be more
  independent of each other in regards to sizing. Thanks to that, the
  custom logic related to enabling autosizing is no longer necessary.
  Witdh and height are no longer set via the constructor, and can be
  freely configured using the initializer syntax.
  
  Additionally, this allows the button to use relative sizing without
  having to resort to any hackery with `Size` (this will come in handy for
  me when implementing the new footer on multiplayer screens).
  
  Given that most of the `ShearedButton`s currently in use set their width
  explicitly, I did not set `AutoSizeAxes = Axes.X` like it would be by
  default previously. Instead it is set on the only two such buttons (show
  converts/selected mods on ssv2). I suppose it might be a good idea to
  have it set that by default if no `Width` is specified, as right now
  it'll just not show anything.
  
  Also I've set the margin on the text field by default in all cases
  instead of only when autosizing like how it was previously, since
  otherwise it would be a pain to set that on each button instance when
  needed. I've checked all affected components and could not find any text
  overflowing issues that this could cause.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Krzysztof Gutkowski · 2026-03-06 02:09:05 +09:00
  b76a7e1bb6
• Disable presenting scores in online song selects (#36826)

  RFC. Closes https://github.com/ppy/osu/issues/36815 I guess.
  
  Song select V1 completely disabled the ability to view a score outside
  of solo play in ways that are very easy to let fly under the radar:
  
  
  https://github.com/ppy/osu/blob/5fc836d1f09cebf983313c9b91a5c252890c607a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs#L26
  https://github.com/ppy/osu/blob/46db3ad96d0e1cd6ba4176b9b474cb79a338965d/osu.Game/Screens/Select/PlaySongSelect.cs#L47-L53
  
  therefore the issue this is trying to close would never even manifest
  there.
  
  The direct cause of the issue is that the results screen is pushed to
  the relevant online screen's *substack* of screens rather than the
  game-global parent stack. That means that when the back button is
  pressed, the following logic fires:
  
  
  https://github.com/ppy/osu/blob/6fa4a7152f144ed2524f20ecf7cfd26492bbe61d/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs#L174-L189
  
  This logic fires *on the parent screen* even though *the child screen*
  is the one the user is attempting to back out of. And none of the
  exemptions for the screen substack inside of the above method fire
  because the subscreen is not an `IOnlinePlaySubScreen` (it's
  `SoloResultsScreen` in this case).
  
  Now the direct cause here is probably fixable, although possibly not
  without some significant pulling of footer-shaped teeth. *However*, I
  kind of question as to why viewing scores should be permitted on online
  song selects in the first place - it kind of distracts from the primary
  purpose of the screens which is to *just pick a map already*.

  Bartłomiej Dach · 2026-03-06 00:19:10 +09:00
  6b10ef8709
• Return tooltips to footer buttons on MultiplayerMatchSongSelect (#36817)

  - reported by @Loreos7 in
  https://discord.com/channels/188630481301012481/188630652340404224/1478809956076491006
  - probably regressed in https://github.com/ppy/osu/pull/36752

  Denis Titovets · 2026-03-05 13:01:33 +09:00
  45945e3bb1
• Merge branch 'master' into tags-broken
  Dean Herbert · 2026-03-04 19:50:33 +09:00
  459d5e8a45
• Only show user tags above threshold by default
  Bartłomiej Dach · 2026-03-04 10:34:35 +01:00
  9b55e1dfdb
• Remove outdated xmldoc
  Bartłomiej Dach · 2026-03-04 08:44:31 +01:00
  43af89f75c
• Merge branch 'master' into song-select-v1-salute
  Bartłomiej Dach · 2026-03-04 08:39:58 +01:00
  f74a21c1e1
• Fix loose spacers at top of leaderboard score context menu (#36799)

  Closes https://github.com/ppy/osu/issues/36777.

  Bartłomiej Dach · 2026-03-03 23:40:08 +09:00
  a028f0ba4a
• Fix code quality
  Bartłomiej Dach · 2026-03-03 13:38:23 +01:00
  1aa42a73b1
• Add bool flag for checking tag vote threshold & utilise as required

  Closes https://github.com/ppy/osu/issues/36453.
  
  My omission was in assuming that web was going to start filtering out
  the tags below the threshold from API responses, which is not the case.
  
  Whether or not the consumers want or not to display tags below threshold
  is subjective. I figured that the matchmaking card tooltip might want to
  display below threshold but I dunno.

  Bartłomiej Dach · 2026-03-03 13:03:33 +01:00
  d9e182230d
• Move constant closer to helper
  Bartłomiej Dach · 2026-03-03 13:03:33 +01:00
  65b49137ee
• Migrate realm populating online lookup source to use helper method for retrieving tags

  To reduce logic duplication.

  Bartłomiej Dach · 2026-03-03 13:03:27 +01:00
  2f96e96576
• Move v2 files to final location

  This contains only renames and namespace updates.

  Dean Herbert · 2026-03-03 16:45:15 +09:00
  c28c64940a
• Add special not regarding collection dropdown
  Dean Herbert · 2026-03-03 16:45:15 +09:00
  b4f40639a1
• Remove all song select v1 files

  This contains no code changes (that would need review), only file
  deletion and extraction where required in a few odd cases.

  Dean Herbert · 2026-03-03 16:45:14 +09:00
  1a8d2855d4
• Move leaderboards classes to gameplay namespace for now
  Dean Herbert · 2026-03-03 16:45:13 +09:00
  54a1417dd8
• Move components only used by beatmap set overlay local to namespace
  Dean Herbert · 2026-03-03 16:45:13 +09:00
  ce542b03db
• Update filter matching tests to be independent of old song select classes
  Dean Herbert · 2026-03-03 16:45:12 +09:00
  f20d182775
• Switch multiplayer to use song select v2 (#36747)

  Tests pass and seems to work. Need to do a bit more self-testing for
  higher confidence, but in theory..
  
  Closes https://github.com/ppy/osu/issues/34035.
  
  ---------
  
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Dean Herbert · 2026-03-03 13:41:48 +09:00
  d27d0f40c1
• 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
• Improve usability of sample bank toggles (#36753)

  - [x] Depends on https://github.com/ppy/osu/pull/36741 for merge
  conflict avoidance
  
  RFC, cc @OliBomby
  
  ## [Adjust behaviour of automatic bank assignment during
  placement](https://github.com/ppy/osu/commit/547f55e9b3ded668fe6e1c8865a2d625e64a2f45)
  
  Diatribe time!
  
  This is fallout of the discussion about auto bank in
  https://github.com/ppy/osu/issues/36705.
  
  Auto bank in lazer as written before this commit is confused. On stable,
  auto bank is closer to "no bank", as in "go look up the current sample
  timing point, get the bank of that, and use that". lazer has no timing
  points anymore, but people still want auto bank. So what do?
  
  Auto bank for normal samples is somewhat sane still. It only works
  during placement, and will just copy the normal bank of the previous
  object - if one exists. That said, one *might not* exist, but the
  resulting object will still have its normal sample created with
  `editorAutoBank: true`. That is largely cosmetic and without
  consequences, but this commit fixes that.
  
  Auto bank for *addition* samples, however... Hoo boy.
  
  - For placed objects, auto bank means "take the normal sample, read its
  bank, and use that". Simple enough, right?
  - Hoooooowever. During placement, auto bank before this commit used to
  mean "look at the *previous object*, check if it has an addition sound
  and then use its bank, if not use *the previous object's* normal sample
  and then use its bank" which is a completely different thing with its
  own implications. Like, say, what happens if the previous object uses
  the auto addition bank too? What should be copied over? Should it be the
  notion of "auto bank" in that the addition bank should match the normal
  bank, or should it be the literal bank that the previous object is
  using?
  
  This change attempts to define this unambiguously. "Auto additions bank"
  means "the same bank as the normal bank of this object", full stop.
  
  ## [Do not touch sample toggle state if there are no selected
  objects](https://github.com/ppy/osu/commit/052cde5987e48800ec68ab2528c7e0ce3140e6e0)
  
  Fixes issue described in
  https://github.com/ppy/osu/issues/36705#issuecomment-3953917163 wherein
  opening a sample popover will disable addition bank toggles and toggle
  off all addition samples.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Bartłomiej Dach · 2026-02-26 15:18:29 +09:00
  7e2771c3f0
• Fix changing normal sample bank via keyboard hotkeys not updating addition bank if set to auto (#36741)

  Closes https://github.com/ppy/osu/issues/36703.
  
  It was only broken via keyboard hotkeys and not via the sample popover
  because the sample popover has a separate copy of the logic that didn't
  have the bug. Compare:
  
  
  https://github.com/ppy/osu/blob/13aeed15f95fa6585ff01eedaccc43b28ff656cb/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs#L473-L475
  
  I considered splitting a helper to have one copy of the logic but it's
  not very simple to do compared to a two-liner fix so I gave up.

  Bartłomiej Dach · 2026-02-26 02:47:45 +09:00
  5174d8b918
• Rename one more missed song select v2 class
  Dean Herbert · 2026-02-25 02:18:18 +09:00
  ee8d99034c
• Remove V2 suffix from migrated classes
  Dean Herbert · 2026-02-24 20:23:29 +09:00
  fabce18552
• Combine old classes to provide better starting point for migration
  Dean Herbert · 2026-02-24 20:23:28 +09:00
  cb12d35d8f
• Remove no longer used class
  Dean Herbert · 2026-02-24 20:23:28 +09:00
  efc9a27d2d
• Fix spectator player cells not having initial shadow edge effect set (#36729)

  - Fixes https://github.com/ppy/osu/issues/36727
  
  Copies/sets the non-maximised edge effect initially:
  
  
  https://github.com/ppy/osu/blob/c144cf188a37ebc965b25818938527c02013efc4/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.Cell.cs#L83-L88

  Joseph Madamba · 2026-02-21 23:19:32 +09:00
  29a39cbfb7
• Merge branch 'master' into multiplayer-freestyle-select
  Bartłomiej Dach · 2026-02-19 10:55:30 +01:00
  d3b48364c5
• Merge pull request #36694 from peppy/freestyle-select-update

  Migrate playlist freestyle select screen to use `SongSelectV2`

  Bartłomiej Dach · 2026-02-19 10:55:07 +01:00
  9ae99648fb
• Disable footer buttons on freestyle song select

  - The mods button should not be visible because it is not hooked up
    properly to actually work with selecting user mods. As written it
    would show (and feign the ability to modify) required mods on the
    playlist item.
  
    You could probably adjust the logic to make user mods controllable via
    this button but this is simpler for now.
  
  - The random and options buttons could perhaps remain, but they are of
    very limited use on this screen anyway.
  
  The previous iteration disabled all footer buttons altogether, so I'm
  just following precedent here mostly.

  Bartłomiej Dach · 2026-02-19 10:07:51 +01:00
  f9f927fa45
• Disallow use of scoping button when at freestyle song select
  Dean Herbert · 2026-02-19 01:47:03 +09:00
  1153d17153
• Privatise setter
  Bartłomiej Dach · 2026-02-18 14:42:04 +01:00
  e15cb08b44
• Migrate multiplayer freestyle select screen to use SongSelectV2
  Dean Herbert · 2026-02-18 20:50:17 +09:00
  48544733c3
• Add ability for LoadingLayer to block all keyboard input
  Dean Herbert · 2026-02-18 20:50:14 +09:00
  d33a6d5512
• Fade out header line for now to avoid visual overlap
  Dean Herbert · 2026-02-18 20:48:17 +09:00
  110f11fa5e
• Migrate playlist freestyle select screen to use SongSelectV2
  Dean Herbert · 2026-02-18 20:30:14 +09:00
  93d1a61dc2
• Add ability for LoadingLayer to block all keyboard input
  Dean Herbert · 2026-02-18 20:01:38 +09:00
  83587e2265
• Prevent tagging beatmaps when played with conversion mods (#36684)

  Closes #36553.
  Supersedes #36614.
  
  As discussed in #36614, the only exception to this is `ModClassic`.

  Vanni · 2026-02-17 14:49:59 +09:00
  94cec71502
• Use directory of last-selected sample as initial directory in sample set add controls (#36680)

  Closes https://github.com/ppy/osu/issues/36470.
  
  Applied directly to relevant control for now.

  Bartłomiej Dach · 2026-02-17 00:46:30 +09:00
  fc4e29793d
• Restore previous beatmap when leaving scoped mode (#36582)

  Resolves #36288.
  
  If the current selection is still available after leaving scoped mode,
  it's left as is. If it's not, the selection from before entering scoped
  mode is restored.
  
  
  https://github.com/user-attachments/assets/b1ac3de1-7c7f-4949-82a9-1dd0459f3f61
  
  ---------
  
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Krzysztof Gutkowski · 2026-02-17 00:40:29 +09:00
  8e26cf4e1b
• Add explanations for scoring mode used in ranked & total score tooltips (#36663)

  Because people get confused by how this works.
  
  Shows on results screen where the post-play statistics updates go.
  
  
  https://github.com/user-attachments/assets/ef3a91d1-86dd-4029-8f0f-bdf0b727ca6c

  Bartłomiej Dach · 2026-02-14 01:24:42 +09:00
  94d9de955f
• Fix corner radius for user tag glow (#36659)

  Fixes incorrect glow corner radius around user tag buttons
  
  Before:
  <img width="267" height="123" alt="image"
  src="https://github.com/user-attachments/assets/3e602e84-bb13-46f7-942c-85ddf3954946"
  />
  After:
  <img width="227" height="102" alt="image"
  src="https://github.com/user-attachments/assets/4dca2e3d-80e2-4b6c-988e-d14f371cfbe8"
  />

  Neti · 2026-02-13 14:48:07 +09:00
  860427e4ae
• Refactor UpdateableTeamFlag for use on team overlay (#36286)

  Part of #32584.
  
  Very much inspired by the respective component for displaying profile
  pictures on the user overlay
  
  * allow disabling interactivity/tooltips
  * add option to show placeholder on null team instead of hiding
  component entirely
  * move setting corner radius out to respective parent components to
  allow for easier overriding

  Krzysztof Gutkowski · 2026-02-10 23:18:36 +09:00
  50426eb3c8
• Rename Ruleset.GetHitResults{ -> ForDisplay}()
  Bartłomiej Dach · 2026-02-09 12:00:15 +01:00
  dbce8886f8
• Fix local beatmap metadata not being cleared when previously selected beatmap is online (#36632)

  - Closes https://github.com/ppy/osu/issues/36584
  
  The last two commits could be either fixes to the issue above, but in a
  code quality perspective, the scheduler in `setLink()` seems unnecessary
  as the other set methods don't have it (other than making it run last)
  and the other commit is self explanatory.

  Joseph Madamba · 2026-02-09 09:55:36 +09:00
  0a4497db3c
• Localise "lounge" & "quick play" in ButtonSystem (#36220)
  Denis Titovets · 2026-02-09 01:52:43 +09:00
  bb04a18060
• Fix seeking to previous bookmark not working when song is playing (#36616)

  - Closes https://github.com/ppy/osu/issues/35389
  
  Same as:
  
  https://github.com/ppy/osu/blob/2efe0c95e63817f312f5fb12cc60dd56bee0023b/osu.Game/Screens/Edit/Editor.cs#L1173-L1180
  
  There's also seeking hit objects and sample points, but the seeks are
  relatively close to each other and probably useless when playing(?). If
  we want to make those cases not stuck at the same point in time, I
  believe the leniency should be lower than 1000 ms.
  
  With the above, that is why I just copy-pasted the code, as we may want
  to have different leniencies.
  
  Edit: forgot the automated label thing, will not label next time

  Joseph Madamba · 2026-02-08 23:57:22 +09:00
  239951eda9
• Change difficulty range slider colors to match star rating more closely (#36564)

  my attempt at #36452: changes difficulty range slider in song select V2
  to use the new star difficulty text gradient colors from #36292.
  
  closes #36405
  
  
  https://github.com/user-attachments/assets/134ace54-a8f8-4024-a32e-f1604c868232
  
  to match star rating more closely for sr <= 7.5 (where i don't think the
  colors are so intense that they break harmony with the rest of the
  design), i removed the Lighten by 0.4f on color update
  
  also improved the transition from 7.9 to 8.0 which is quite abrupt in
  the current version
  
  https://github.com/ppy/osu/pull/33425#issuecomment-2951914385 is
  relevant here

  Michael Middlezong · 2026-02-06 19:15:57 +09:00
  5231cfa1c7
• Localise some strings on SSV2 (#36591)
  Denis Titovets · 2026-02-06 19:12:07 +09:00
  40b331654e
• Invert quick play queue backgrounding and canceling flow (#36247)

  - Exiting while queueing will now background the search.
  - The "queue in background" button changed to "stop queueing".
  
  Exiting while in the "pending accept"/"waiting for players" states will
  exit from the queue. There is also a small period during the in-room
  state (where the matchmaking screen hasn't been pushed yet but "good
  luck" is displaying) where the user cannot exit from the screen. I've
  removed the exit confirmation dialogs to streamline the process and
  align with this.
  
  
  https://github.com/user-attachments/assets/8c172502-0624-42cd-ae0c-bb710068267c

  Dan Balasescu · 2026-02-01 02:19:20 +09:00
  9e9b5cfc50