3288 Commits

• Add support for grouping beatmaps by collections

  Takes changes in https://github.com/ppy/osu/pull/34233 and removes *all*
  of the complexity.
  
  Supersedes and closes #34233.
  
  Contains same caveat that we can only display one beatmap once in the
  carousel; this will be addressed separately.

  Dean Herbert · 2025-08-01 16:23:26 +09:00
  c3396a93a6
• Fix code quality
  Bartłomiej Dach · 2025-07-30 15:00:55 +02:00
  640fe5752d
• Rename property to reduce confusion

  Caused an actual bug in one of the replaced usages.

  Bartłomiej Dach · 2025-07-30 14:06:38 +02:00
  cd2c5075df
• Fix test
  Bartłomiej Dach · 2025-07-30 14:06:38 +02:00
  1319a5499b
• Migrate other usages of GetAdjustedDisplayDifficulty() to use GetBeatmapAttributesForDisplay() instead

  This ensures parity between all beatmap attribute displays that used the
  former method.

  Bartłomiej Dach · 2025-07-30 14:06:38 +02:00
  a952e3704e
• Refactor beatmap attribute methods

  This change refactors `GetAdjustedDisplayDifficulty()` and
  `GetBeatmapAttributesToDisplay()` in two ways:
  
  - Both methods now accept `IBeatmapInfo` instead of
    `IBeatmapDifficultyInfo`. This is done in order to make mania key
    count display to work, wherein `IBeatmapDifficultyInfo` is not enough
    to calculate the final key count.
  
  - `GetAdjustedDisplayDifficulty()` now applies all
    `IApplicableToDifficulty` mods itself. I did this after noticing that
    every real consumer of this method had to do that themselves for very
    little reason.

  Bartłomiej Dach · 2025-07-30 14:06:34 +02:00
  7c4dd812b6
• Localise Sort dropdown
  Denis Titovets · 2025-07-28 20:48:46 +03:00
  6fbb3294fe
• Merge branch 'master' into ssv2-localisation
  Denis Titovets · 2025-07-28 19:12:34 +03:00
  6936533522
• Rename {-> Max}Combo sort mode

  I have a feeling this is going to save asses in an indeterminate future.

  Bartłomiej Dach · 2025-07-28 11:38:17 +02:00
  f489ffdfd7
• Merge branch 'master' into local-score-sorting-v2
  Bartłomiej Dach · 2025-07-28 11:32:59 +02:00
  c620d58bc2
• Merge branch 'master' into ssv2-localisation
  Denis Titovets · 2025-07-25 11:36:52 +03:00
  4b73afd195
• Fix playlists leaderboard provider not being thread safe

  Should close https://github.com/ppy/osu/issues/34222.
  
  I haven't exactly managed to reproduce the issue myself but I'm
  relatively confident in the imagined mode of failure here. See
  
  	https://github.com/ppy/osu/blob/861a7e1db4b72ccfec67ef5f9a6a19faa0978d3f/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs#L25-L37
  	https://github.com/ppy/osu/blob/861a7e1db4b72ccfec67ef5f9a6a19faa0978d3f/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs#L53

  Bartłomiej Dach · 2025-07-21 10:49:56 +02:00
  fae5c0e7bb
• Merge pull request #34231 from bdach/user-tag-search-wip

  Add initial support for filtering by user tags in song select

  Dean Herbert · 2025-07-21 14:52:47 +09:00
  b4466aa7a2
• Fixed issue #34101 for both Select menus.
  emkodelirdi · 2025-07-18 21:45:54 +03:00
  c9ff57fe72
• Merge branch 'ppy:master' into ssv2-localisation
  Denis Titovets · 2025-07-16 11:59:47 +03:00
  021ef6d727
• Add initial support for filtering by user tags in song select

  The way that this works is that it plugs into the online request to
  retrieve the beatmap set that the client is already performing, and
  stores user tag data to the local realm database.
  
  This means that for now user tags will only populate for beatmaps that
  the user has displayed on song select which is obviously subpar. I plan
  to follow this change up by adding user tag state dumps to `online.db`
  and using that data for initial tag population to make the majority case
  (ranked beatmaps) work.
  
  Note that several decisions were made here that are potential discussion
  points:
  
  - `RealmPopulatingOnlineLookupSource` is set up such that it can be the
    middle man / redirection point for similar flows that we need and we
    are currently missing, such as storing guest difficulty information,
    or storing the user's current best score on a beatmap (handy for rank
    achieved sorting / filtering / etc.)
  
  - The user tags are stored in `BeatmapMetadata` which breaks the
    longstanding assumption that you can arbitrarily pull out a metadata
    instance from any of the beatmaps in a set and get essentially the
    same object back.
  
    I've attempted to constrain this some by not adding user tags to
    the `IBeatmapMetadataInfo` interface through which `BeatmapSetInfo`
    exposes metadata further, but I warn in advance that this is
    a temporary state of affairs and I will make it worse in the future
    when `BeatmapMetadata.Author` becomes `Authors` plural in order to
    support guest mapper display (and direct guest difficulty submission).
  
  - The syntax for searching via user tags is chosen to mostly match web -
    it's `tag=`, with support for all of the string matching modes song
    select already has (bare word for substring, `""` quotes for phrase
    isolated by whitespace, `""!` for exact full match).

  Bartłomiej Dach · 2025-07-15 11:09:40 +02:00
  8cb81974eb
• Attempt to properly quantify the impact of mania Hard Rock / Easy mod application on overall difficulty

  In stable mania, Hard Rock and Easy mods do not work the same way as
  they do on all of the rulesets. The difference is that mania HR and EZ,
  rather than apply a multiplier to the map's original Overall Difficulty,
  apply multipliers to *the durations of hit windows themselves*.
  
  Prior to the last release, lazer was oblivious to this reality and just
  treated mania HR / EZ as it did every other ruleset. Last release, for
  the sake for gameplay parity across rulesets, the mods in question were
  adjusted to match stable, but in the process, it started looking like HR
  / EZ did not change OD anymore.
  
  The problem is that they do, but applying a multiplier to the map's OD
  and applying a multiplier to the hit window duration is not the same
  thing. The second thing is actually *much harsher* in magnitude, to the
  point where applying HR to any map is almost guaranteed to exceed "the
  effective OD" of 10, and applying EZ to any map is almost guaranteed to
  result in "negative effective OD".
  
  This change attempts to convey that reality by displaying "effective
  OD", similar to what's already done in other rulesets when rate-changing
  mods are active. Note that the values this will display *do not match*
  stable *and that is correct*, because stable song select *lies* about
  the actual impact on OD by just assuming it can treat all rulesets in
  the same way.
  
  ---
  
  Would close https://github.com/ppy/osu/issues/34150 I guess.
  
  And yes I would like *all of the above* to land on the changelog if
  possible if this is merged.
  
  For further convincing that this makes any semblance of sense please see
  the following: https://www.desmos.com/calculator/yigt7jycdv

  Bartłomiej Dach · 2025-07-15 09:40:55 +02:00
  131f828e6a
• Make edits based on reviews
  Denis Titovets · 2025-07-13 23:59:59 +03:00
  b120608ec5
• Merge branch 'master' into ssv2-localisation
  Denis Titovets · 2025-07-12 10:37:17 +03:00
  0065331659
• Disallow hiding beatmap difficulties if only one difficulty remains
  Dean Herbert · 2025-07-10 17:57:45 +09:00
  789ddcf395
• Remove duplicate `LocalisableString's
  Denis Titovets · 2025-07-09 16:31:51 +03:00
  7c9c2061ad
• Fix incorrect description
  Denis Titovets · 2025-07-09 15:31:42 +03:00
  2f324e3881
• Merge branch 'master' into ssv2-localisation
  Denis Titovets · 2025-07-09 15:22:42 +03:00
  6fc5fa74cd
• Fully localise SSV2
  Denis Titovets · 2025-07-09 15:07:07 +03:00
  1f052bb195
• Merge pull request #33889 from frenzibyte/source-grouping

  Add mode for grouping beatmaps by their source

  Dean Herbert · 2025-07-08 17:09:45 +09:00
  3406303060
• Remove Song Select v1 implementation and update auxiliary usages
  Dean Herbert · 2025-07-01 17:25:38 +09:00
  1048bd9ede
• Use floored star rating in BeatmapCarouselFilterGrouping and AdvancedStats

  This commit changes BeatmapCarouselFilterGrouping to now use floored star
  rating when determining which group a beatmap belongs to,
  to be consistent with changes introduced here:
  https://github.com/ppy/osu/pull/33679.
  The AdvancedStats section of the original song select is also
  updated to show the floored star rating (rather than rounded).

  Chris Ehmann · 2025-06-30 19:50:11 -07:00
  32d478e19c
• RankingsSort -> LeaderboardSortMode
  Dani211e · 2025-06-26 19:03:49 +02:00
  c1a34d8c6a
• Add source grouping mode
  Salman Alshamrani · 2025-06-26 09:59:12 +03:00
  b4833d80d1
• Add sorting dropdown

  Only use sorting when on local scope otherwise hide

  Dani211e · 2025-06-25 05:01:40 +02:00
  ad35dad46d
• Merge pull request #33679 from bdach/truncate-sr

  Floor star rating to 2 decimal places rather than rounding

  Dan Balasescu · 2025-06-24 19:04:56 +09:00
  6057c6c4d4
• Fix in song select v1 too for good measure
  Dean Herbert · 2025-06-19 19:08:18 +09:00
  ef5638b6b3
• Adjust implementation of star rating filtering in song select to new star rating flooring behaviour

  Required for things to not be broken after the previous change.

  Bartłomiej Dach · 2025-06-13 09:13:20 +02:00
  eda489b911
• Move and rename next/previous "group" selection keybindings to make way for group-specific bindings
  Dean Herbert · 2025-06-11 21:02:52 +09:00
  b9e1b6969e
• Add support for showing leaderboard in playlists and daily challenge

  As touched on in https://github.com/ppy/osu/pull/33581.

  Bartłomiej Dach · 2025-06-11 11:21:26 +02:00
  4810c7c847
• Disallow placing gameplay leaderboard in skins outside player

  Closes https://github.com/ppy/osu/issues/33542.
  
  For a diff this simple this took much more hemming and hawing because
  things are a bit annoying here from a few angles:
  
  - The only way that is considered idiomatic right now for a skin
    component to not be applicable to a screen is to require a dependency
    from DI that is only provided by applicable screens.
    `DrawableGameplayLeaderboard` has a few of those dependencies, but the
    scope of all the usages makes it so that the only really viable one to
    use here is `IGameplayLeaderboardProvider` itself (see: visual tests,
    and also the usage of multiplayer spectator, where the leaderboard is
    *not* under a player instance).
  
  - The smelly part of this is that the `Player` inheritance hierarchy
    must ensure that *every* non-abstract class has an
    `IGameplayLeaderboardProvider` cached. It is not trivial - if not
    straight up impossible - to force this via some `Player` level
    abstract method, because such a method would need to somehow
    accommodate all possible leaderboard providers. That however also
    means that every possible future `Player` implementor *must inherently
    know* to also cache a leaderboard provider lest it die at runtime. I
    don't love that, but I also don't see better alternatives.
  
  - Speaking of which, I also noticed that solo spectator and playlists
    don't have gameplay leaderboards. At all. Which I don't believe to be
    something that I broke with the leaderboard work - I'm pretty sure
    that was the pre-existing state - however I don't see any reason why
    they *couldn't* receive gameplay leaderboards. I'm not doing that
    here, though, just leaving TODOs for later.

  Bartłomiej Dach · 2025-06-09 13:11:29 +02:00
  6416f59c7b
• Fix general confusion in which combo should be read on which gameplay leaderboard

  Closes https://github.com/ppy/osu/issues/33455.
  
  The fundamental misunderstanding and source of confusion in
  https://github.com/ppy/osu/pull/33062 is that solo wants to show
  *maximum combo*, and multiplayer wants to show *current combo*, for
  their own, valid reasons. Which is spelled out explicitly in this
  change.

  Bartłomiej Dach · 2025-06-06 10:08:01 +02:00
  a92a659662
• Fix extreme Drawable thrashing on initial leaderboard population
  Dan Balasescu · 2025-06-05 23:01:31 +09:00
  218d8290cb
• Merge branch 'master' into song-select-v2-polish-2
  Bartłomiej Dach · 2025-05-30 11:07:11 +02:00
  4915e4d266
• Hide all unsupported grouping modes for now
  Dean Herbert · 2025-05-30 17:02:52 +09:00
  27fe9485bd
• Adjust filter control copy and spacing to fit text better
  Dean Herbert · 2025-05-30 02:20:57 +09:00
  b1a11061f4
• SongSelectV2: Read/write last active tab in details area from/to local configuration
  Bartłomiej Dach · 2025-05-29 14:16:41 +02:00
  8a3d979032
• SongSelectV2: Fix incorrect conditional being used for "split out" check

  🤦
  
  Have inlined the v1 usage so we don't accidentally do this again.

  Dean Herbert · 2025-05-29 01:22:22 +09:00
  ef8fd7b5d7
• remove grouping by date submitted to reduce clutter

  i doubt it would get much use anyway

  WitherFlower · 2025-05-27 21:09:24 +02:00
  80664d9b92
• add grouping support for ranked and submitted date
  WitherFlower · 2025-05-27 18:49:59 +02:00
  e6f933c1c0
• Remove redundant public specfications in interfaces

  Rider EAP being noisy about this now (smoogi will be happy :D).

  Dean Herbert · 2025-05-26 17:14:41 +09:00
  cb0592d711
• Make BeatmapDifficultyCache's returned bindable non-nullable
  Dean Herbert · 2025-05-25 22:27:37 +09:00
  6500be3f2d
• Remove obsoleted flow by using a new configuration variable

  The old one wasn't used anyway.

  Dean Herbert · 2025-05-24 01:01:17 +09:00
  cd44cab3ff
• Fix typo in comment
  Dean Herbert · 2025-05-23 19:37:22 +09:00
  ff48c4a047
• Merge branch 'master' into carousel-grouping
  Dean Herbert · 2025-05-23 19:03:09 +09:00
  0a5fbb35c5