osu-lazer

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

Fix subscription leak from composer reloads (#36828 )

The reproduction scenario for the subscription leak is as follows:

1. Switch to a scrolling ruleset (anything but osu! from the standard
ones).
2. Select a beatmap to edit.
3. Load the composer.
4. Go to timing tab.
5. Change a timing point.
6. Go back to the composer.

At this point, `EditorChangeHandler.OnStateChange` will have multiple of
the same delegate in the invocation list.

That in turn is caused by the fact that changing a timing point *does*
incur a full reload of the composer via the following flow:

https://github.com/ppy/osu/blob/15b6e28ebe888b1a87574891be1a0db3b04093b7/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs#L145
https://github.com/ppy/osu/blob/64a29313a852d50095ae4b7ea8f22fde23aa634f/osu.Game/Screens/Edit/Editor.cs#L1137-L1145

This flow is my "fault"; see https://github.com/ppy/osu/pull/28444. The
reason why a full composer reload is used is not clear to my
recollection at this time, but it is likely because it's just the least
likely to fail. A smarter solution that wouldn't require a full reload
would also entail checking that there exists a safe insertion point that
allows replacing timing points in a way that will reflect everywhere it
must. Including all of the `IScrollingAlgorithm` machinery and such.

In general it is not uncommon in the codebase to not bother to clean up
some event callbacks if it is implicitly or explicitly guaranteed that
both objects bound by the callback will always get disposed in tandem at
the same time. This *was* true with this particular flow to a point,
which was until that full composer reload was implemented.

<details>
<summary>To address the elephant in the room</summary>

Someone will inevitably notice https://github.com/ppy/osu/pull/36824
which was a clanked pull request pointing out this leak. And then
someone will inevitably call this "AI discrimination"! *Gasp!*

So first of all, let me stop you right there. Yes, as far as I am
_personally_ concerned, it is "AI discrimination". I invoke the full
force of the Butlerian Jihad.

The clank army's goal is to eradicate my job and make me work in an
Amazon warehouse instead. Or, if not that, at least my job is to be rid
of all remnants of fun I still get from it and for me to be reduced to
that one guy from the meme "i guess we're doin circles now". You know
the one.

I resent this. You attack me directly. I do not perceive the need to
meet you halfway or be civil.

That said, I have too much respect for the users of this software to
leave reports of potentially real issues unchecked. So I did check, and
it was real. And you know what? Good job to the clanker. It did what it
was designed to do: it parsed a code file, recognised a hole in a
pattern it was designed to recognise, and invoked forms of language
given to it to communicate this to the meatbag that opened that PR.

And here's the thing: my primary issue is with that meatbag that opened
that PR. That meatbag served no functional purpose in any of this. The
meatbag took a hose that spews 90% water and 10% raw sewage at random
intervals and pointed it at my house directly, claiming that they just
want to clean it. At no point did the meatbag appear to have the common
decency to pull out a container, pour some magic liquid out, check if
there's sewage in it, and filter it out if there is any. But no, that
would take *effort* and *thought*, would it not? The *effort* and
*thought* that is required of *me* to *review* the clanker's work?

The PR had no reproduction scenario, and had testing checkboxes that
were presumably meant for *me* to check off. Why is it *my* job to
figure all of this out rather than the submitter meatbag's?

I do *not* have obligations towards spew-hose-pointing meatbags. Point
that hose at your own backyard at your peril.

If you *actually manage* to get the clanker to filter out *all* of the
spew without fail itself, my only win condition is gone. But it is not
yet that time. So at least have the decency to check for the spew
yourself, rather than telling the clanker to put checkboxes in the PR
descriptions telling *me* to check for it.
</details>

Bartłomiej Dach · 2026-03-05 22:37:50 +09:00

43897457fb

Update resources

Dean Herbert · 2026-03-05 14:58:12 +09:00

2026.305.0-lazer bb289363a2

Use web localisation on LeaderboardScopeSelector to match osu-web (#36814 )

- regressed in
https://github.com/ppy/osu/commit/1f052bb195bfc5a2681b1b324bf34764641a1c40
- also see https://github.com/ppy/osu/pull/34074#discussion_r2211853662

did it by analogy with
https://github.com/ppy/osu/blob/a0ecbd7c8704d6beee3e5c54c2ccb5f735872fb0/osu.Game/Overlays/BeatmapSet/Scores/NoScoresPlaceholder.cs#L27-L49

| master | pr | `osu-web` |
|-|-|-|
| <img width="1625" height="188" alt="osu_2026-03-04_18-26-44"
src="https://github.com/user-attachments/assets/9bd2690a-2ddf-4f03-9ca6-22003efbd895"
/> |
![osu_2026-03-04_18-36-12](https://github.com/user-attachments/assets/1498c4a9-7188-4e97-a6bd-3553b9befa5e)
| <img width="990" height="139" alt="Снимок экрана 2026-03-04 182558"
src="https://github.com/user-attachments/assets/1bf14bee-3097-478d-936b-6ecb7d912be2"
/> |

---------

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

Denis Titovets · 2026-03-05 13:40:31 +09:00

28a18f768c

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

Reduce online user list panel churn on initial display (#36811 )

Yes this is a funny way of doing it, but it works and is better than
what we have for the initial release.

Don't expect this to stay around forever.

Dean Herbert · 2026-03-05 00:44:03 +09:00

2026.304.0-tachyon cab50e94c8

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

Merge pull request #36798 from bdach/tags-broken

Fix a bunch of breakage around user tags

Dean Herbert · 2026-03-04 21:16:38 +09:00

a0ecbd7c87

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

Merge pull request #36752 from peppy/song-select-v1-salute

Remove remnants of song select v1 and move v2 to final resting location

Bartłomiej Dach · 2026-03-04 10:27:07 +01:00

4c873787c1

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

Fix beatmap set overlay not showing user tags at all

Regressed in 60d9c358b8.

In general an `APIBeatmap`'s `BeatmapSet` need not be present. In the
usage site of `osu.Game.Overlays.BeatmapSet.Info`, `Beatmap` and
`BeatmapSet` were actually two separate bindables. Moving the logic to a
helper, and therefore implicitly moving `BeatmapSet` from tracking said
separate bindable to instead refer to `Beatmap.BeatmapSet` broke this.

Bartłomiej Dach · 2026-03-03 12:44:29 +01:00

e64e0f0ca9

Merge pull request #36796 from Joehuu/standardise-play-favourite-order

Standardise display order of playcount / favourites

Bartłomiej Dach · 2026-03-03 11:22:51 +01:00

2026.303.0 d37f59430b

Merge pull request #36795 from peppy/carousel-scrollbar-state-capture

Fix song select carousel state capture

Bartłomiej Dach · 2026-03-03 10:40:25 +01:00

d748470754

Merge pull request #36794 from peppy/fix-tooltips-not-displaying-custom

Fix offset slider no longer showing explanatory tooltip correctly

Bartłomiej Dach · 2026-03-03 10:32:15 +01:00

2539bd90fa

Final attempt to make copy labels work

Dean Herbert · 2026-03-03 17:24:29 +09:00

317be21569

Update framework

Dean Herbert · 2026-03-03 17:20:14 +09:00

b1044b6b2d

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

Fix a few remaining references to old song select

Dean Herbert · 2026-03-03 16:45:12 +09:00

a7e6286396

Remove now unused footer buttons

Dean Herbert · 2026-03-03 16:25:58 +09:00

521a40d860

Add tooltips to beatmap info overlay statistics

Joseph Madamba · 2026-03-02 22:53:09 -08:00

564b6ebd0c

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

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 song select carousel state capture

Closes #36776.

Dean Herbert · 2026-03-03 15:36:46 +09:00

b0759ff34d

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

Fix custom tooltip formats no longer displaying in settings

Closes #36793.

Dean Herbert · 2026-03-03 12:59:23 +09:00

ee9f8d5e92

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

76617 Commits