1877 Commits

• 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
• Ensure state resets back to initial display on rewind
  Dean Herbert · 2026-02-18 02:25:09 +09:00
  7445efaecd
• Use default overlap of 1

  Matches closer to stable spec.

  Dean Herbert · 2026-02-18 02:22:00 +09:00
  86ab507e2e
• Show initial key placeholder / trigger name using non-skinned font

  In stable, there was support for mixed fonts (some coming from the
  user's skin, with fallback missing characters generated from TTF
  backend).
  
  We don't really have support for this so this is a simple in-between for
  the time being.

  Dean Herbert · 2026-02-17 16:02:13 +09:00
  6e03d5b00e
• Add basic support for scoreentry- skinnable text
  Dean Herbert · 2026-02-17 15:54:31 +09:00
  71583bc06f
• Merge pull request #36387 from ArijanJ/cycle-skins

  Add skin cycling with shortcuts for next and previous skin

  Bartłomiej Dach · 2026-01-30 08:57:23 +01:00
  c9a50b40d0
• Fix hitsounds becoming loud in editor after entering setup section (#36512)

  Probably closes https://github.com/ppy/osu/issues/36492.
  
  This is dumb but it's in large part my stupidity.
  
  To begin with, the immediate direct offending call that causes the
  observed symptoms is
  
  
  https://github.com/ppy/osu/blob/a401c7d5e9d6d8b05b2ec293145ad308dfe9d6d0/osu.Game/Screens/Edit/Components/FormSampleSet.cs#L296
  
  The reason why this "invalidation" affects sample volume is that in the
  framework implementation, the call [removes the relevant sample factory
  from the sample store which is an audio
  component](https://github.com/ppy/osu-framework/blob/5b716dcbef6f99e03188a7a7706361fa8445c754/osu.Framework/Audio/Sample/SampleStore.cs#L65-L72).
  In the process it also [unbinds audio
  adjustments](https://github.com/ppy/osu-framework/blob/5b716dcbef6f99e03188a7a7706361fa8445c754/osu.Framework/Audio/AudioCollectionManager.cs#L37-L38),
  which *would* have the effect of resetting the sample volume to 100%,
  effectively (and I've pretty much confirmed that that's what happens).
  
  Now for why this call sometimes does the right thing and sometimes
  doesn't: Sometimes the call is made in response to an *actual* change to
  the beatmap skin, which is correct and expected, if very indirect, but
  sometimes it is made *over-eagerly* when there is no reason to recycle
  anything yet.
  
  One such circumstance is entering the setup screen, which will still
  "invalidate" (read: remove) the samples, but the compose tab hasn't seen
  any change to the beatmap skin, so when it is returned to, it has no
  reason to retrieve the sample again, and as such it will try to play
  samples which are for better or worse in a completely undefined state
  because they're not supposed to be *in use* anymore.
  
  Therefore, the right thing here would seem to be to take the
  responsibility of invalidation from a random component, and move it to a
  place that's *actually* correlated to every other component needing to
  recycle samples, e.g. `EditorBeatmapSkin` responding to changes in the
  beatmap resources via raising `BeatmapSkinChanged`.
  
  Unfortunately, because of the structure of everything, this recycle
  needs to go from targeted to individual samples, to nuking the entire
  store. The reason for this is that `RealmBackedResourceStore` does not
  provide information as to *what* resources changed, it just says that
  *the set of them* did.
  
  For the recycle to be smarter, `EditorBeatmapSkin` would need to know
  not only which samples were added or replaced, but also which ones were
  *removed*, so that users don't hear phantom samples that no longer exist
  in the editor later. That would however be a lot of hassle for nothing,
  so I just recycle everything here and hope it won't matter.
  
  As to why I could only reproduce this on this one beatmap - I'm not
  super sure. The failure does not seem to be specific to beatmaps, but it
  may be exacerbated by certain patterns of accessing samples which means
  that beatmaps with high BPM like the one I managed to reproduce this on
  may just be more susceptible to this.
  
  As a final note, I do realise that this is not fundamentally improving
  the surrounding systems and it's still a pretty rickety thing to do.
  It's still on the consumers to know and respond to the sample store
  recycle and this is likely to fail if a consumer ever doesn't. That
  said, I have no brighter ideas at this point in time that won't involve
  me spending a week refactoring audio.

  Bartłomiej Dach · 2026-01-29 19:10:48 +09:00
  de97660fa4
• Rewrite everything for code quality's sake
  Dean Herbert · 2026-01-29 02:40:24 +09:00
  3b3bb266fc
• Merge branch 'master' into cycle-skins
  Dean Herbert · 2026-01-29 02:19:36 +09:00
  487347dac6
• Fix legacy health display using incorrect bulge texture when at low HP

  Closes #36432.

  Dean Herbert · 2026-01-23 17:10:35 +09:00
  d3c9548b52
• Simplify cycleSkins, fix some logic and naming mistakes
  ArijanJ · 2026-01-20 21:47:34 +01:00
  ea8788a509
• Add blank line for codeinspect
  ArijanJ · 2026-01-19 13:34:25 +01:00
  763dbe1494
• Add skin cycling with shortcuts for next and previous skin
  ArijanJ · 2026-01-19 12:59:21 +01:00
  65f7037e84
• Fix missing disposal
  Bartłomiej Dach · 2025-12-31 13:03:36 +01:00
  affe295f50
• 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
• Merge branch 'master' into custom-sample-set-selection
  Dean Herbert · 2025-12-17 19:30:24 +09:00
  61bf68f336
• Adjust constant and documentation slightly
  Dean Herbert · 2025-12-15 19:07:46 +09:00
  dcb6d71287
• Merge branch 'master' into legacy-pp-counter
  Dean Herbert · 2025-12-15 16:55:51 +09:00
  89d8b402af
• Fix skin editor sometimes dropping anchor/origin specification on paste (#35957)

  * Add failing test for copy->paste not being idempotent
  
  * Ensure all elements on default skins use fixed anchors
  
  `UsesFixedAnchor` defaults to false, i.e. closest anchors. Combined with
  manual anchor / origin specs on some drawables, this would get default
  skins into impossible states wherein a drawable would use "closest
  anchor" but also explicitly specify anchor / origin that aren't closest,
  which horribly fails on attempting to copy and paste.
  
  Frankly shocked this has gone unnoticed for this long, and I regret not
  vetoing this "feature" more every time I see its tentacles spread to
  produce breakage of levels yet unseen.
  
  Does this commit contain major levels of suck? For sure. Do I have any
  better ideas that wouldn't consist of a multi-day rewrite or deletion of
  this "feature"? No.
  
  * Fix skin editor always applying closest anchor / origin on paste regardless of whether the component uses fixed anchor
  
  Self-explanatory. Should close https://github.com/ppy/osu/issues/29111
  along with previous commit.

  Bartłomiej Dach · 2025-12-11 13:40:48 +09:00
  c4f7dee82b
• Fix welcome intro skin not being looked up from user skin for supporters

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

  Bartłomiej Dach · 2025-12-04 10:43:18 +01:00
  ca8247c667
• Fix skin layout deserialisation eating exceptions without logging

  Because I just wasted 30 minutes trying to debug why a skin provided by
  a user in an issue thread was failing to deserialise, only to realise
  halfway through that the deserialisation error I was seeing was *from
  the fallback path and thus a complete red herring*.

  Bartłomiej Dach · 2025-11-11 10:24:30 +01:00
  5763b7dbe9
• Fix retro skin changing when creating copy for skin editor (#35630)

  RFC, lowest effort solution for https://github.com/ppy/osu/issues/34979.
  
  The `SkinImporter` conditional *is* hella ugly, but anything less ugly
  will require taking a hammer to structures. Maybe passing version via
  the import flow, maybe even trying to make the `EnsureMutableSkin()`
  flow somehow attempt to read the `skin.ini` that's in resources. No
  idea.
  
  Properties from `skin.ini` that were defaults or that lazer can't
  (won't ever?) understand snipped.

  Bartłomiej Dach · 2025-11-07 12:01:11 +09:00
  3c215f6574
• Add sample set selection controls to sample popovers

  - Below 20 custom sample sets, they are shown as ternary buttons.
  - Above 20 custom sample sets, they are shown in a dropdown (yes there
    are actual cases of this as I've been informed by the NAT; one example
    being https://osu.ppy.sh/beatmapsets/1018061#osu/2197383)
  
  As a bonus, to make determining what the heck is actually changing when
  adjusting these controls, the full set of applicable sounds now plays on
  adding/removing additions, changing their banks, as well as changing the
  custom set (if any).
  
  For now there are no user-facing controls to add the samples to the map
  yourself, you have to know how to name the `.wav`s and edit-externally
  them in yourself. *For now.*

  Bartłomiej Dach · 2025-10-24 12:09:27 +02:00
  e2681c4163
• 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
• Merge branch 'master' into legacy-pp-counter
  Du Yijie · 2025-09-15 14:41:45 +08:00
  b1bc5cae87
• 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
• Implement "legacy" pp counter

  There is no pp counter in osu!(stable). However, a "legacy" pp counter
  allows skinners to more easily fit a pp counter into their skin's theme.

  Du Yijie · 2025-08-27 11:07:53 +08:00
  ac21f8b960
• 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