402 Commits

• Add helper method and update some other similar preempt calculations
  Dean Herbert · 2025-12-18 22:28:50 +09:00
  09178b5dc4
• 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
• Show effect of beatmap attributes on gameplay metrics in catch
  Bartłomiej Dach · 2025-08-01 11:07:58 +02:00
  c1ea472dcf
• Merge conditionals
  Bartłomiej Dach · 2025-01-10 14:13:03 +01:00
  0d9a3428ae
• Fix combo properties multiple reassignments
  Andrei Zavatski · 2025-01-07 14:00:31 +03:00
  8f4eafea4e
• Add setters to hitobject coordinate interfaces
  Bartłomiej Dach · 2024-12-27 11:01:47 +01:00
  0d16ed028b
• Fix banana override
  Dean Herbert · 2024-10-01 16:48:20 +09:00
  861da968d4
• Fix rotation not being updated correctly on start time change
  Dean Herbert · 2024-09-17 16:18:29 +09:00
  f8fff4074d
• Add comments and fix bananas stopping still if not caught
  Dean Herbert · 2024-09-17 16:15:45 +09:00
  c1c0d49bfe
• *Also* fix droplets
  Dean Herbert · 2024-09-17 15:38:51 +09:00
  3f4422429d
• Also fix banana showers
  Dean Herbert · 2024-09-17 15:31:00 +09:00
  2ccdad41e7
• Fix osu!catch fruit rotation being applied too late
  Dean Herbert · 2024-09-17 15:12:02 +09:00
  785a725507
• Remove unused property causing CI inspection

  I don't see this in my Rider locally. I suppose we can remove it, though
  it was intentionally added so that the struct mirrors the interface.

  Dan Balasescu · 2024-08-13 19:52:14 +09:00
  69c5e6a799
• Fix fruit positions getting mangled when exploded
  Dan Balasescu · 2024-08-13 18:42:09 +09:00
  fbfe3a4887
• 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
• Merge branch 'master' into fix-juicestream-velocity
  Bartłomiej Dach · 2024-06-28 11:47:39 +02:00
  c70a72ece8
• Merge branch 'master' into edit-nodesample
  Bartłomiej Dach · 2024-06-06 13:42:25 +02:00
  86b13074a0
• Remove rounding of slider velocity multiplier on juice streams

  Compare: https://github.com/ppy/osu/pull/26616
  
  This came up elsewhere, namely in
  https://github.com/ppy/osu/pull/28277#issuecomment-2133505958.
  
  As it turns out, at least one beatmap among those whose scores had
  unexpected changes in total score, namely
  https://osu.ppy.sh/beatmapsets/971028#fruits/2062131, was using slider
  velocity multipliers that were not a multiple of 0.01 (the specific
  value used was 0.225x). This meant that due to the rounding applied to
  `SliderVelocityMultiplierBindable` via `Precision`, the raw value was
  being incorrectly rounded, resulting in incorrect conversion.
  
  The "direct" change that revealed this is most likely
  https://github.com/ppy/osu-framework/pull/6249, by the virtue of
  shuffling the `BindableNumber` rounding code around and accidentally
  changing midpoint rounding semantics in the process. But it was not
  at fault here, as rounding was just as wrong before that change
  as after in this specific context.

  Bartłomiej Dach · 2024-05-28 13:14:44 +02:00
  a3b8493751
• Apply further changes to remove remaining weirdness
  Bartłomiej Dach · 2024-02-05 13:37:38 +01:00
  fb80d76b4a
• update DrawableHitCircle.ApplyResult to pass this to its callback
  Chandler Stowell · 2024-01-25 11:25:41 -05:00
  93bd3ce5ae
• Merge remote-tracking branch 'upstream/master' into edit-nodesample
  OliBomby · 2024-01-25 11:33:29 +01:00
  c2d57dc77c
• use stack to pass action state when applying hit results

  this removes closure allocations

  Chandler Stowell · 2024-01-24 13:13:45 -05:00
  d2775680e6
• Fix backwards z-ordering of fruits in juice streams and banana showers

  Closes https://github.com/ppy/osu/issues/25827.
  
  The logic cannot be easily abstracted out (because
  `CompareReverseChildID()` is protected and non-static on
  `CompositeDrawable`), so a local copy was applied instead.
  
  No testing as any testing would have been purely visual anyways.

  Bartłomiej Dach · 2024-01-02 11:55:59 +01:00
  72e502e615
• Fix catch drawable objects not being clamped to playfield bounds
  Bartłomiej Dach · 2023-12-27 10:55:29 +01:00
  2e8b49b93a
• Extract preempt durations to shared constants
  Bartłomiej Dach · 2023-12-14 20:41:12 +01:00
  605269f65f
• Fix catch applying positional clamping too early
  Dan Balasescu · 2023-12-11 21:52:39 +09:00
  6320194e19
• Fix JuiceStream velocity calculation
  Dan Balasescu · 2023-12-11 15:29:58 +09:00
  cda9440a29
• Add some comments where truncations were added
  Dan Balasescu · 2023-12-06 14:50:03 +09:00
  394ea73055
• Match stable precision when generating catch bananas
  Dan Balasescu · 2023-12-05 15:39:26 +09:00
  3aaba3183b
• Fix legacy tick distance in JuiceStream generation
  Dan Balasescu · 2023-12-05 15:10:03 +09:00
  7d602c792d
• Replicate integer calculations for tiny tick conversion
  Dan Balasescu · 2023-12-05 11:58:00 +09:00
  b90de83f33
• Add note about shared code
  Dean Herbert · 2023-11-24 10:25:23 +09:00
  039f8e6242
• Merge branch 'master' into fix-combo-handling
  Dan Balasescu · 2023-11-23 16:22:01 +09:00
  7bc2d6e6cd
• Fix combo/combo colouring issues around spinners
  Dan Balasescu · 2023-11-23 13:54:05 +09:00
  7998204cfe
• Generalize Bezier curves to BSplines of Nth degree
  Thomas Müller-Höhne · 2023-11-11 13:32:53 +01:00
  926636cc03
• Move helper method to LegacyRulesetExtensions and stop applying rounding allowance to catch

  As discussed, it isn't used in stable like this. Was a mistake.

  Dean Herbert · 2023-10-20 18:57:14 +09:00
  3fb74cb5f9
• Centralise and repair circle size calculations game-wide
  Dean Herbert · 2023-10-18 19:50:42 +09:00
  3a5490892c
• Update comments to better explain what LastTick is doing
  Dean Herbert · 2023-09-29 14:40:44 +09:00
  d7119674e8
• Move LegacyLastTickOffset specification to generation code and stop passing everywhere
  Dean Herbert · 2023-09-29 14:32:29 +09:00
  81485c548c
• Rename SliderVelocity to SliderVelocityMultiplier to distinguish from Velocity
  Dean Herbert · 2023-09-06 19:01:08 +09:00
  1a37543d28
• Ensure populated node samples so new objects have unique node sample lists
  OliBomby · 2023-08-16 20:48:52 +02:00
  cc4e11a5ac
• Fix weird optional usage in HitSampleInfo.With
  Dean Herbert · 2023-05-17 14:11:52 +09:00
  510ebe1f23
• Rename GetSampleInfo to better describe what method does

  Also add full xmldoc

  Dean Herbert · 2023-05-17 14:07:48 +09:00
  dc51d5ecf3
• Ensure static banana samples are not mutated
  Dean Herbert · 2023-05-03 13:02:37 +09:00
  16c624fb61
• remove constructor argument from Banana
  OliBomby · 2023-05-02 12:41:39 +02:00
  90d98cd329
• add sample info to Banana and SpinnerBonusTick
  OliBomby · 2023-05-01 14:54:06 +02:00
  27cfadca16
• add min and max value to SliderVelocity
  OliBomby · 2023-04-30 19:32:24 +02:00
  41d4894aa3
• remove all regular usage of DifficultyControlPoint
  OliBomby · 2023-04-26 17:55:38 +02:00
  c44f71a737
• Remove #nullable disable from CaughtObject
  ekrctb · 2023-01-15 23:21:38 +09:00
  1f8b7b8f03
• Remove #nullable disable from Catch.Objects.Drawables

  Except DrawableCatchHitObject, it complains in base(hitObject) call.

  ekrctb · 2023-01-15 17:29:35 +09:00
  086604cd14