1042 Commits

• Fix reversing straight perfect curve sliders positioning them weirdly (#36698)
  Arthur Araujo · 2026-02-20 16:57:42 +01:00
  c144cf188a
• 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
• 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
• Disallow zero-length sliders from specifying a non-zero number of repeats (#35220)
  Bartłomiej Dach · 2025-10-08 16:01:04 +09:00
  1a522a19f1
• Fix operations in PooledDrawableWithLifetimeContainer.CheckChildrenLife being in wrong order

  Previously CompositeDrawable.CheckChildrenLife() would be run before lifetimeManager.Update() which lead to the new drawables being inserted into the container but not being made alive immediately, leading to the drawable not becoming visibile until the next update loop.

  marvin · 2025-08-28 23:36:29 +02:00
  bb9f9e4d35
• Merge pull request #33615 from bdach/slider-encode-decode-instability

  Fix lack of slider encode-decode stability due to truncating control point coordinates on decode

  Dan Balasescu · 2025-06-26 23:25:36 +09:00
  ae3100af11
• Refactor hit windows class structure to reduce rigidity

  This change pulls back a significant degree of overspecialisation and
  rigidity in the class structure of `HitWindows` to make subsequent
  changes to hit windows, whose purpose is to improve replay playback
  accuracy, possible to do cleanly.
  
  Notably:
  
  - `HitWindows` is full abstract now. In a few use cases, and as a
    reference for ruleset implementors, `DefaultHitWindows` is provided as
    a separate class instead.
  
    This fixes the weirdness wherein `HitWindows` always declared 6 fields
    for result types but some of them would never be set to a non-zero
    value or read.
  
  - `HitWindow.GetRanges()` is deleted because it is overspecialised and
    prevents being able to adjust hitwindows by ±0.5ms cleanly which will
    be required later.
  
    The fallout of this is that the assertion that used `GetRanges()` in
    the `HitWindows` ctor must use something else now, and the closest
    thing to it was `GetAllAvailableWindows()`, which didn't return
    the miss window - so I made it return the miss window and fixed the
    one consumer that didn't want it (bar hit error meter) to skip it.
  
  - Diff also contains some clean-up around `DifficultyRange` to unify
    handling of it.

  Bartłomiej Dach · 2025-06-25 08:40:12 +02:00
  8b542e5442
• Fix lack of slider encode-decode stability due to truncating control point coordinates

  Mostly closes https://github.com/ppy/osu/issues/33505.
  
  Compare
  
  	https://github.com/ppy/osu/blob/97e6187f0d7c3dbee896596a623e34627135bf0e/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs#L56-L59
  
  I say "mostly" here because I'm rather skeptical that this is 100% rock
  solid still, for one reason - namely that the game stores path control
  point coordinates relative to the head, then turns them into absolute
  coordinates when encoding, and then on decoding turns them back into
  coordinates relative to the head, which in floating-point world is a Bad
  Idea because of round-off error. But I'm not fixing that without
  introducing a completely new beatmap format or rewriting half the
  editor to address that, so I'll just pretend that I don't know any
  of this until someone notices.

  Bartłomiej Dach · 2025-06-10 14:09:13 +02:00
  eab02a2aa5
• 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
• Fix editor player sometimes crashing because of instantiating wrong judgement result type for object

  Closes https://github.com/ppy/osu/issues/33231.
  
  I'm not sure how to reproduce the instances of this reported to sentry
  with `Drawable{Slider,Spinner}`, but this bug is about to be made worse
  by `DrawableHoldNote` in mania getting its own `JudgementResult` subtype
  in https://github.com/ppy/osu/pull/33194 - for that one to reproduce
  just start gameplay test while editor is seeked to a time instant where
  a hold note is mid-hold.
  
  There's possibly an argument here that `CreateResult()` should live on
  `HitObject` and not `DrawableHitObject`, and I'd even be partial to such
  an argument, but doing that would be a rather hard ruleset API break
  (albeit trivial one to resolve), and also may dredge up past
  conversations about `Judgement` and `JudgementResult` (cf.
  https://github.com/ppy/osu/pull/26563) that I would rather not get into
  again.
  
  Notably this is not source-breaking for rulesets. It may be
  binary-breaking, I haven't tested.

  Bartłomiej Dach · 2025-05-22 10:20:39 +02:00
  70c6ddbe30
• Remove obsoleted overload of ApplyResult
  Dean Herbert · 2025-04-08 15:47:30 +09:00
  5d572e1ab2
• Remove left-over scheduling thing
  Dean Herbert · 2025-04-03 16:17:29 +09:00
  b471750812
• Avoid large sample depool overhead on drawable hitobjects with many nested objects

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

  Dean Herbert · 2025-03-26 18:45:12 +09:00
  78de898f7f
• Fix edge case allowing almost-zero-length sliders to be placed during distance snapping
  Dean Herbert · 2025-03-11 16:17:44 +09:00
  23891b1994
• Cancel ApplyDefaults() when requested

  Also didn't notice a particular case here, but if all code passes up
  until we get to the `foreach (var h in nestedHitObjects)` below, then we
  could end up stuck here for quite a while.

  Dan Balasescu · 2025-03-03 14:46:13 +09:00
  033952029e
• Cancel slider generation when requested

  Didn't notice a particular case with this one, just came up as I was
  looking through code.

  Dan Balasescu · 2025-03-03 14:19:43 +09:00
  52dad09b20
• Exit loop when cancellation requested

  The following manages to create all hitobjects but proceeds to get stuck
  in this method:
  
  `dotnet run -- difficulty 1607040 -r:2`

  Dan Balasescu · 2025-03-03 14:19:19 +09:00
  ad9a963bd0
• Refactor IDistanceSnapProvider to accept slider velocity objects as a reference

  Method signatures are also changed to be a lot more explicit as to what
  inputs they expect.

  Bartłomiej Dach · 2025-02-03 14:00:57 +01:00
  a1185df2eb
• Merge pull request #31446 from EVAST9919/new-combo-editor

  Fix performance degradation while trying to place object with a new combo in the editor.

  Dean Herbert · 2025-01-15 12:56:06 +09:00
  ef7982fbfa
• Add combo colour override control to editor

  Closes https://github.com/ppy/osu/issues/25608.
  
  Logic mostly matching stable. All operations are done on `ComboOffset`
  which still makes overridden combo colours weirdly relatively dependent
  on each other rather than them be an "absolute" choice, but alas...
  
  As per stable, two consecutive new combos can use the same colour only
  if they are separated by a break:
  
      https://github.com/peppy/osu-stable-reference/blob/52f3f75ed7efd7b9eb56e1e45c95bb91504337be/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L4564-L4571
  
  This control is only available once the user has changed the combo
  colours from defaults; additionally, only a single new combo object
  must be selected for the colour selector to show up.

  Bartłomiej Dach · 2025-01-10 13:40:56 +01:00
  48196949e0
• Fix combo properties multiple reassignments
  Andrei Zavatski · 2025-01-07 14:00:31 +03:00
  8f4eafea4e
• Merge pull request #31306 from bdach/aspire-slider-breakage

  Fix slider event generator incorrectly not generating repeats when tick distance is zero

  Dan Balasescu · 2025-01-07 11:50:18 +09:00
  77d9c955ea
• Fix slider event generator incorrectly not generating repeats when tick distance is zero

  RFC. This closes https://github.com/ppy/osu/issues/31186.
  
  To explain why: The issue occurs on
  https://osu.ppy.sh/beatmapsets/594828#osu/1258033, specifically on the
  slider at time 128604. The failure site is
  
  	https://github.com/ppy/osu/blob/fa0d2f4af22fb9319e2a8773bf635368d86360be/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs#L65-L66
  
  wherein `LastRepeat` is `null`, even though the slider's `RepeatCount`
  is 1 and thus `SpanCount` is 2.
  
  In this case, `SliderEventGenerator` is given a non-zero `tickDistance`
  but a zero `length`. The former is clamped to the latter:
  
  	https://github.com/ppy/osu/blob/fa0d2f4af22fb9319e2a8773bf635368d86360be/osu.Game/Rulesets/Objects/SliderEventGenerator.cs#L34
  
  Because of this, a whole block of code pertaining to tick generation
  gets turned off, because of zero tick spacing - however, that block also
  includes within it *repeat* generation, for seemingly very little reason
  whatsoever:
  
  	https://github.com/ppy/osu/blob/fa0d2f4af22fb9319e2a8773bf635368d86360be/osu.Game/Rulesets/Objects/SliderEventGenerator.cs#L47-L77
  
  While a zero tick distance would indeed cause `generateTicks()` to loop
  forever, it should have absolutely no effect on repeats.
  
  While this *is* ultimately an aspire-tier bug caused by people pushing
  things to limits, I do believe that in this case a fix is warranted
  because of how hard the current behaviour violates invariants. I do not
  like the possibility of having a slider with multiple spans and no
  repeats.

  Bartłomiej Dach · 2024-12-27 12:38:31 +01:00
  e7225399a2
• Add setters to hitobject coordinate interfaces
  Bartłomiej Dach · 2024-12-27 11:01:47 +01:00
  0d16ed028b
• Merge pull request #30984 from smoogipoo/fix-mania-spinner-conversion

  Fix "spinner" conversion for mania-specific beatmaps

  Bartłomiej Dach · 2024-12-19 15:30:10 +01:00
  1057aa867f
• Populate default LegacyType value on convert hitobjects

  Normally not an issue, but some tests create their own hitobjects
  deriving from `ConvertHitObject`.

  Dan Balasescu · 2024-12-06 17:47:14 +09:00
  8dda5aada8
• Apply minor performance rules
  Huo Yaoyuan · 2024-11-28 20:41:44 +08:00
  f5a7716509
• Remove unused params
  Dan Balasescu · 2024-11-11 16:10:15 +09:00
  8c68db0a36
• Add IHasLegacyHitObjectType to ConvertHitObject
  Dan Balasescu · 2024-11-11 16:10:15 +09:00
  7206e97b7b
• Merge implementations of ConvertHitObjectParser

  Having these be separate implementations sounded awesome at the time,
  but it only ever led to confusion. There's no practical difference if,
  for example, catch sees hitobjects with `IHasPosition` instead of
  `IHasXPosition`.

  Dan Balasescu · 2024-11-11 15:09:13 +09:00
  e1d93a7d9c
• Fix hitobjects without custom sample banks parsing as not auto sample bank
  OliBomby · 2024-10-01 12:11:44 +02:00
  2381c2c72c
• Implement auto additions editor-only
  OliBomby · 2024-10-01 16:40:48 +09:00
  0a78eb9628
• Fix distance spacing grid displaying incorrectly for unsnapped objects with duration
  Bartłomiej Dach · 2024-09-30 13:36:16 +02:00
  75fc57c34b
• add back protection against perfect curve segments with > 3 points
  OliBomby · 2024-08-21 12:03:15 +02:00
  eefd7cf083
• Fix perfect curve anchors losing type between reloads
  OliBomby · 2024-08-16 14:24:55 +02:00
  a2e26ba9ff
• Fix hit object coordinates being truncated to int values

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

  Dean Herbert · 2024-08-09 16:34:39 +09:00
  d072c6a743
• Respect pre-empt time when auto-generating breaks

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

  Bartłomiej Dach · 2024-07-23 13:30:13 +02:00
  088e8ad0a2
• Update HasFlag usages
  Dean Herbert · 2024-07-03 00:19:04 +09:00
  5350945340
• Adjust behaviour of hit animations toggle to match user expectations
  Bartłomiej Dach · 2024-06-20 13:42:32 +02:00
  ad2cd0ba8f
• Merge pull request #23443 from OliBomby/edit-nodesample

  Make NodeSamples editable

  Dean Herbert · 2024-06-18 11:12:02 +09:00
  316125d47a
• Use more descriptive HitObject names for debugger displays
  Dan Balasescu · 2024-06-13 15:18:39 +09:00
  91f2cf8cc3
• Merge branch 'master' into edit-nodesample
  Bartłomiej Dach · 2024-06-06 13:42:25 +02:00
  86b13074a0
• Updated comments
  Aurelian · 2024-05-31 08:20:19 +02:00
  9111da81d2
• Reduced subpoints limit to be a more practical value
  Aurelian · 2024-05-29 09:39:46 +02:00
  542809a748
• Added check for infinite subpoints for PerfectCurve
  Aurelian · 2024-05-27 20:32:18 +02:00
  6c4def1c09
• Reworked linear line check, and optimized scaled flat slider test
  Aurelian · 2024-05-24 14:05:56 +02:00
  b2c4e0e951
• Addressed code quality issues
  Aurelian · 2024-05-24 09:30:24 +02:00
  fff52be59a
• Nearly straight sliders are treated as linear
  Aurelian · 2024-05-24 08:26:17 +02:00
  d948e0fc5c
• Revert "Temporary rollback of framework / SDL3"

  This reverts commit d7d569cf4e.

  Dean Herbert · 2024-05-22 16:29:39 +08:00
  d0b1ebff5a
• Temporary rollback of framework / SDL3
  Dean Herbert · 2024-05-21 14:36:16 +08:00
  d7d569cf4e