203 Commits

• Add legacy storyboard encoder (#37790)

  - Closes https://github.com/ppy/osu/issues/37757
  
  Commit-by-commit reading is recommended. Commits will be split to PRs on
  request but I consider this to be the minimal viable functional
  increment.
  
  ## Done
  
  - This adds a first version of a full storyboard encoder
  (a66dc406f498e35d4e0c8f2a462e946a9a1aeccc). I expect there to be hiccups
  due to weird corners of the `.osb` format; this is only intended to be
  somewhat correct as a start to build upon. Storyboarders are asked to
  file issues as necessary.
  - Due to the fact that storyboard definitions can reside both in the
  `.osu` and the `.osb`, b60698a95c4de1bfeb36fbb159fd5a6028920832 adds the
  required storage to be able to tell which storyboard element lives
  where, so that it can be decoded properly later.
  - In c9d3e04a4135886b5b0943c85f3cc6f4fe99c84c, the storyboard decoder is
  weaved into the beatmap decoder to handle the `.osu` part of the
  storyboard, via the
  `LegacyStoryboardEncoder.Encode{General,Events}ToBeatmap()` methods. For
  `.osb`s, `LegacyStoryboardEncoder.EncodeStandaloneStoryboard()` is
  intended, but for now is not used outside tests.
  - Because of the above, dd1c4e43dc51154cd67860f096712f8b4f229661 removes
  `Beatmap.UnhandledEventLines` as no longer required.
  - 26ac417ed98a8937c42e5f52c4e15ef065a48902 adds tests. They are mostly
  handwritten to ensure basic encode-decode roundtripping. Using existing
  storyboards is difficult, see "Known issues" section as to why.
  - 5cc542366db7caac38eb0729260d884905a2c0d5 fixes a bug in the storyboard
  decoder where the trigger group number was not properly negated on
  decode (see inline comment reference to relevant stable code).
  
  ## Known issues
  
  - Any and all variables in the `[Variables]` section are inlined into
  their usages by `LegacyStoryboardDecoder`, and as such
  `LegacyStoryboardEncoder` will end up inlining them and discarding the
  `[Variables]` section. As far as I can tell stable will also do this.
  - `LegacyStoryboardDecoder` splits all `M` (move) commands into
  `MX`/`MY` commands. Therefore, `LegacyStoryboardEncoder` will write out
  things in the same split way. I did not put in effort to attempt to
  reconcile this, for reasons of part laziness, part not wanting to bloat
  this already-large diff.
  - Ordering of storyboard samples on decode may not match the order on
  decode. I'm crossing fingers this doesn't matter.

  Bartłomiej Dach · 2026-05-20 17:46:51 +09:00
  0e443b1c47
• 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
• Define constant for maximum mania key count
  Bartłomiej Dach · 2025-04-02 09:59:44 +02:00
  36539f1947
• Fix tests
  Bartłomiej Dach · 2025-03-18 14:18:00 +01:00
  efe1416aa3
• Fix editor crashing if beatmap does not have a mode explicitly specified in the .osu

  Closes https://github.com/ppy/osu/issues/32440.
  
  Probably another "regression" from
  https://github.com/ppy/osu/pull/32315.
  
  Trying very hard not to type out any hyperbolic rants here.

  Bartłomiej Dach · 2025-03-18 12:05:36 +01:00
  87a8281b29
• Move BeatmapVersion from BeatmapInfo to IBeatmap

  Closes https://github.com/ppy/osu/issues/32420.
  
  The failure cause here is that in editor the beatmap version for the
  beatmap affected (or... any beatmap, really), is 0 (ZERO). That is
  probably a regression from https://github.com/ppy/osu/pull/32315, but
  like... can we universally agree that calling that change "a regression"
  in any capacity is dumb? Like what was that code *doing* playing dumb
  reference games and copying stuff into an arbitrary instance that could
  get or not get used later on? And now you have a 50/50 chance of
  accessing the *correct* model's field, depending on whether you go via
  `BeatmapInfo` or `Beatmap.BeatmapInfo`?
  
  Moving the field to `IBeatmap`, i.e. what is by now - by consensus,
  since https://github.com/ppy/osu/pull/28473 - supposed to be the "decoded
  and materialised" beatmap, fixes this issue.
  
  I probably should have done this as part of
  https://github.com/ppy/osu/pull/28473 but it slipped my mind. Probably
  for the better too because this change has rather large chances of
  breaking stuff so maybe better to examine it in isolation (via diffcalc
  runs or whatever).
  
  For added humour points, you'd say that the field on `BeatmapInfo` was
  not `[Ignore]`d, so this is a realm schema change, right? No. As far as
  I can tell, it's not. I opened realm studio and `BeatmapVersion` *is not
  a listed column` on `Beatmap` models.
  
  I'm also not gonna get into the fact that I think `EditorBeatmap` doing
  dumb games with juggling two `BeatmapInfo` references since
  https://github.com/ppy/osu/pull/15075 is bad, because I don't think I
  have the mental capacity to hotfix this by going down that train of
  thought.

  Bartłomiej Dach · 2025-03-17 15:04:48 +01:00
  91f3be5fea
• Merge pull request #30860 from frenzibyte/editor-multiple-background-audio-files

  Allow choosing different background/audio files for individual difficulties

  Bartłomiej Dach · 2024-12-11 14:12:58 +09:00
  89e3c551ff
• Adjust bad grammar
  Dean Herbert · 2024-12-10 14:35:09 +09:00
  92dfcae6eb
• Move bookmarks out of BeatmapInfo

  Not sure why I didn't do that in https://github.com/ppy/osu/pull/28473...

  Bartłomiej Dach · 2024-12-03 14:17:14 +01:00
  808934581f
• Merge pull request #28473 from bdach/beatmap-info-purge

  Move unnecessary properties from `BeatmapInfo` / realm to `IBeatmap`

  Dean Herbert · 2024-12-02 16:19:12 +09:00
  5b2558cec2
• Centralise supported file extensions to one helper class

  As proposed in
  https://github.com/ppy/osu-server-beatmap-submission/pull/5#discussion_r1861680837.

  Bartłomiej Dach · 2024-11-29 08:42:45 +01:00
  110e4fbb30
• Merge branch 'master' into beatmap-info-purge
  Bartłomiej Dach · 2024-11-26 10:21:16 +01:00
  cf905d0f5c
• Remove legacy default setter for SamplesMatchPlaybackRate now that it's the default
  Dean Herbert · 2024-11-22 19:05:29 +09:00
  c590bef4c3
• Merge branch 'master' into beatmap-info-purge
  Dean Herbert · 2024-11-22 18:47:32 +09:00
  086a34f5c0
• 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
• Merge branch 'master' into beatmap-info-purge
  Dean Herbert · 2024-09-15 04:53:35 +09:00
  58fe502af4
• Clamp beat divisor to sane range when decoding

  In my view this is a nice change, but do note that on its own it does
  nothing to fix https://github.com/ppy/osu/issues/29492, because of
  `BeatmapInfo` reference management foibles when opening the editor. See
  also: https://github.com/ppy/osu/issues/20883#issuecomment-1288149271,
  https://github.com/ppy/osu/pull/28473.

  Bartłomiej Dach · 2024-08-20 13:52:29 +02:00
  c2dd2ad978
• Fix WidescreenStoryboard breakage after moving out of BeatmapInfo
  Bartłomiej Dach · 2024-07-23 12:19:45 +02:00
  1d4d806362
• Merge branch 'master' into beatmap-info-purge
  Dean Herbert · 2024-07-23 12:09:32 +09:00
  d707e29ff7
• Merge pull request #28619 from bdach/fix-tail-volume-not-saving

  Fix slider tail volume not saving

  Dan Balasescu · 2024-07-03 16:13:18 +09:00
  537e3a1642
• Update HasFlag usages
  Dean Herbert · 2024-07-03 00:19:04 +09:00
  5350945340
• Fix slider tail volume not saving

  Closes https://github.com/ppy/osu/issues/28587.
  
  As outlined in the issue thread, the tail volume wasn't saving because
  it wasn't actually attached to a hitobject properly, and as such the
  `LegacyBeatmapEncoder` logic, which is based on hitobjects, did not
  pick them up on save.
  
  To fix that, switch to using `NodeSamples` for objects that are
  `IHasRepeats`. That has one added complication in that having it work
  properly requires changes to the decode side too. That is because the
  intent is to allow the user to change the sample settings for each node
  (which are specified via `NodeSamples`), as well as "the rest of the
  object", which generally means ticks or auxiliary samples like
  `sliderslide` (which are specified by `Samples`).
  
  However, up until now, `Samples` always queried the control point
  which was _active at the end time of the slider_. This obviously can't
  work anymore when converting `NodeSamples` to legacy control points,
  because the last node's sample is _also_ at the end time of the slider.
  To bypass that, add extra sample points after each node (just out of
  reach of the 5ms leniency), which are supposed to control volume of
  ticks and/or slides.
  
  Upon testing, this *sort of* has the intended effect in stable, with
  the exception of `sliderslide`, which seems to either respect or _not_
  respect the relevant volume spec dependent on... not sure what, and not
  sure I want to be debugging that. It might be frame alignment, or it
  might be the phase of the moon.

  Bartłomiej Dach · 2024-06-26 15:52:16 +02:00
  fff27e619d
• Move CountdownOffset out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:15:00 +02:00
  dd50d6fa6e
• Move Countdown out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:15:00 +02:00
  d373f752d6
• Move TimelineZoom out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:15:00 +02:00
  7f2a6f6f5a
• Move GridSize out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:15:00 +02:00
  6685c5ab74
• Move DistanceSpacing out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:14:58 +02:00
  3634307d7c
• Move SamplesMatchPlaybackRate out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:32:23 +02:00
  c216283bf4
• Move EpilepsyWarning out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:28:41 +02:00
  f64a0624a5
• Move WidescreenStoryboard out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:23:53 +02:00
  1ab86ebd24
• Move LetterboxInBreaks out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:18:44 +02:00
  a6b7600bf2
• Move SpecialStyle out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:12:30 +02:00
  011c2e3651
• Move StackLeniency out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:04:33 +02:00
  0a4560a03e
• Move AudioLeadIn out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:04:28 +02:00
  4339e2dc4a
• Make some more methods static
  Dean Herbert · 2024-05-22 23:26:23 +08:00
  73cb363eba
• Menial cleanups
  Bartłomiej Dach · 2024-05-22 15:52:57 +02:00
  f7ca18b52e
• Changed allowed mania keys, and reverted 0af32c5
  Aurelian · 2024-05-22 11:37:55 +02:00
  b25987ffe7
• Moved DIfficulty Clamping to occur after the file has been parsed

  This is to handle potential issues with the ruleset being parsed after circle size has been parsed.

  Aurelian · 2024-05-21 10:15:53 +02:00
  1127a69359
• Clamped Difficulty Ranges to [0,10]
  Aurelian · 2024-05-20 16:23:16 +02:00
  db8b72eb37
• Fix code quality inspection
  Bartłomiej Dach · 2024-05-01 15:21:39 +02:00
  f0eef32913
• Fix some lines still getting forgotten about
  Dean Herbert · 2024-05-01 17:33:03 +08:00
  44091b1f35
• Don't skip lines in beatmap decoding

  Was added in cc76c58f5f without any
  specific reasoning. Likely not required (and will fix some storyboard
  elements inside `.osu` files from not being correctly saved).

  Dean Herbert · 2024-04-30 16:42:15 +08:00
  ba9f4e4baf
• Preserve storyboard events when saving a beatmap in the editor

  Until we have full encoding support for storyboards, this stop-gap
  measure ensures that storyboards don't just disappear from existence.

  Dean Herbert · 2024-04-30 00:01:56 +08:00
  fd3f4a9e7b
• Update R# + fix inspections
  Dan Balasescu · 2024-02-02 21:00:28 +09:00
  b44f77cee1
• Fix first object after break not starting a new combo
  Dan Balasescu · 2023-11-22 17:22:48 +09:00
  cb4568c4a1
• Fix insufficient leniency when querying sample points
  Bartłomiej Dach · 2023-10-20 10:26:16 +02:00
  c89081589c
• Fix beatmaps with no preview point set getting incorrect default

  Note that this will require a re-import to fix existing beatmaps
  becuse.. it's stored to realm. Probably not worth worrying about for
  now.

  Dean Herbert · 2023-10-10 19:13:16 +09:00
  2781846147
• Delete outdated warning disables
  Bartłomiej Dach · 2023-09-07 18:47:01 +02:00
  2bb869732e
• Remove all usage of LegacyDifficultyControlPoint
  Dean Herbert · 2023-09-07 17:41:57 +09:00
  b34a36f6ce
• Rename SliderVelocity to SliderVelocityMultiplier to distinguish from Velocity
  Dean Herbert · 2023-09-06 19:01:08 +09:00
  1a37543d28