3438 Commits

• 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
• 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
• 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
• 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
• Fix BeatmapDifficultyCache's bindable tracking not correctly updating BeatmapInfo metadata on invalidation
  Dean Herbert · 2026-01-29 01:47:13 +09:00
  b705313d3f
• Avoid triggering bindable updates if mods haven't actually changed
  Dean Herbert · 2026-01-29 00:28:58 +09:00
  10651512a5
• More aggressively cancel debounced tracked bindable updates

  If we've run an update since we can cancel the scheduled debounce run.

  Dean Herbert · 2026-01-29 00:28:58 +09:00
  4c2ffa0f79
• Add assertion that we always get the up-to-date beatmap file in a WorkingBeatmap
  Dean Herbert · 2026-01-29 00:28:58 +09:00
  6997f89698
• 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
• Standardise ruleset error logging to always include exception in logs

  Supersedes and closes https://github.com/ppy/osu/pull/36420.

  Dean Herbert · 2026-01-22 15:48:51 +09:00
  fdd13cd7e1
• Merge branch 'master' into add-custom-samples-via-setup
  Dean Herbert · 2026-01-16 20:11:28 +09:00
  e1bde264bc
• Fix broken date formatting in some languages on several overlays

  Fixes https://osu.ppy.sh/community/forums/topics/2169438?n=1.

  Bartłomiej Dach · 2026-01-12 09:34:53 +01:00
  ae284fcf05
• Add star rating text gradient (#36292)

  Implements https://github.com/ppy/osu-web/pull/12363
  
  There's one less colour in the spectrum than in the [web
  code](https://github.com/ppy/osu-web/pull/12363/changes#diff-a9bdefd7233ca98f7f89cd76213aba5d869ae0424c8e79d1e322abd3e43462fbR31)
  because the spectrum was actually defined incorrectly and has [one less
  domain entry than it
  should](https://github.com/ppy/osu-web/pull/12363/changes#diff-a9bdefd7233ca98f7f89cd76213aba5d869ae0424c8e79d1e322abd3e43462fbR29).
  I've chose to not add it because of consistency with the web and because
  it looked pretty ugly (it was pretty much unreadable)
  
  <img width="1361" height="814" alt="image"
  src="https://github.com/user-attachments/assets/5f9d7a93-3e28-4b8c-952c-0abd6f8c2cc3"
  />
  <img width="805" height="647" alt="image"
  src="https://github.com/user-attachments/assets/b060cba7-3beb-4bb5-8d50-6210e8417715"
  />

  StanR · 2026-01-11 00:30:48 +09:00
  3e7f0f4c61
• Adjust beatmap query to fix potential crash
  Dan Balasescu · 2026-01-05 17:16:27 +09:00
  78a5654e1f
• remove map from list (#36218)
  pishifat · 2026-01-05 16:16:04 +09:00
  ea289460b0
• Add way to add/remove custom beatmap samples to setup screen

  Among others, this features a scary-looking change wherein
  `WorkingBeatmap` now exposes a `RealmAccess` via
  `IStorageResourceProvider`. This is necessary to make
  `RealmBackedResourceStore` actually start firing callbacks when the
  edited beatmap's skin is modified by adding new samples to it.

  Bartłomiej Dach · 2025-12-31 12:14:28 +01:00
  334a54e6f7
• Revert "Merge pull request #36102 from bdach/move-check-to-better-place"

  This reverts commit 2cb2167765, reversing
  changes made to 0bcb3c5839.

  Dean Herbert · 2025-12-26 22:36:16 +09:00
  56ef5eae14
• Merge pull request #36102 from bdach/move-check-to-better-place

  Perform online ID checks during import in more proper sequence

  Dean Herbert · 2025-12-26 22:35:02 +09:00
  2cb2167765
• Reduce code duplication

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

  Dan Balasescu · 2025-12-24 19:30:04 +09:00
  81f03957d8
• Merge pull request #36101 from bdach/guest-difficulty-export

  Add explicit menu item for exporting guest difficulties from editor

  Dean Herbert · 2025-12-24 00:45:19 +09:00
  1340e18d93
• Only perform replace-on-import based on online beatmap set ID after it's validated

  Even without the ID resetting logic before `Populate()` getting broken
  and annotated with a TODO, this was kinda stupid. Why was purging logic
  allowed to run *using a not-yet-completely-validated online ID of the
  set*?
  
  This is the other part of hopefully fixing scenarios like
  https://osu.ppy.sh/community/forums/topics/2162457?n=8 (hopefully with
  no babies poured out in the mean time, but only time will tell).

  Bartłomiej Dach · 2025-12-22 12:27:29 +01:00
  44df9047ae
• Move online ID validation check into its proper location

  The end of `Populate()` is too early to do any validation of online IDs,
  as population happens in `PostImport()` via `ProcessBeatmap`.
  
  Additionally, this modifies the check to also include the set's ID. This
  is one part of curtailing issues like
  https://osu.ppy.sh/community/forums/topics/2162457?n=8 - the featured
  artist template beatmap in question has a single difficulty with a bogus
  positive beatmap set ID and a beatmap ID of 0, and my opinion is that
  this sort of situation should for all intents and purposes cause the
  beatmap set's ID to be reset.

  Bartłomiej Dach · 2025-12-22 12:22:04 +01:00
  17143ca0a8
• Add explicit menu item for exporting guest difficulties from editor

  A few facts of life:
  
  - Guest difficulties are at this point a staple of mapping.
  
  - People are very much used to flinging `.osu`s around (because there's
    no better alternative).
  
  - Currently there are two ways to get an `.osu` out of lazer. You can:
  
    - Export the beatmap as "compatibility" to an `.osz`, then
      transmogrify the `.osz` to a `.zip`, then extract the `.zip`, then
      pluck out the `.osu`. This is the "correct" way to make sure stable
      works, but is also stupidly arcane.
  
    - Use "edit externally" to mount the beatmap files to disk, then
      copy-paste out the `.osu`. This is the *wrong* way to make sure
      stable works, because the mounting process exposes the raw "for
      editing" format with features stable doesn't support, but it the
      actual easy one.
  
  - Reports about guest difficulties exported from lazer "working wrong on
    stable" are prevalent. Probably mostly because of the preceding point.
  
  What this PR does is introduce a *third* method to export an `.osu`,
  which is designed to be both the easiest one yet *and* correct. I am
  hoping this will curb the complaints until support for direct submission
  of guest difficulties is added - which I still hope to see, but it will
  be a significant effort *client-side* (the server side has been ready
  for years now).
  
  And yes, you will notice that much of the code added in
  `LegacyBeatmapExporter` related to manipulation of the path is
  copy-pasted from `LegacyExporter`. I don't care enough to invent
  protected / abstract / whatever else OOP faff for something that may not
  survive review and is mostly a weird semi-temporary wart.

  Bartłomiej Dach · 2025-12-22 11:36:23 +01:00
  3712093158
• Add helper method and update some other similar preempt calculations
  Dean Herbert · 2025-12-18 22:28:50 +09:00
  09178b5dc4
• Add remaining two locus winners as bundled beatmaps
  Dean Herbert · 2025-12-04 14:20:04 +09:00
  fe5cbc4932
• Fix Beatmap.GetMostCommonBeatLength() potentially returning a beat length smaller or larger than the actual limits (#35827)

  Closes https://github.com/ppy/osu/issues/35807.
  
  The reason this closes the aforementioned issue is as follows:
  
  Taking https://osu.ppy.sh/beatmapsets/1236180#osu/4650477 as the
  example, we have:
  
  ```
  minBeatLength = 342.857142857143
  maxBeatLength = 419.58041958042003
  mostCommonBeatLength = 342.85700000000003
  ```
  
  Note that `mostCommonBeatLength < minBeatLength` here.
  
  Taking the inverse of that to compute BPM, we get
  
  ```
  minBpm = 174.99999999999991
  maxBpm = 142.99999999999986
  mostCommonBpm = 175.00007291669704
  ```
  
  which without DT present doesn't do anything bad, but when DT is
  engaged (and thus BPM is multiplied by 1.5), midpoint rounding causes
  the min BPM to become 262, and the most common BPM to become 263.

  Bartłomiej Dach · 2025-11-28 08:25:47 +09:00
  8f927ea7b5
• Fix several issues with incorrect sample playback (#35685)

  * Add failing test coverage for layered hit samples not playing in mania when beatmap is converted
  
  Adding the `osu.Game.Rulesets.Osu` reference to the mania test project
  is required so that `HitObjectSampleTest` base logic doesn't die on
  
  https://github.com/ppy/osu/blob/f0aeeeea966f06add12cf2bca3dd48dac8573e82/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs#L88-L91
  
  * Fix layered hit sounds not playing on converted beatmaps in mania
  
  Compare
  https://github.com/peppy/osu-stable-reference/blob/f9e58b4864a10f801393199e7652b2192c7342c3/osu!/GameplayElements/HitObjects/HitObject.cs#L476-L477.
  
  In case of converted beatmaps, the last condition there
  (`BeatmapManager.Current.PlayMode != PlayModes.OsuMania`) fails,
  and thus layered hitsounds are allowed to play.
  
  * Add failing test coverage for mania beatmap conversion assigning wrong samples to spinners
  
  * Fix mania beatmap conversion assigning wrong samples to spinners
  
  A spinner is never `IHasRepeats`. It was a dead condition, leading to
  the hitobject generating fallback `NodeSamples`, which in particular
  feature a silent tail which stable doesn't do.
  
  Noticeably, stable also appears to force the head of the generated hold
  note to have no addition sounds:
  
  https://github.com/peppy/osu-stable-reference/blob/f9e58b4864a10f801393199e7652b2192c7342c3/osu!/GameplayElements/HitObjects/Mania/SpinnerMania.cs#L86-L89
  
  * Add failing test coverage for file hit sample not falling back to plain samples if file missing
  
  * Allow `FileHitSampleInfo` to fall back to standard samples if the file is not found (or not allowed to be looked up)
  
  I'm honestly not 100% as to how closely this matches stable because I
  reached the point wherein I'd rather not look at stable code anymore, so
  as long as this passes tests I'm fine to wait for someone else to report
  new breakage.
  
  * Use alternative workaround for lack of osu! ruleset assembly in mania test project
  
  * Fix encode stability test failures

  Bartłomiej Dach · 2025-11-15 16:19:08 +09:00
  bd4ed49c06
• Alleviate song select post-filter update thread hitches by caching a model-to-carousel-item mapping (#35628)
  Bartłomiej Dach · 2025-11-13 23:21:14 +09:00
  b64abbf1f5
• Refetch list of user favourites on every change to favourites

  Is this lazy? Sure it is. Friends and blocks do the same thing, though,
  and I'm not overthinking this any more than I already have.
  
  Being smarter here would likely mean being more invasive with respect to
  listening in on all outgoing API requests and silently updating
  favourites on that basis. Which is "smart" but also complicated.

  Bartłomiej Dach · 2025-10-24 08:41:52 +02:00
  6b56a0611b
• Merge branch 'master' into fix-qp-availability
  Dean Herbert · 2025-10-24 14:27:45 +09:00
  d062c99666
• Adjust gameplay sample models to support custom sample sets

  This is a set of model changes which is supposed to facilitate support
  for custom sample sets to the beatmap editor that is on par with stable.
  
  It is the minimal set of changes. Because of this, it can probably be
  considered "ugly" or however else you want to put it - but before you
  say that, I want to try and pre-empt that criticism by explaining where
  the problems lie.
  
  Problem #1: duality in sample models
  ---
  
  There is currently a weird duality of what a `HitObject`'s samples will
  be.
  
  - If an object has just been placed in the editor, and not saved /
    decoded yet, it will use `HitSampleInfo`.
  
  - If an object has already been encoded to the beatmap at least once, it
    will use `ConvertHitObjectParser.LegacyHitSampleInfo`.
  
  As long as that state of affairs remains, `HitSampleInfo` must be able
  to represent anything that `LegacyHitSampleInfo` can, if feature parity
  is to be achieved.
  
  Problem 2: The 0 & 1 sample banks
  ---
  
  Custom sample banks of 2 and above are a pretty clean affair. They map to
  a suffix on the sample filename, and said samples are allowed to be
  looked up from the beatmap skin. `Suffix` already exists in
  `HitSampleInfo`.
  
  However, the 1 custom sample bank is evil. It uses *non-suffixed*
  samples, *allows lookups from the beatmap skins*, contrary to no bank /
  bank 0, which *also* uses non-suffixed samples, but *doesn't* allow them
  to be looked up from the beatmap skin.
  
  This is why `HitSampleInfo.UseBeatmapSamples` has been called to
  existence - without it there is no way to represent the ability of using
  or not using the beatmap skin assets.
  
  As has been stated previously in discussions about this feature, it's
  both a *mapping* and a *skinning* concern.
  
  There are many things you could do about either of these problems, but I
  am pretty sure tackling either one is going to take *many* more lines of
  code than this commit does. Which is why this is the starting point of
  negotiation.

  Bartłomiej Dach · 2025-10-22 14:58:08 +02:00
  c361e6d3c2
• Use interface instead
  Dan Balasescu · 2025-10-22 16:02:46 +09:00
  4cac1781c5
• Fix quick play not redownloading modified beatmaps
  Dan Balasescu · 2025-10-22 15:34:29 +09:00
  c6fcba7e1c
• Add locus 2025 winners to bundled download beatmaps list
  Dean Herbert · 2025-10-17 02:03:52 +09:00
  98762ce09e
• SSV2 : Replace "Mark as Played" with "Remove from Played" if map is already played (#35287)

  * SSV2 : Replace Mark as Played with Remove from Played if already played
  
  * Remove checks of BeatmapInfo.LastPlayed for DateTimeOffset.MinValue
  
  * Make FooterButtonOptions use a RealmLive<BeatmapInfo> and act on review comments
  
  * FIXUP: Detach BeatmapInfo before passing it to FooterButtonOptions.Popover
  
  ---------
  
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Alban Cabannes-Michel · 2025-10-16 14:59:16 +02:00
  8f6f859c15
• Add some logging when FindWithRefresh triggers a slow realm refresh
  Dean Herbert · 2025-10-10 13:36:28 +09:00
  94c7489c1c
• Fix shift-clicking not working on extra size beatmap cards

  Was broken due to double assignment to `Action`.

  Bartłomiej Dach · 2025-10-09 08:59:26 +02:00
  6da6edd1d1
• Always explicitly assign the action for beatmap cards
  Dean Herbert · 2025-09-29 17:31:45 +09:00
  3f5b71fdc3
• Keep panel backgrounds loaded
  Dean Herbert · 2025-09-26 18:26:11 +09:00
  b743506207
• Use BeatmapCard for matchmaking beatmap display
  Dean Herbert · 2025-09-26 18:09:05 +09:00
  0a17a3c4ed
• Allow visibly disabling the "go to beatmap" button

  Easiest way to make this work without rewriting the layout logic.
  
  I think it makes sense to have the button still exist there but not be
  usable on certain screens.

  Dean Herbert · 2025-09-26 18:08:47 +09:00
  da80b61f38
• Merge pull request #34900 from bdach/invalid-filenames-in-imported-skins

  Fix external edit operations failing due to invalid filenames

  Dean Herbert · 2025-09-03 18:50:17 +09:00
  0ab3b593e7
• Replace local copy of GetValidFilename() with direct usage

  Noticed in passing.

  Bartłomiej Dach · 2025-09-03 09:32:43 +02:00
  5c66998c57
• Merge pull request #34892 from bdach/shift-click-beatmap-card

  Download online beatmap / present local beatmap on shift-clicking beatmap cards

  Dean Herbert · 2025-09-03 16:19:48 +09:00
  1e50e36a64
• Ignore .osu files not placed at top level of beatmap archive on import

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

  Bartłomiej Dach · 2025-09-02 14:50:31 +02:00
  79f7f0ecad
• Download online beatmap / present local beatmap on shift-clicking beatmap cards

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

  Bartłomiej Dach · 2025-09-02 13:11:18 +02:00
  6c82f543e6
• Adjust interpolation workaround to catch-up slightly smoother
  Dean Herbert · 2025-08-29 21:24:23 +09:00
  41b8033ebd
• Fix metadata cache version queries failing hard if the image is corrupted

  This was not fatal but with this change it should recover in a slightly
  better way.
  
  Also incidentally fixes the cache refetch potentially being attempted
  twice by each of the two background population tasks that use it.

  Bartłomiej Dach · 2025-08-07 11:10:02 +02:00
  dac643121a