1852 Commits

• 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
• Simplify lookup method to appease inspection

  See https://github.com/ppy/osu/pull/35100/files.

  Dean Herbert · 2025-09-23 22:55:43 +09:00
  bf63b6f9f0
• Fix osu!mania legacy skin WidthForNoteHeightScale not being used (#35050)

  * Add osu!mania legacy skin widthForNoteHeightScale
  
  * Ensure WidthForNoteHeightScale correctly defaults to MinimumColumnWidth

  qinvvv · 2025-09-19 10:53:25 +09:00
  b91ff8a5c5
• Fix argon judgement counter looking misaligned with wireframe off

  Closes https://github.com/ppy/osu/issues/34959.
  
  `ArgonCounterTextComponent` is pretty terrible and prevents being able
  to fix the issue easily. The core issue is that this is the first
  instance of the component's usage where the label text can be longer
  than the counter in the X dimension, so the total width of any counter
  is equal to max(label width, counter width), and the label will be
  aligned to the left of that width, while the counter will be aligned to
  the right of that width.
  
  The fix sort of relies on the fact that I don't expect *any* consumer of
  `ArgonCounterTextComponent` that meaningfully uses the wireframe digits
  to want the non-wireframe digits to be aligned to the *left* rather than
  the right. It's not what I'd expect any segmented display to work.
  (There are usages that specify `TopLeft` anchor, but they usually
  display the same number of wireframe and non-wireframe digits, so for
  them it doesn't really matter if the digits are left-aligned to the
  wireframes or not.)

  Bartłomiej Dach · 2025-09-13 11:11:45 +09:00
  e73e9275ba
• Fix mangled initial undo state on fresh skins
  Dan Balasescu · 2025-09-09 20:26:41 +09:00
  a6e42fb0cb
• Merge pull request #34920 from cl8n/retro-skin

  Add "retro" default skin

  Dean Herbert · 2025-09-09 15:48:12 +09:00
  caad065433
• Merge pull request #34932 from Joehuu/fix-argon-judgement-colored-numbers

  Fix `ArgonJudgementCounterDisplay` not showing colored numbers when "Show label" is off

  Dean Herbert · 2025-09-09 15:20:49 +09:00
  11696a7a3c
• Guard against ArgonJudgementCounterDisplay crashing due to fuckery

  I can't see how this can happen in a normal flow, so just doing it as a
  safety measure. Pointed out in https://github.com/ppy/osu/issues/34940
  but likely due to a third party fuck being loaded.

  Dean Herbert · 2025-09-09 14:56:21 +09:00
  335bc6cdf6
• Change debounce method in rank display to allow more immediate updates
  Dean Herbert · 2025-09-08 15:12:49 +09:00
  06c1b81c1b
• Fix ArgonJudgementCounterDisplay not showing colored numbers when "Show label" is off
  Joseph Madamba · 2025-09-05 12:25:40 -07:00
  18b5c652a3
• Add "retro" default skin
  clayton · 2025-09-05 21:21:52 +09:00
  6af48975b0
• Improve initial state handling
  Dean Herbert · 2025-09-05 16:19:55 +09:00
  ab7985f31e
• Change debounce to be delayed since last actual change to avoid state flickering
  Dean Herbert · 2025-09-05 16:10:12 +09:00
  912c0a39cf
• Simplify implementation
  Dean Herbert · 2025-09-05 16:01:22 +09:00
  45ef97c92c
• Fix rank-up and rank-down sounds playing too often in some scenarios
  NiyazBiyaz · 2025-09-05 15:41:04 +09:00
  54d4b16a01
• Always show the same number of placeholder digits in argon judgement counter when it is vertical
  Bartłomiej Dach · 2025-09-03 13:42:17 +02:00
  98c3437174
• Fix abysmal code quality
  Bartłomiej Dach · 2025-09-03 13:23:12 +02:00
  a56f81a731
• Merge branch 'master' into argon-judgement-counter
  Bartłomiej Dach · 2025-09-03 13:01:57 +02:00
  dac534e22a
• Fix initial alpha not applying correctly

  Also fixes value change callbacks in BDL (very bad) and potential
  lingering initial transforms.

  Bartłomiej Dach · 2025-08-12 13:19:35 +02:00
  6a9064cf44
• address review
  Hivie · 2025-08-11 14:14:28 +01:00
  ca4d475c6f
• handle UR counter namespace change
  Hivie · 2025-08-09 22:34:09 +01:00
  12d7695fe7
• convert UnstableRateCounter to an abstract class and move triangles implementation to its own component
  Hivie · 2025-08-09 22:33:07 +01:00
  5616be09a0
• 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
• 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
• Write new name to skin.ini when renaming skin via settings

  Reported at https://osu.ppy.sh/comments/3681620, with appropriate levels
  of rage bait (DID ANYONE TEST THIS?!?!?!?!?!?!?!?!?!111!!)
  
  Reasoning for this is that without this, users' skin names can be
  dropped after an external edit because they're never persisted anywhere
  outside of realm.
  
  The only other choice I see is to stop re-populating skin metadata from
  the `.ini` upon completing an external edit, which is very doable but
  seems worse than this. Dunno.

  Bartłomiej Dach · 2025-07-11 15:18:20 +02:00
  db93c2ad6f
• Fix dodgy threading

  The fact that the stuff "just worked" previously due to one load-bearing
  detach in a random location is really scary because a lot of this was
  just not written the way it is supposed to be.

  Bartłomiej Dach · 2025-06-30 14:17:27 +02:00
  2e0e7ff3c2
• Use better method of disallowing skin changes during external edit
  Bartłomiej Dach · 2025-06-30 14:17:27 +02:00
  b82bf228ab
• Merge branch 'master' into skin-mounting
  Bartłomiej Dach · 2025-06-30 12:53:55 +02:00
  368850967b
• Remove unnecessary skin settings descriptions
  Salman Alshamrani · 2025-06-30 12:00:21 +03:00
  2b92b59504
• Fix beatmap skin sample lookups falling back to non-custom sample banks if the custom sample bank sample was not found

  Closes https://github.com/ppy/osu/issues/33900. I think. Stable's sample
  lookup logic is horrible.
  
  The user in the issue claimed they were hearing `drum-hitfinish2`, but
  they were really hearing `drum-hitfinish`, because they're the same
  `.wav` file in the beatmap. Now the reason *why* they were hearind
  `drum-hitfinish` is that the sample control point was specifying
  something like:
  
  	23946,-200,4,2,4,40,0,0
  
  To decipher, this is:
  - default sample bank of soft
  - custom sample bank of 4
  
  Taking one of the objects affected, namely 00:23:946 (2) - that's a
  slider with finish addition and drum addition bank on the slider head.
  The slider head is thus attempting to play `soft-hitnormal4` and
  `drum-hitfinish4`.
  
  Neither `soft-hitnormal4` or `soft-hitnormal` exist in the beatmap, so
  that plays fine via falling back to user skin's `soft-hitnormal`, but
  `drum-hitfinish4` ends up falling back to `drum-hitfinish` which *does*
  exist in the beatmap skin and thus plays wrongly from the beatmap skin
  rather than the user skin.
  
  I have no idea how to ensure this is correct across every beatmap and
  skin out there so my approach is to just spray and pray (and rely on
  issue reports I guess). I *think* this matches the stable logic which is
  nestled within
  https://github.com/peppy/osu-stable-reference/blob/a5e5fe6ef240505d13526cf32783cad261e9bd8b/osu!/Audio/AudioEngine.cs#L1136-L1230
  but honestly if you put a gun to my head I couldn't be sure if it
  matches completely in every possible circumstance or not.

  Bartłomiej Dach · 2025-06-27 13:00:50 +02:00
  c7cd3a9842
• Remove pointless tooltip

  I agree that these are pointless and we should probably remove the
  others and stop wasting localiser's time on these.

  Dean Herbert · 2025-06-27 17:09:29 +09:00
  5485abd3a5
• Support changing weight in text-based elements
  Salman Alshamrani · 2025-06-26 07:36:11 +03:00
  fa508245a1
• Add support for rank change SFX to LegacyRankDisplay and debouncing
  Jamie Taylor · 2025-06-12 14:42:29 +09:00
  b729091244
• Fix abhorrently incorrect bindable usage
  Dean Herbert · 2025-05-31 00:41:28 +09:00
  43b7171f5c
• Make BeatmapDifficultyCache's returned bindable non-nullable
  Dean Herbert · 2025-05-25 22:27:37 +09:00
  6500be3f2d
• Merge branch 'master' into gameplay-leaderboard-skinnable
  Bartłomiej Dach · 2025-05-07 10:45:51 +02:00
  5b61761bbd
• Clarify purpose of helper lookup entries in osu!mania skinning
  Salman Alshamrani · 2025-05-01 06:30:32 +03:00
  3151fe7ef1
• Make column spacing lookups easy to use
  Salman Alshamrani · 2025-04-30 03:59:41 +03:00
  d63f9533b1
• Fix TriangleSkin not always returning a container for GlobalSkinnableContainerLookup

  We have other safeties which mean that this is not an issue during
  gameplay, but in the new `TestSceneHUDOverlayRulesetLayouts` it became
  apparent that allowing this to fallback (via `null` return) could lead
  to weirdness.

  Dean Herbert · 2025-04-26 05:14:36 +09:00
  54e0e1420f
• Convert gameplay leaderboard to skinnable component

  This PR converts the leaderboard into a full-fledged skinnable component
  that can be manipulated by users at will.
  
  Notably, this finally allows https://github.com/ppy/osu/issues/20422 to
  be fixed - although it's a very mixed bag, for several reasons:
  
  - Because of taiko players' refusal to see reason^W^W^W^Winsistence on
    keeping stable behaviours related to aspect ratio treatment, I have to
    assume the worst case scenario, which means than on typical
    resolutions like 16:9 (or even worse, 4:3), the leaderboard will
    likely not occupy as much vertical space as it probably could.
  
  - Additionally, there's the problem of where to put the spectator list.
    I settled on putting it to the right of the leaderboard, but that's
    kind of janky, because the leaderboard sometimes collapses and
    sometimes fully hides, leading to a very awkward space left behind. If
    we had the capability to anchor elements to other elements, maybe this
    could be resolved, but for now, I'm not sure what to do. I think if
    some users are bothered by it they can move it where they want it. Or
    delete it.

  Bartłomiej Dach · 2025-04-24 13:10:30 +02:00
  59b826c321
• Fix incorrect sizing of legacy health display "ki" markers

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

  Dean Herbert · 2025-04-08 13:52:07 +09:00
  6d833939ae
• Disable user customisation of spectator list font / colour

  It's all a bit weird so let's just disable it for now. For instance,
  this is exposed as "text" font / colour but only affects the header.
  Also, no other headers are cusotmisable in similar components.

  Dean Herbert · 2025-03-10 15:19:34 +09:00
  3cb32c38ad
• Fix SkinDeserialisationTest failing
  LukynkaCZE · 2025-03-08 23:02:57 +01:00
  1e2468d2bb
• forgot remove initializer vlaue
  LukynkaCZE · 2025-03-08 21:46:17 +01:00
  cc7e60daab
• fix ToString
  LukynkaCZE · 2025-03-08 21:38:45 +01:00
  bb588566e6
• add test scene
  LukynkaCZE · 2025-03-08 21:34:27 +01:00
  cbab183ea1
• add ArgonJudgementCounterDisplay
  LukynkaCZE · 2025-03-08 21:07:51 +01:00
  b1e0cf8532
• Add support for legacy osu!mania barline height and colour spec
  Dean Herbert · 2025-02-28 15:13:13 +09:00
  cb29459a1e
• Merge pull request #31527 from bdach/spectator-list-ready

  Show spectating users during gameplay

  Dan Balasescu · 2025-01-21 18:54:11 +09:00
  8f8246278a
• Fix one more new inspection in EAP 2025
  Dean Herbert · 2025-01-20 15:00:35 +09:00
  525e16ad1d