osu-lazer

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

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 difficulty calculation after 10 seconds by default

Dan Balasescu · 2025-03-04 11:22:47 +09:00

550ff85550

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

Merge branch 'master' into pp-dev

Dean Herbert · 2025-02-27 00:08:43 +09:00

87b6dddd11

Merge pull request #32077 from bdach/double-click-difficulty-slider-nub

Fix double-clicking difficulty adjust sliders not resetting the value to default correctly

Dean Herbert · 2025-02-25 21:08:46 +09:00

b3965f0dd0

Fix double-clicking difficulty adjust sliders not resetting the value to default correctly

- Closes https://github.com/ppy/osu/issues/31888
- Supersedes / closes https://github.com/ppy/osu/pull/32060

Bartłomiej Dach · 2025-02-25 07:40:55 +01:00

1f562ab47d

Fix taiko swell ending samples playing at results sometimes

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

Sooooo... this is going to be a rant...

To understand why this is going to require a rant, dear reader, please
do the following:

1. Read the issue thread and follow the reproduction scenario (download
   map linked, fire up autoplay, seek near end, wait for results, hear
   the sample spam).
2. Now exit out to song select, *hide the toolbar*, and attempt
   reproducing the issue again.
3. Depending on ambient mood, laugh or cry.

Now, *why on earth* would the *TOOLBAR* have any bearing on anything?

Well, the chain of failure is something like this:

- The toolbar hides for the duration of gameplay, naturally.
- When progressing to results, the toolbar gets automatically unhidden.
- This triggers invalidations on `ScrollingHitObjectContainer`. I'm not
  precisely sure which property it is that triggers the invalidations,
  but one clearly does. It may be position or size or whichever.
- When the invalidation is triggered on `layoutCache`, the next
  `Update()` call is going to recompute lifetimes for ALL hitobject
  entries.
- In case of swells, it happens that the calculated lifetime end of the
  swell is larger than what it actually ended up being determined as at
  the instant of judging the swell, and thus, the swell is *resurrected*,
  reassigned a DHO, and the DHO calls `UpdateState()` and plays the
  sample again despite the `samplePlayed` flag in `LegacySwell`, because
  all of that is ephemeral state that does not survive a hitobject
  getting resurrected.

Now I *could* just fix this locally to the swell, maybe, by having some
time lenience check, but the fact that hitobjects can be resurrected by
the *toolbar* appearing, of all possible causes in the world, feels
just completely wrong. So I'm adding a local check in SHOC to not
overwrite lifetime ends of judged object entries.

The reason why I'm making that check specific to end time is that I can
see valid reasons why you would want to recompute lifetime *start* even
on a judged object (such as playfield geometry changing in a significant
way). I can't think of a valid reason to do that to lifetime *end*.

Bartłomiej Dach · 2025-02-24 14:30:55 +01:00

41db3c1501

Fix "use current distance snap" button incorrectly factoring in last object with velocity

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

Bartłomiej Dach · 2025-02-21 12:52:59 +01:00

de78518fea

Calculate hit windows in performance calculator instead of databased difficulty attributes (#31735 )

* Calculate hit windows in performance calculator instead of databased difficulty attributes

* Apply mods to beatmap difficulty in osu! performance calculator

* Remove `GreatHitWindow` difficulty attribute for osu!mania

* Remove use of approach rate and overall difficulty attributes for osu!

* Remove use of hit window difficulty attributes in osu!taiko

* Remove use of approach rate attribute in osu!catch

* Remove unused attribute IDs

* Code quality

* Fix `computeDeviationUpperBound` being called before `greatHitWindow` is set

James Wilson · 2025-02-07 19:21:12 +09:00

9f90ebb2f7

Merge branch 'master' into pp-dev

Dean Herbert · 2025-02-07 14:09:25 +09:00

6c069b3373

Fix incorrect snapping behaviour when previous object is not snapped to beat

Bartłomiej Dach · 2025-02-04 11:45:15 +01:00

731f100aaf

Fix code quality

Bartłomiej Dach · 2025-02-03 15:18:03 +01:00

2d6f64e891

Remove unused method

Only used in test code.

Bartłomiej Dach · 2025-02-03 14:01:51 +01:00

df37768ff4

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 #31368 from frenzibyte/mobile-fix-mania

Improve osu!mania playability on mobile devices

Dean Herbert · 2025-02-01 14:49:46 +09:00

cf3a379b1c

Merge pull request #31655 from bdach/deabstractify-editor-snap

Refactor editor object snapping to remove bad abstractions

Dan Balasescu · 2025-01-30 01:38:42 +09:00

48b1c7398e

Fix incremental unstable rate calculation not matching expectations

The `EventCount` variable wasn't factoring in that some results do not
affect unstable rate. It would therefore become more incorrect as the
play continued.

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

Dean Herbert · 2025-01-29 17:11:12 +09:00

d8ec3b77e4

Avoid extra unnecessary DI

Co-authored-by: Dean Herbert <pe@ppy.sh>

Salman Alshamrani · 2025-01-25 19:12:42 -05:00

ffc37cece0

Refactor further to avoid weird non-virtual common method

Bartłomiej Dach · 2025-01-24 13:14:31 +01:00

daec91f61d

Fix tests

Bartłomiej Dach · 2025-01-24 11:59:07 +01:00

269ade178e

Remove IPositionSnapProvider

Bartłomiej Dach · 2025-01-24 11:59:07 +01:00

32d341a468

Remove dependence of placement blueprints on IPositionSnapProvider

Bartłomiej Dach · 2025-01-24 11:59:07 +01:00

a6987f5c95

Remove dependence of blueprint containers on IPositionSnapProvider

Bartłomiej Dach · 2025-01-24 11:59:05 +01:00

15b6e28ebe

Expose GameplayStartTime in IGameplayClock

Dean Herbert · 2025-01-24 15:29:49 +09:00

5cc8181bad

Merge branch 'master' into pp-dev

Dean Herbert · 2025-01-21 13:19:01 +09:00

aeca37c230

Move error function from osu.Game.Utils to osu.Game.Rulesets.Difficulty.Utils (#31520 )

* Move error function implementation to osu.Game.Rulesets.Difficulty.Utils

* Rename ErrorFunction.cs to DifficultyCalculationUtils_ErrorFunction.cs

Natelytle · 2025-01-17 19:37:34 +00:00

5b4ba9225d

Merge branch 'master' into mobile-fix-mania

Dean Herbert · 2025-01-16 18:08:46 +09:00

42e5cb58b7

Typo fix

Shawn Presser · 2025-01-15 19:29:41 -06:00

6008c3138e

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

Fix failing tests

- Caches `DrawableRuleset` in editor compose screen for mania playfield adjustment container (because it's used to wrap the blueprint container as well)
- Fixes `ManiaModWithPlayfieldCover` performing a no-longer-correct direct cast with a naive-but-working approach.

Salman Alshamrani · 2025-01-12 22:56:40 -05:00

c1ac27d658

Merge branch 'master' into mobile-fix-mania

Salman Alshamrani · 2025-01-12 02:00:49 -05:00

f121b03a78

Merge branch 'master' into new-combo-editor

Bartłomiej Dach · 2025-01-10 14:13:14 +01:00

933f5db208

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

Merge pull request #31462 from bdach/ternary-button-is-bad

Simplify editor "ternary button" structure

Dan Balasescu · 2025-01-10 14:24:41 +09:00

38d95abc24

Punish speed PP for scores with high deviation (#30907 )

Givikap120 · 2025-01-09 13:27:54 +00:00

b21c6457b1

Simplify editor "ternary button" structure

As I look into re-implementing the ability to choose combo colour for an
object (also known as "colourhax") from the editor UI, I stumble upon
these wretched ternary items again and sigh a deep sigh of annoyance.

The structure is overly rigid. `TernaryItem` does nothing that
`DrawableTernaryItem` couldn't, except make it more annoying to add
specific sub-variants of `DrawableTernaryItem` that could do more
things.

Yes you could sprinkle more levels of virtuals to
`CreateDrawableButton()` or something, but after all, as Saint Exupéry
says, "perfection is finally attained not when there is no longer
anything to add, but when there is no longer anything to take away."
So I'm leaning for taking one step towards perfection.

Bartłomiej Dach · 2025-01-09 13:41:22 +01:00

5c8ae6f851

Fix rate adjustments changing the spacing between replay frames

Dean Herbert · 2025-01-09 13:30:04 +09:00

c8f72fdbe9

Simplify angle bonus formula (#31449 )

* Simplify angle bonus formula

* Simplify further

* Simplify acute too

* Tests

StanR · 2025-01-08 10:03:22 +00:00

392bb5718c

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

Reduce HitSampleInfo constants allocations

Andrei Zavatski · 2025-01-07 00:36:58 +03:00

e8dc09f5bc

Always block scroll input above editor toolbox areas

Originally this was an intentional choice (see
https://github.com/ppy/osu/pull/18088) when these controls were more
transparent and didn't for a solid toolbox area.

But this is no longer the case, so for now let's always block scroll to
match user expectations.

Closes #31262.

Dean Herbert · 2025-01-02 14:31:27 +09:00

cca63b599e

Allow locking orientation on iOS in certain circumstances

Salman Alshamrani · 2024-12-29 22:15:21 -05:00

7563a18c7f

Rewrite of the Rhythm Skill within osu!taiko (#31284 )

* implement bell curve into diffcalcutils

* remove unneeded attributes

* implement new rhythm skill

* change dho variables

* update dho rhythm

* interval interface

* implement rhythmevaluator

* evenhitobjects

* evenpatterns

* evenrhythm

* change attribute ordering

* initial balancing

* change naming to Same instead of Even

* remove attribute bump for display

* Fix diffcalc tests

---------

Co-authored-by: StanR <hi@stanr.info>

Jay Lawton · 2024-12-27 16:30:30 +03:00

824497d82c

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

Change slider drop penalty to use actual number of difficult sliders, fix slider drop penalty being too lenient (#31055 )

* Change slider drop penalty to use actual number of difficult sliders, fix slider nerf being too lenient

* Move cubing to performance calculation

* Add separate list for slider strains

* Rename difficulty atttribute

* Rename attribute in perfcalc

* Check if AimDifficultSliderCount is more than 0, code quality fixes

* Add `AimDifficultSliderCount` to the list of databased attributes

* Code quality

---------

Co-authored-by: James Wilson <tsunyoku@gmail.com>

StanR · 2024-12-21 23:45:29 +00:00

6808a5a77c

5503 Commits