76579 Commits

This Branch

This Branch

All Branches

• Change beatmap card play count and date icon to solid to match web
  Joseph Madamba · 2026-03-02 22:40:16 -08:00
  b831bcbcd4
• Standardise display order of playcount / favourites
  Joseph Madamba · 2026-03-02 22:37:32 -08:00
  c372f9b8f5
• Fix ordering of skins not working as expected (#36772)

  As mentioned
  [here](https://github.com/ppy/osu/pull/11536#issuecomment-3977314909).
  
  Realm ordering is weird/broken so let's just do it at our end.

  Dean Herbert · 2026-03-03 14:03:55 +09:00
  d60a12a351
• 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
• Apply more sanity checks when handling files from archives
  Bartłomiej Dach · 2026-03-02 13:11:01 +01:00
  9c8dfaf386
• Fix song select navigation with page up/down (#36293)

  Resolves #36099 
  
  This PR fixes keyboard navigation in the beatmap select carousel for
  lazer by implementing page-wise traversal with the Page Up and Page Down
  keys and changing it from only scrolling to actually selecting items.
  
  **Changes:**
  - Added handling for `TraversalType.Page` in the keyboard traversal
  switch.
  - Implemented `traverseKeyboardPage(int direction)` method to move the
  selection by approximately one "page" of visible items, accounting for
  partially obscured items like the search bar. Also it does not wrap
  around (like the current PageUp/Down functionality).
  - Added new key bindings:
      - `PageUp` → SelectPreviousPage
      - `PageDown` → SelectNextPage
  
  The code may be very explicit for the scroll logic with the page keys,
  so I would appreciate some feedback when the PR is reviewed.
  The naming of the keybinds may need to be adjusted. `Next page` and
  `previous page` may be somewhat misleading.
  
  **Behavior after the change:**
  - Pressing Page Up/Down now moves the selection by a page of items.
  - After navigating, pressing Left/Right selects the navigated song
  instead of moving relative to the previous position.
  
  **See:**
  https://www.youtube.com/watch?v=JXmKAhhKiCc
  
  ---------
  
  Signed-off-by: Linus Genz <linuslinuxgenz@gmail.com>
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Linus Genz · 2026-03-02 02:08:19 +09:00
  033e13cb3b
• 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
• Use better text structure for ScreenshotSaved notification (#36701)

  reads a bit better when filename isn't in main text
  
  also added "click to view" text by analogy with `LogsExportFinished`
  
  | master | pr |
  |-|-|
  | <img width="336" height="114" alt="image"
  src="https://github.com/user-attachments/assets/2555390c-1299-43ae-9be5-cb8d091b3387"
  /> | <img width="336" height="108" alt="image"
  src="https://github.com/user-attachments/assets/a8f18d9f-fa11-4d8f-82af-c88b0f82576c"
  /> |

  Denis Titovets · 2026-02-28 22:58:07 +09:00
  9c489aacf8
• 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
• 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
• Merge pull request #36767 from LiquidPL/cleanup-online-play-tests

  Remove redundant footer from `TestScenePlaylistsRoomSubscreen`

  Dean Herbert · 2026-02-27 20:13:21 +09:00
  2e659a79ec
• 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
  2026.226.0-tachyon 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
• Merge pull request #36751 from peppy/fix-hidden-controls-settings

  Fix input settings being interactive even when collapsed

  Bartłomiej Dach · 2026-02-25 10:38:10 +01:00
  32d10406c9
• Use HotkeyDisplay for toolbar buttons (#36750)

  Uses `HotkeyDisplay` for toolbar button tooltips rather than
  `SpriteText`
  
  <img width="433" height="160" alt="image"
  src="https://github.com/user-attachments/assets/d74c4dd2-27fd-4e7c-881e-3c6152982dd6"
  />
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Neti · 2026-02-25 16:31:36 +09:00
  0dfb362b2d
• Fix hidden settings flow content still being interactive

  `AlwaysPresent` is a code smell here. Rather than doing this, let's just
  using masking as we usually do.
  
  Closes https://github.com/ppy/osu/issues/36748.

  Dean Herbert · 2026-02-25 14:35:24 +09:00
  047ea7c09d
• Fix flow animating its display initially when it shouldn't
  Dean Herbert · 2026-02-25 14:34:50 +09:00
  cb597c4120
• Tidy up how SettingsSubsection headings are created

  Previously we were always making header content in the base class then
  overwriting it, which felt ick.

  Dean Herbert · 2026-02-25 14:34:49 +09:00
  99ab245cf0
• Rename one more missed song select v2 class
  Dean Herbert · 2026-02-25 02:18:18 +09:00
  ee8d99034c
• Merge pull request #36746 from bdach/fix-thing-again
  Dean Herbert · 2026-02-24 21:48:06 +09:00
  5b1d4ceb9d
• Attempt to fix "copy labels from issues" workflow permissions again

  It's still broken:
  
  https://github.com/ppy/osu/actions/runs/22310482792/job/64540909415
  
  and I'm not sure what else it could be other than this, so I'm giving it
  one more honest try before I throw up hands.
  
  For better or worse,
  https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#permissions
  explicitly lists that the `pull-requests` permission allows tagging PRs,
  so I'm holding out hope that this is it. Still terrible marks for
  documentation here, both to the github action, as well as everything to
  do with `GITHUB_TOKEN`.

  Bartłomiej Dach · 2026-02-24 13:34:06 +01:00
  ccb0224a1b
• Merge pull request #36745 from peppy/song-select-cleanup

  Various song select class cleanup

  Bartłomiej Dach · 2026-02-24 13:24:18 +01:00
  5602281bd9
• 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
• Merge pull request #36738 from peppy/user-button-animation-fix

  Fix transient user stats animation changing speed after first display

  Bartłomiej Dach · 2026-02-24 08:19:02 +01:00
  e2cbfb970e
• Move spacing local to usages
  Dean Herbert · 2026-02-23 15:59:09 +09:00
  f39615a374
• Move toolbar button text local to single usage in ToolbarUserButton
  Dean Herbert · 2026-02-23 15:58:57 +09:00
  4916c87f14
• Move transformation logic local to transient drawable
  Dean Herbert · 2026-02-23 15:47:01 +09:00
  a09489d4c0
• Update resources
  Dean Herbert · 2026-02-23 03:37:40 +09:00
  d139f5997c
• 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
• Fix reversing straight perfect curve sliders positioning them weirdly (#36698)
  Arthur Araujo · 2026-02-20 16:57:42 +01:00
  c144cf188a
• Adjust nightcore sample playback to not stop randomly and be closer to stable (#36702)

  - Closes https://github.com/ppy/osu/issues/30293
  - Fixes https://osu.ppy.sh/community/forums/topics/2179339?n=1
  
  Aside from fixing the off-by-one error that I mentioned in
  https://github.com/ppy/osu/issues/30293#issuecomment-2413801663, this
  also:
  
  - Brings back the behaviour wherein if timing points are arranged very
  weird and nightcore would play e.g. two first beats in a timing point
  back-to-back, the second timing point is silent.
  - Brings back the behaviour wherein the finish sample only plays if
  `OmitFirstBarLine` on the timing point is disabled.
  
  However:
  
  - This does not bring back the behaviour wherein hat samples only play
  if the slider tick rate is even because that only kind of makes sense in
  common time, and if common time is mixed with waltz time or other time
  signatures, it just gets weird.
  - Also stable has zero attempt for compensating for waltz time anyway,
  lazer's behaviour is bespoke, so that is not going to match any way you
  cut it.
  
  My testing procedure essentially consisted of getting stable to log when
  it was playing nightcore samples and cross-checking the first 30sec or
  so of https://osu.ppy.sh/beatmapsets/534385#osu/1131956 (check out the
  timing of that beatmap, for something ranked it is DEEPLY messed up).
  
  I guess I can add test cases if deemed required but I already wasted
  much more time than I would have liked here...

  Bartłomiej Dach · 2026-02-20 12:53:12 +09:00
  1e8b9a7639
• Merge pull request #36696 from peppy/multiplayer-freestyle-select

  Migrate multiplayer freestyle select screen to use `SongSelectV2`

  Bartłomiej Dach · 2026-02-19 12:16:51 +01:00
  69c2747883
• 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
• Merge pull request #36695 from peppy/loading-layer-block-non-positional

  Add ability for `LoadingLayer` to block all keyboard input

  Bartłomiej Dach · 2026-02-18 14:40:31 +01:00
  25d630898b
• 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
• 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
• 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
• Add "spin" keyword for menu cursor rotation
  Dean Herbert · 2026-02-18 17:21:03 +09:00
  f15e086bb0
• Merge pull request #36687 from peppy/legacy-key-counter-skinnable-font

  Fix legacy key counter not using skin's font

  Bartłomiej Dach · 2026-02-18 08:26:21 +01:00
  9fa78123a6
• Ensure state resets back to initial display on rewind
  Dean Herbert · 2026-02-18 02:25:09 +09:00
  7445efaecd