osu-lazer

Fix judgement position when not supplied a drawable hit object

clayton · 2025-08-10 07:16:57 -07:00

375da52a34

Remove hit lighting for tick hits

clayton · 2025-08-10 07:15:37 -07:00

bcc9bc4498

Fix tick hits in non-legacy skins

clayton · 2025-08-10 07:15:20 -07:00

5fc5d0bd5f

Always show slider head judgement

Because it may display sliderpoints in classic behaviour

clayton · 2025-08-10 07:13:47 -07:00

18803fbec0

Show effect of beatmap attributes on gameplay metrics in osu!

Bartłomiej Dach · 2025-08-01 11:07:48 +02:00

655733c06d

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 slider repeat arrows appearing too early in editor when hit markers are enabled

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

Broke in conjunction with https://github.com/ppy/osu/pull/32638 because
of transforms not being applied to `DrawableSliderRepeat` but its
individual pieces instead.

In cross-checking with stable (visual only) the early fade in of the
arrow should still apply, it just shouldn't be instantaneous as is
currently ends up being with how the code is structured.

Bartłomiej Dach · 2025-04-21 10:00:22 +02:00

78d9bd7fb4

Combine "spinnable time" conditions

Dan Balasescu · 2025-04-14 17:45:15 +09:00

80d9f742da

Add back clamping of animation durations on slider repeat runs

Dean Herbert · 2025-04-03 18:32:02 +09:00

6d1fc0e235

Adjust again to be closer to stable

Dean Herbert · 2025-04-03 17:25:42 +09:00

4cd2e5ba25

Syncrhonise tranforms between arrow and circle pieces

Dean Herbert · 2025-04-03 15:49:15 +09:00

f9ceb59d70

Fix slider repeat arrow fade not matching expectations

Dean Herbert · 2025-03-31 17:15:25 +09:00

acc5790b74

Fix slider ball rotation not being updated when rewinding to a slider

Dean Herbert · 2025-02-07 18:57:26 +09:00

fab5cfd275

Merge branch 'master' into new-combo-editor

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

933f5db208

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

Fix slider end circles not remaining for long enough when hit animations disabled

Dean Herbert · 2025-01-02 18:54:28 +09:00

e7b80167cd

Merge pull request #31354 from bdach/show-hit-markers-for-repeats

Fix slider repeats not properly respecting "show hit markers" setting

Dean Herbert · 2025-01-02 18:45:55 +09:00

2d4a3aa4f9

Fix slider repeats not properly respecting "show hit markers" setting

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

Curious on thoughts about how the instant arrow fade looks on
non-classic skins. On argon it's probably fine, but it does look a
little off on triangles...

Bartłomiej Dach · 2024-12-30 13:52:50 +01:00

06879eee39

Add setters to hitobject coordinate interfaces

Bartłomiej Dach · 2024-12-27 11:01:47 +01:00

0d16ed028b

Ensure Slider.updateNestedPositions() actually updates the position of all nesteds

Bartłomiej Dach · 2024-09-27 10:27:54 +02:00

1c23fd31d7

Fix DrawableOsuHitObject not properly cleaning up dim application callbacks

Should fix https://github.com/ppy/osu/issues/28629.

First of all, to support the claim that this does fix the issue -
reproduction is rather difficult, but I believe I found a way to
maximise the chances of it reproducing by performing the following
steps:

1. Apply the following diff:

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index eacd2b3e75..4c00da031a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -95,6 +96,8 @@ public DrawableSlider([CanBeNull] Slider s = null)
         [BackgroundDependencyLoader]
         private void load()
         {
+            Thread.Sleep(100);
+
             tailContainer = new Container<DrawableSliderTail> { RelativeSizeAxes = Axes.Both };

             AddRangeInternal(new Drawable[]

2. Download https://osu.ppy.sh/beatmapsets/1470790#osu/3023028 and open
   it in the editor.

3. Select all objects using Ctrl-A. Yes, it'll take a while, especially
   so with the patch above.

4. Rotate the selection by any amount using the right toolbox.

5. Press undo. The game should crash. If it doesn't spam redo and undo
   until it does.

Now to explain what the fix is.

In the issue thread I spent a considerable time hemming and hawing about
which of the dimmable pieces was null, which was a complete miss and a
failure at reading. Let's see the stack trace again:

	2024-06-27 02:15:20 [error]: at osu.Game.Rulesets.Osu.Objects.Drawables.DrawableOsuHitObject.<UpdateInitialTransforms>g__applyDim|15_0(Drawable piece) in /home/runner/work/osu-auth-client/osu-auth-client/osu/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs:line 101

Line 101, you say? What could be null here?

	https://github.com/ppy/osu/blob/bd8addfb5f71568479d2c037d1b6e811de6e7fe6/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs#L101

Okay, what's `InitialLifetimeOffset`, then?

	https://github.com/ppy/osu/blob/bd8addfb5f71568479d2c037d1b6e811de6e7fe6/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs#L108

Yes, that's right. It's `HitObject` that is null here.

Now why does *that* happen? First, let's note that all stacks where this
died went through `UpdateState()`, which means that the problematic
`applyDim()` calls had to be `ApplyCustomUpdateState` event callbacks.
Meaning that the pieces where `HitObject` was null were DHOs themselves.

Recall that parent DHOs and child DHOs are pooled separately. Therefore,
there is no guarantee that any parent and child DHOs will remain
associated with each other for the entire duration of a gameplay
session; it is quite the contrary, and nobody should rely on that.
Unfortunately for us, adding a `applyDimToDrawableHitObject` callback to
a child object's `ApplyCustomUpdateState` *implicitly creates* such an
association, because it ends up allocating a closure that captures
`this` (meaning the parent in this context).

Therefore, this now creates a situation where a child DHO can attempt to
read state from a former parent DHO which can be in an indeterminate
state, and in fact, when this crashes, the former parent DHO is most
likely not even in use - hence the null `HitObject`.

Thus, the fix is to clear the association by unsubscribing from the
event when nested objects are cleared.

My hypothesis why the reproduction scenario is like it is, is that both
the sleep and the increased pressure on the pool (by way of selecting
all objects and therefore forcing the DHOs to be materialised beyond
pool capacity) increases the likelihood of getting a crosslink.
When pool pressure is low, it is much more likely that a parent DHO
*will* get the same child DHO again on re-application, even though
that is not guaranteed.

Just as an additional detail, note that the sentry issue for this lists
the "first seen" version as 2024.312.0, which is the release that
included https://github.com/ppy/osu/pull/27401 which would be directly
responsible for this mess.

Bartłomiej Dach · 2024-09-19 14:30:02 +02:00

89509ea49e

Merge branch 'master' into free-sliders

Dean Herbert · 2024-08-19 14:27:54 +09:00

0c6bee4033

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

Don't rely on single-use properties

Dan Balasescu · 2024-07-18 19:07:02 +09:00

a7e110f669

Merge remote-tracking branch 'upstream/master' into free-sliders

OliBomby · 2024-07-03 20:40:25 +02:00

89f106d14f

Fix editor performance regression with hitmarkers active

Bartłomiej Dach · 2024-06-26 16:26:32 +02:00

b339d6a00c

Fix editor performance dropping over time when hit markers are enabled

There's probably a better solution but let's hotfix this for now.

Dean Herbert · 2024-06-26 01:06:37 +09:00

dc817b62cc

Fix incorrect slider judgement positions when classic mod is active

Regressed in https://github.com/ppy/osu/pull/27977.

Bit ad-hoc but don't see how to fix without just reverting the change.

Bartłomiej Dach · 2024-06-25 10:07:58 +02:00

2cb18820ea

Add note about every-frame-transforms

Dean Herbert · 2024-06-23 03:31:40 +08:00

df43a1c6cc

Adjust behaviour of hit animations toggle to match user expectations

Bartłomiej Dach · 2024-06-20 13:42:32 +02:00

ad2cd0ba8f

Merge remote-tracking branch 'upstream/master' into free-sliders

OliBomby · 2024-06-19 23:15:41 +02:00

d7fee53d67

Merge branch 'master' into edit-nodesample

Bartłomiej Dach · 2024-06-06 13:42:25 +02:00

86b13074a0

add CanBeNull attribute to LastRepeat

OliBomby · 2024-06-03 13:38:42 +02:00

34c4ee7de8

Only take initial judgement position from object instead of following

Looks less bad with mods like depth active.

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

Bartłomiej Dach · 2024-05-30 09:03:02 +02:00

8916f08f86

Use hopefully safer implementation of anchoring judgements to objects

Bartłomiej Dach · 2024-05-29 11:11:43 +02:00

a6c776dac8

Revert unrelated changes

Bartłomiej Dach · 2024-05-29 10:57:30 +02:00

22a2adb5e6

Merge branch 'master' into magnetised-judgements

Bartłomiej Dach · 2024-05-29 10:56:53 +02:00

9fb7cc5900

SliderBall's rotation updates based on CurvePositionAt

Aurelian · 2024-05-28 19:38:33 +02:00

b74f66e335

Merge remote-tracking branch 'upstream/master' into free-sliders

OliBomby · 2024-05-28 18:42:34 +02:00

2261d65b01

Fix formatting

DavidBeh · 2024-04-24 12:40:23 +02:00

8c2a4eb78a

Made judgements follow DrawableOsuHitObjects. Enabled judgements for depth mod

DavidBeh · 2024-04-24 00:23:45 +02:00

16190a4ed7

Fixed judgements with MG mod without causing side effects

DavidBeh · 2024-04-23 23:24:51 +02:00

3a914b9337

Attempt to position DrawableOsuJudgement based on its DrawableOsuHitObject instead of DrawableOsuHitObject.HitObject

DavidBeh · 2024-04-23 19:19:11 +02:00

331f1f31b0

enabled and fixed judgements for the magnetised mod

DavidBeh · 2024-04-22 20:25:43 +02:00

beee76d64a

Only optimise Catmull segments in osu ruleset

Dan Balasescu · 2024-04-01 17:22:50 +09:00

4806ea54f1

Merge branch 'master' into heatmap-misses

Bartłomiej Dach · 2024-03-18 14:43:24 +01:00

c9bbeeb49a

Fix cross-talk between pooled DrawableSliderRepeat usage causing incorrect rotation

Dean Herbert · 2024-03-08 11:37:13 +08:00

fcc35a6acc

Merge pull request #27429 from bdach/rewind-slider-tracking

Fix slider tracking state not restoring correctly in all cases on rewind

Dean Herbert · 2024-03-07 22:41:12 +08:00

646edb239a

Update usage of MathUtils

Dean Herbert · 2024-03-06 12:13:12 +08:00

b53b752e54

1368 Commits