13449 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
• Merge branch 'master' into song-select-v1-salute
  Bartłomiej Dach · 2026-03-04 08:39:58 +01:00
  f74a21c1e1
• 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
• Update TestSceneDeleteLocalScore to use newer leaderboard
  Dean Herbert · 2026-03-03 16:45:14 +09:00
  7e7421e1ea
• 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
• Add nominations statistic to beatmap info overlay

  See https://github.com/ppy/osu-web/blob/2198adfa68bf24709c3b0cc2e6d838e86be5b1d1/resources/js/beatmapsets-show/header.tsx#L116-L123.

  Joseph Madamba · 2026-03-02 22:47:10 -08:00
  7dfbab212e
• 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
• Refactor TestSceneScreenFooter to test entire OsuScreens (#36718)

  Part of the `ScreenFooter` refactor, which intends to move the footer
  content handling to `OsuScreen`. This commit updates the `ScreenFooter`
  test to operate on entire `OsuScreen`s, in order to better test the
  entire flow of pushing a screen, and having it create and add its own
  content to the footer.
  
  This should be 80-90% identical to the original test case structure
  wise, just that instead of manually manipulating the footer with
  `SetButtons()`, various screens with the appropriate buttons are being
  moved around the screen stack.
  
  Additionally this adds some more tests handling common use cases, as
  well as removes `TestLoadOverlayAfterFooterIsDisplayed()`, since as far
  as I understand the behaviour described in it doesn't actually happen in
  production code. From what I can see, Screens instantiate their overlays
  in `load()`, and then register them in `LoadComplete()`. There seems to
  be no case where a `ShearedOverlayContainer` is created in the middle of
  a screen's lifecycle.

  Krzysztof Gutkowski · 2026-03-01 22:36:07 +09:00
  b88cba0829
• Migrate sheared overlay tests to ScreenTestScene (#36736)

  Part of the screen footer refactor.
  
  Once footer content is being managed by `OsuScreen`, the current tests
  which simply create the tested overlay and `ScreenFooter` in a container
  will no longer work.
  
  This PR refactors them to use `ScreenTestScene` with the setup being
  creating a dedicated testing `OsuScreen` which does the bare minimum to
  create the tested overlay and necessary components (eg.
  `FooterButtonFreeModsV2` for `TestSceneFreeModsOverlay`).
  
  Most of the changes here can be described as
  `%s/<...>Overlay/screen.Overlay/g`, with some minor touchups as
  necessary, given that we're now testing a more complete flow which
  checks more things that were previously not handled by the tests.
  
  ## [Move footer to front in
  ScreenTestScene](https://github.com/ppy/osu/commit/f8740e0403b3c0badd60d394c737f2aa912a9ed6)
  
  Self-explanatory. Without it the footer would show below the actual
  overlay, breaking tests depending on manual input. For the sake of tests
  not breaking in CI, both #36718 and this have this included - would
  prefer the former to be merged first since it was already reviewed
  there.
  
  ## `TestSceneModSelectOverlay`
  
  There were a few tests (`TestColumnHidingOnIsValidChange`,
  `TestColumnHidingOnTextFilterChange`, and
  `TestHidingOverlayClearsTextSearch`) that would create a custom overlay
  instance instead of the globally provided one. I've tested both and the
  tests run fine with the default overlay, so they're now using that
  instead.
  
  ## `TestSceneFreeModSelectOverlay`
  
  Updated to use footer v2.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Krzysztof Gutkowski · 2026-02-28 04:22:58 +09:00
  105342e5bf
• Remove redundant footer from TestScenePlaylistsRoomSubscreen

  `ScreenTestScene` already provides one.

  Krzysztof Gutkowski · 2026-02-27 11:12:30 +01:00
  5131b188d1
• 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
• 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
• Add test coverage of actual user flows involving freestyle select screen

  Of note, this test scene still doesn't use the new footer properly.
  Should these even be here? Maybe it's better to leave these real world
  flows to a `Navigation` style test so we're not dealing with weird test
  setups that kinda do something but don't... or maybe do it in three
  different ways (two footers present, three back buttons etc.)
  
  Dunno. But this kind of covers what I want (except it doesn't cover the
  new footer usage).

  Dean Herbert · 2026-02-18 20:48:16 +09:00
  fb8c228d32
• 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
• Preserve bookmarks when creating a new difficulty from scratch (#36675)

  Closes #33395
  
  Copies the bookmarks from `referenceWorkingBeatmap` while creating a new
  difficulty from scratch. I adapted the tests in
  `TestSceneEditorBeatmapCreation` to include the bookmark checks.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Arthur Araujo · 2026-02-16 12:50:04 +09:00
  2f459dd94e
• 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
• Merge pull request #36639 from bdach/actually-all-valid-hit-results

  Refactor hit result methods on `Ruleset`

  Dean Herbert · 2026-02-10 17:07:04 +09:00
  c59e5bf335
• Perform extra checks when loading rulesets (#36641)
  Bartłomiej Dach · 2026-02-10 13:34:43 +09:00
  655d725f0c
• Publicise Ruleset.GetValidHitResults()
  Bartłomiej Dach · 2026-02-09 12:00:30 +01:00
  3678ea0d0f
• Add missing wait step to fix flaky test in TestSceneModPresetColumn

  See
  https://github.com/ppy/osu/actions/runs/21799682256/job/62893024859?pr=36627

  Dean Herbert · 2026-02-09 12:50:40 +09:00
  f39b310eb5
• Allow binding left/right modifier keys separately for gameplay bindings (#36585)

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

  failaip12 · 2026-02-09 10:15:34 +09:00
  01982030ec
• 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 some strings on SSV2 (#36591)
  Denis Titovets · 2026-02-06 19:12:07 +09:00
  40b331654e
• Fix star rating no longer updating from mod setting changes after re-entering song select (#36601)
  Bartłomiej Dach · 2026-02-06 19:00:20 +09:00
  5e01dda411
• Implement sorting and display styles for currently online users (#33649)

  - Adds sorting and display styles.
  - Saves sort/display modes to the config.
  - Improves performance, especially on the 2nd+ time opening the overlay.
  
  
  https://github.com/user-attachments/assets/e32b50d0-58a1-4eef-b18c-988fb497e545
  
  ---
  
  Coming off some recent feedback in
  https://github.com/ppy/osu/discussions/33426#discussioncomment-13431275,
  I decided to take a bit of a detour and get a little bit more
  functionality in.
  
  Sorting by rank, although it should technically work, doesn't work right
  now. This is because the osu!web API doesn't return user rank on
  `/user/` lookups - it's only returned for the friends request. I'm
  leaving this open as a discussion topic.
  - We can make osu!web return the rank and osu! will require no further
  changes to work correctly, or
  - We can try to implement additional paths through
  `osu-server-spectator` which would blow this PR out of proportion and is
  best left for a task of its own.
  
  For simplicity, I've re-implemented this display mostly as its own
  component for now, lifting code from `FriendDisplay` which was recently
  overhauled. These implementations should eventually be combined somehow
  but that's dependent on:
  1. Figuring out the styling - friends can display offline users for
  which it makes no sense to display the "spectate" button.
  2. Figuring out how to handle the different users/presence pathways.
  It's mostly a code complexity issue.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Dan Balasescu · 2026-02-05 01:22:36 +09:00
  1230da33a5
• Add failing test coverage
  Dean Herbert · 2026-01-29 01:47:13 +09:00
  5dd34f165f
• Fix panel expansion not being set on initial song select load (#36456)

  Closes #36445.
  
  Fixes a regression from #36404
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Eeli Ogata · 2026-01-27 14:32:51 +01:00
  2c56419fe9
• Merge pull request #36471 from peppy/fix-previous-username-depth

  Fix previous usernames display showing underneath other elements

  Dean Herbert · 2026-01-26 10:09:39 +01:00
  4ff29339ed
• Apply new inspections from 2026.1EAP1

  Nothing really egregious here so not bothering with PR review. One dodgy
  bug which has been
  [reported](https://youtrack.jetbrains.com/issue/RIDER-135036/Incorrect-recursive-on-all-execution-paths-inspection)
  and temporarily ignored.

  Dean Herbert · 2026-01-26 15:12:52 +09:00
  f1f4a0001b
• Add some more extra test coverage
  Bartłomiej Dach · 2026-01-23 13:18:48 +01:00
  259c5708f1
• Add failing tests
  Bartłomiej Dach · 2026-01-23 07:50:20 +01:00
  d80934c344
• Merge pull request #36392 from iwa/feat/numeric-hotkeys-for-presets-mod-select

  Mod Select: Support numeric row hotkeys to quick select Presets

  Dean Herbert · 2026-01-23 03:28:52 +09:00
  6f038bff48
• Add test coverage
  Dean Herbert · 2026-01-23 01:13:49 +09:00
  98c6f6afcd
• Fix wrong type in enabled check
  Bartłomiej Dach · 2026-01-22 12:57:47 +01:00
  52d5c986ef
• Fix some intermittent test failures
  Dean Herbert · 2026-01-22 19:25:25 +09:00
  d4cf46e3cd
• Merge branch 'master' into new-settings/overlay
  Dean Herbert · 2026-01-22 18:38:17 +09:00
  42302c45ec
• Fix weird typo brain turned off
  Dean Herbert · 2026-01-22 16:43:46 +09:00
  1e8ffdf128
• Add failing test case showing visual state desync
  Dean Herbert · 2026-01-22 14:59:41 +09:00
  6f146a5ce9
• Add failing test showing incorrect behaviour on random select with collapsed groups
  Dean Herbert · 2026-01-20 21:12:48 +09:00
  76f05a4837
• Update editor slider controls to new design (#36346)

  (partially) Closes: #36233
  Surpasses: #36244 
  
  This PR meant to be one of the last steps that finally make editor use
  the new forms. Initially it meant to only change one
  SliderWithTextBoxInput in "Effects section" in timing screen, however
  soon after it was obvious that there's many other places that still
  using it. This currently won't affect
  IndeterminateSliderWithTextBoxInput that is being used in hitsounds, for
  example, since I think it needs more consideration.
  Anyways, with this PR, SliderWithTextBoxInput, will no longer be used at
  all, as it's going to be replaced with modern FormSliderBar
  
  Comparison:
  |master|this PR|
  |:---:|:---:|
  |<img width="510" height="316"
  alt="532203751-eb965923-d3a8-441d-a7c8-5c364a6328ad"
  src="https://github.com/user-attachments/assets/268b45b8-e235-494f-91a5-d00db057dba8"
  />|<img width="540" height="321"
  alt="535466527-3a700a8b-bc3c-4610-998f-a4e55ee03eed"
  src="https://github.com/user-attachments/assets/20cd4b58-b0bd-49bc-8c48-7de5cf8556b3"
  />|
  |<img width="694" height="639"
  alt="534509844-f00e4da4-53c4-45e8-80ea-1be62da6c83b"
  src="https://github.com/user-attachments/assets/398c4484-a867-4df1-9de3-0940aa748a01"
  />|<img width="720" height="433" alt="изображение"
  src="https://github.com/user-attachments/assets/b6359443-a224-4a55-b171-07e8f013cf46"
  />|
  |<img width="715" height="353"
  alt="534509421-a6ac950f-16e8-4a16-bca6-1a781f82135f"
  src="https://github.com/user-attachments/assets/4854312b-772f-4b81-a800-89e58d4c715d"
  />|<img width="710" height="296" alt="изображение"
  src="https://github.com/user-attachments/assets/a7fed53e-e006-4285-92c9-bb84cb603f60"
  />|
  |<img width="717" height="374"
  alt="534509478-80222623-7766-481d-8682-088276d415ee"
  src="https://github.com/user-attachments/assets/8143b6dc-4599-45d5-bd3b-f059caf3d93d"
  />|<img width="718" height="328" alt="изображение"
  src="https://github.com/user-attachments/assets/bffa04de-983c-45ae-a1ec-373701ea0e49"
  />|
  |<img width="702" height="446"
  alt="534509935-58954060-7ac1-4392-8754-a58f909e86aa"
  src="https://github.com/user-attachments/assets/2bb67a2d-3f57-42a1-96ce-b30b4891e1a4"
  />|<img width="722" height="386" alt="изображение"
  src="https://github.com/user-attachments/assets/01b7fff4-7f31-4aac-90c9-353b15f4964e"
  />|

  De4n · 2026-01-16 20:08:52 +09:00
  e05b6f44b9
• Fix double-clicking form slider bar not propagating default to other bindables when TransferValueOnCommit is true (#36354)

  - Addresses https://github.com/ppy/osu/pull/36346#discussion_r2692322683
  
  The inner slider bar binds its `Current` to
  `currentNumberInstantaneous`:
  
  
  https://github.com/ppy/osu/blob/1add946db486c866cc214c5eb3d728f308aad637/osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs#L225-L236
  
  But the current bindable of the form component doesn't update because of
  this.
  
  
  https://github.com/ppy/osu/blob/1add946db486c866cc214c5eb3d728f308aad637/osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs#L285-L293
  
  Fixed it by just moving the `ResetToDefault` action up another level.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Joseph Madamba · 2026-01-16 19:48:36 +09:00
  a8ada50549
• Fix weirdly defined constant
  Dean Herbert · 2026-01-15 19:01:32 +09:00
  cd433fea50