osu-lazer

Fix extra lives in Easy mod potentially getting reapplied during gameplay (#36678 )

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

Bartłomiej Dach · 2026-02-16 19:02:59 +09:00

810edebe87

Merge pull request #36639 from bdach/actually-all-valid-hit-results

Refactor hit result methods on `Ruleset`

Dean Herbert · 2026-02-10 17:07:04 +09:00

c59e5bf335

Perform extra checks when loading rulesets (#36641 )

Bartłomiej Dach · 2026-02-10 13:34:43 +09:00

655d725f0c

Adjust contract of Ruleset.GetValidHitResults() to always enumerate all results used

Bartłomiej Dach · 2026-02-09 12:48:53 +01:00

15c49a729e

Publicise Ruleset.GetValidHitResults()

Bartłomiej Dach · 2026-02-09 12:00:30 +01:00

3678ea0d0f

Rename Ruleset.GetHitResults{ -> ForDisplay}()

Bartłomiej Dach · 2026-02-09 12:00:15 +01:00

dbce8886f8

Improve adjusting mods settings values with keyboard (#36090 )

- closes https://github.com/ppy/osu/issues/36016

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

Denis Titovets · 2026-02-09 11:35:01 +09:00

60d98f0afd

Standardise ruleset error logging to always include exception in logs

Supersedes and closes https://github.com/ppy/osu/pull/36420.

Dean Herbert · 2026-01-22 15:48:51 +09:00

fdd13cd7e1

Specialise mod setting hover text in song select scoreboard (#36391 )

- resolves #35992

**Changes**

Introduced GetSettingTooltipText, which returns the value of the
respective setting. The function can be overwritten, allowing to
implement specific behavior. This allows you to define that a value of 0
for the “Muted” mod will instead display “always muted.”
In the same step, I also adjusted the "NoScope" mod, where we had the
same problem.
Wherever we want to implement specialization like this, we can simply
overwrite GetSettingTooltipText to customize the behavior for the mod
settings of the mod.

**Result**
<img width="2560" height="1440" alt="2026-01-19-122307_hyprshot"
src="https://github.com/user-attachments/assets/20e3aa9a-aa6f-4284-9cf1-3092f52c021d"
/>
<img width="2560" height="1440" alt="2026-01-19-122324_hyprshot"
src="https://github.com/user-attachments/assets/6f3fac5b-2a5d-4dd9-a56c-4b09c02cbcca"
/>
<img width="2560" height="1440" alt="2026-01-19-155307_hyprshot"
src="https://github.com/user-attachments/assets/f9ee75d3-c200-4536-9ee9-d20ddbd9fa44"
/>

Signed-off-by: Linus Genz <linuslinuxgenz@gmail.com>

Linus Genz · 2026-01-20 16:51:23 +09:00

dfa7ac2082

Fix toasts showing "no key bound" for operations which can't have keys bound

Supersedes and closes https://github.com/ppy/osu/pull/35781.
Closes https://github.com/ppy/osu/issues/36294.

Dean Herbert · 2026-01-15 17:52:30 +09:00

b4ba327c1c

Fix editor crashing on undoing after hit object placement

Happens when initial timing is undone.

Regressed in
https://github.com/ppy/osu/commit/12170df80add87e8f292545f67566f8d25465efc.
Closes https://github.com/ppy/osu/issues/36228.

Dean Herbert · 2026-01-05 15:26:14 +09:00

9916e5bb1c

Merge branch 'master' into custom-sample-set-selection

Dean Herbert · 2025-12-17 19:30:24 +09:00

61bf68f336

Add basic colour indication as to when placements are valid

Unsure about this one, but I find the preceding commit to be very
lacking in explaining to the user why the editor don't work. Shining
some things red may help aid understanding.

Bartłomiej Dach · 2025-12-04 14:37:56 +01:00

c6cc92315c

Disallow placing hit objects before first timing point

Because they can break stable. See
https://github.com/ppy/osu/issues/31591#issuecomment-3575270120 for
detailed rationale.

Bartłomiej Dach · 2025-12-04 14:15:52 +01:00

12170df80a

Merge pull request #35757 from peppy/settings-wank

Adjust settings buttons and general section to feel better

Bartłomiej Dach · 2025-11-25 08:46:00 +01:00

9e3486d4e6

Reduce abstractions of rounded button

Dean Herbert · 2025-11-25 00:55:42 +09:00

b0762fc8ec

Adjust element spacing in editor toolboxes

Bartłomiej Dach · 2025-11-19 13:38:34 +01:00

397041099e

Use new sliders-with-text-input in editor toolboxes

Addresses https://github.com/ppy/osu/discussions/35732.

And yes, I renamed "perfect curve threshold" to "bias" so that the text
can fit. Sue me.

Bartłomiej Dach · 2025-11-19 13:22:20 +01:00

4b59a4657f

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

Merge pull request #35249 from dnfd1/mania-difficultychange-limits

Adjust extended OD limits for mania difficulty change mod to reflect HR and EZ values

Dean Herbert · 2025-10-28 15:05:26 +09:00

98829bf857

Inherit sample set info from previous object on placement

Bartłomiej Dach · 2025-10-24 12:09:30 +02:00

511921c1f7

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

Update framework

Dean Herbert · 2025-10-21 17:24:33 +09:00

0b84916c3e

Allow OD to be overrided

dnfd1 · 2025-10-08 21:27:49 -07:00

348713d83d

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

Re-remove duplicate error functions

Dean Herbert · 2025-10-07 16:30:40 +09:00

743a94bd22

Merge branch 'master' into pp-dev

Dean Herbert · 2025-10-07 16:11:54 +09:00

bda5737135

Merge pull request #34934 from Valerus9/fixtestdouble

Fix TestDouble failing on systems where the decimal separator isn't a dot

Bartłomiej Dach · 2025-09-29 16:46:32 +09:00

5336bcd71d

Merge pull request #35120 from LumpBloom7/fix-toolbox-tooltip

Fix composition tool tooltip not changing text when enabled

Bartłomiej Dach · 2025-09-29 16:04:15 +09:00

ba3d7392bf

Merge branch 'master' into fixtestdouble

Bartłomiej Dach · 2025-09-29 08:43:49 +02:00

9257e62bac

Use slightly nicer way of invarianting rate adjust setting value

Bartłomiej Dach · 2025-09-29 08:39:01 +02:00

70f683e7fa

Handle disabled text in composition tool button

Derrick Timmermans · 2025-09-26 09:28:04 +02:00

c66cc5ebb1

Adjust matchmaking naming, namespaces, xmldoc (#35123 )

* Adjust matchmaking naming, namespaces, xmldoc

* Change partial filenames to use `.` instead of `_` separator

Dean Herbert · 2025-09-26 12:17:28 +09:00

e1ba1b45b0

Fix composition tool tooltip not changing text when enabled

Derrick Timmermans · 2025-09-25 10:44:05 +02:00

df795da070

Remove databasing of MechanicalDifficulty and ReadingDifficulty attributes (#35028 )

* Remove databasing of `MechanicalDifficulty` and `ReadingDifficulty` attributes

* Update attribute IDs

James Wilson · 2025-09-15 13:46:00 +03:00

2749184c38

Fix testtooltip failure

Valerus9 · 2025-09-13 06:44:29 +02:00

e34b0659da

Merge branch 'master' into pp-dev

Dan Balasescu · 2025-09-07 19:22:08 +09:00

ffab8342f2

Make OsuGame dependency optional for sanity

Dean Herbert · 2025-09-02 21:40:52 +09:00

a1105ba16f

Change bass workaround fix to use game clock intead of another-audio-clock

paper trail:
https://github.com/ppy/osu/pull/34890#issuecomment-3244549790

Dean Herbert · 2025-09-02 21:39:12 +09:00

bee6c32b83

Fix gameplay freezing on stutter frames / long load times

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

May hotfix for this one.

Dean Herbert · 2025-09-02 17:37:33 +09:00

677beb4251

Revert "Adjust bass invalid data threshold"

This reverts commit ddce11fbc8.

Dean Herbert · 2025-09-02 17:36:08 +09:00

a8ef57ad0a

Merge pull request #34830 from minetoblend/fix/hitobject-lifetime-delay

Fix hitobject drawables becoming visible 1 frame too late

Dan Balasescu · 2025-08-29 18:38:24 +09:00

d5575b4037

Fix obviously incorrect conditional

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

Dean Herbert · 2025-08-29 16:01:49 +09:00

9e77a5b050

Fix some mods showing tooltips when settings are default

Dean Herbert · 2025-08-29 14:08:18 +09:00

e83f3d5e77

Return early to avoid creating mod description strings unnecessarily

Dean Herbert · 2025-08-29 14:08:06 +09:00

f2f5cf19a2

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

Fix HealthProcessor potentially incorrectly reverting failed state

This stems from me looking into `TestSceneFailAnimation` failures
(https://github.com/ppy/osu/runs/48663953318). As it turns out, I should
not have been mad by CI, and rather should have been mad at myself for
failing to read.

`FailedAtJudgement` in fact does not mean "this judgement, and only this
judgement, triggered failure". If any further judgements occur
post-fail, they will also have `FailedAtJudgement` set to true. It is
essentially a *dump* of the state of `HealthProcessor.Failed` prior to
applying the judgement.

	https://github.com/ppy/osu/blob/ec21685c2531af3b243f7f0833ffbb340bf3c044/osu.Game/Rulesets/Scoring/HealthProcessor.cs#L49-L57

Because of this, reverting several judgements which occur post-fail
could lead to failed state reverting earlier than intended, and thus
potentially trigger a second fail, thus tripping the `Player` assertion.

Bartłomiej Dach · 2025-08-27 12:27:11 +02:00

197c318180

Merge pull request #34761 from frenzibyte/fix-flashlight

Fix flashlight not always matching gameplay scaling

Bartłomiej Dach · 2025-08-25 12:03:58 +02:00

6e8246b539

Fix xmldoc error and reword

Salman Alshamrani · 2025-08-24 18:55:45 +03:00

3cca458c21

Fix flashlight not handling internal playfield sizing changes

Note that this does not handle sizing/scaling changes applied directly
to `Playfield`, but it handles any changes within the layers inside
`PlayfieldAdjustmentContainer`.

Salman Alshamrani · 2025-08-24 17:51:05 +03:00

bc59270f3e

5726 Commits