76407 Commits

This Branch

This Branch

All Branches

• Fix logs failing to export after multiple failure attempts on file locks (#36469)

  Even if one file fails, we usually don't care and still want the archive
  to finish exporting.
  
  Closes https://github.com/ppy/osu/issues/36446
  
  ---------
  
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Dean Herbert · 2026-01-26 10:10:04 +01:00
  acdb4477f7
• Merge pull request #36471 from peppy/fix-previous-username-depth

  Fix previous usernames display showing underneath other elements

  Dean Herbert · 2026-01-26 10:09:39 +01:00
  4ff29339ed
• 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
• Move Traceable to difficulty increasing mods section (#35500)

  TC is a mod that always increases difficulty and is quite similar to HD.
  Given we even have diffcalc/pp considerations for it it's time to move
  it to the category it belongs.
  
  This doesn't cover any other mods that might need reshuffling too
  because TC is the only one that has actual impact on difficulty-based
  leaderboards (as in pp) and some people are actively playing it for the
  difficulty increase and not just as a fun gimmick.
  
  After a quick search turns out it was difficulty increasing from the
  start but was moved to fun in review
  https://github.com/ppy/osu/pull/3569#discussion_r300085523 but I don't
  really agree with that.
  
  Also as far as I know multimods don't do anything anymore?.. I've put it
  into HD multimod for consistency, but can move it to be separate if you
  want
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  StanR · 2026-01-25 20:30:01 +09:00
  df1dc46603
• Fix score tooltips being displayed when hovering freemods status bar on PlaylistsSSV2 (#36413)

  - similar to https://github.com/ppy/osu/pull/36332

  Denis Titovets · 2026-01-24 00:10:04 +09:00
  2026.124.0-tachyon 84ec4bb866
• Merge pull request #36438 from bdach/bypass-test-fails-slider-bar

  Work around flaky `TestSceneFirstRunSetupOverlay` tests

  Dean Herbert · 2026-01-24 00:01:56 +09:00
  9f0f9ef229
• Merge pull request #36439 from bdach/late-firing-realm-subs

  Locally schedule beatmap skin change callbacks to ensure they fire at valid times

  Dean Herbert · 2026-01-23 23:58:13 +09:00
  290b141d8f
• Merge pull request #36436 from peppy/legacy-health-wrong-flash-texture

  Fix legacy health display using incorrect bulge texture when at low HP

  Bartłomiej Dach · 2026-01-23 14:01:58 +01:00
  7cc025d8f4
• Locally schedule beatmap skin change callbacks to ensure they fire at valid times

  See CI failures like
  https://github.com/ppy/osu/actions/runs/21238110652/job/61110112412?pr=36404#step:5:21.
  
  Hopefully works this time.

  Bartłomiej Dach · 2026-01-23 13:41:44 +01:00
  978fc91b09
• Add some more extra test coverage
  Bartłomiej Dach · 2026-01-23 13:18:48 +01:00
  259c5708f1
• Work around flaky TestSceneFirstRunSetupOverlay tests

  See inline commentary. I don't really have any energy left to provide
  anything else, other than maybe a demonstration of how this dies in
  framework:
  
  diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStackUnbindOnExit.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStackUnbindOnExit.cs
  new file mode 100644
  index 000000000..c74ce6636
  --- /dev/null
  +++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStackUnbindOnExit.cs
  @@ -0,0 +1,59 @@
  +// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
  +// See the LICENCE file in the repository root for full licence text.
  +
  +using NUnit.Framework;
  +using osu.Framework.Allocation;
  +using osu.Framework.Graphics.UserInterface;
  +using osu.Framework.Screens;
  +
  +namespace osu.Framework.Tests.Visual.UserInterface
  +{
  +    public partial class TestSceneScreenStackUnbindOnExit : FrameworkTestScene
  +    {
  +        [Cached]
  +        private ScreenStack screenStack = new ScreenStack();
  +
  +        [Test]
  +        public void TestScreenExitUnbindDoesNotInterruptLoadComplete()
  +        {
  +            AddStep("set up the scenario", () =>
  +            {
  +                Child = screenStack;
  +                screenStack.Push(new Screen());
  +                screenStack.Push(new BrokenScreen());
  +            });
  +            AddUntilStep("wait to get to target screen", () => screenStack.CurrentScreen, Is.InstanceOf<Screen>);
  +        }
  +
  +        private partial class BrokenSlider : BasicSliderBar<float>
  +        {
  +            [Resolved]
  +            private ScreenStack screenStack { get; set; } = null!;
  +
  +            protected override void LoadComplete()
  +            {
  +                // exiting the current screen provokes the behaviour of unbinding all bindables in the screen's subtree
  +                screenStack.CurrentScreen.Exit();
  +
  +                // ...but the following calls should still take correct effect inside `SliderBar`
  +                // (namely one consisting of propagating `{Min,Max}Value` into `currentNumberInstantaneous`)
  +                // so that it doesn't have its internal invariants violated
  +                CurrentNumber.MinValue = -10;
  +                CurrentNumber.MaxValue = 10;
  +
  +                // this notably calls `Scheduler.AddOnce(updateValue)` inside, which will happen *in the imminent future, in the same frame as `LoadComplete()` here.
  +                // if the above mutations of `{Min,Max}Value` don't correctly propagate inside the slider bar due to an overly eager unbind, this will cause a crash.
  +                base.LoadComplete();
  +            }
  +        }
  +
  +        private partial class BrokenScreen : Screen
  +        {
  +            [BackgroundDependencyLoader]
  +            private void load()
  +            {
  +                InternalChild = new BrokenSlider();
  +            }
  +        }
  +    }
  +}
  
  I attempted to address what I perceive to be the root issue here which
  is that `ScreenStack` is allowed to arbitrarily unbind bindables under
  drawables which are by all means still in the scene graph. The attempt
  consisted of scheduling the unbind until after children of the screen
  stack, but that caused 150 game-side tests to fail, seemingly on
  something relevant to bindable leases, so I give up.

  Bartłomiej Dach · 2026-01-23 13:07:42 +01:00
  b7559f93f2
• Update resources
  Dean Herbert · 2026-01-23 17:44:17 +09:00
  c2604e22c7
• Merge pull request #36435 from bdach/sigh

  Fix broken percentage formatting in form slider bars

  Dean Herbert · 2026-01-23 17:17:20 +09:00
  dddd75b7f9
• Fix legacy health display using incorrect bulge texture when at low HP

  Closes #36432.

  Dean Herbert · 2026-01-23 17:10:35 +09:00
  d3c9548b52
• Fix broken percentage formatting in form slider bars

  closes https://github.com/ppy/osu/issues/36428
  
  this one's my bad:
  https://github.com/ppy/osu/pull/36195#discussion_r2698388405

  Bartłomiej Dach · 2026-01-23 08:01:41 +01:00
  225f4d8814
• Add failing tests
  Bartłomiej Dach · 2026-01-23 07:50:20 +01:00
  d80934c344
• Merge pull request #36392 from iwa/feat/numeric-hotkeys-for-presets-mod-select

  Mod Select: Support numeric row hotkeys to quick select Presets

  Dean Herbert · 2026-01-23 03:28:52 +09:00
  2026.123.0-tachyon 6f038bff48
• Add test coverage
  Dean Herbert · 2026-01-23 01:13:49 +09:00
  98c6f6afcd
• Merge pull request #36426 from peppy/disable-sentry-envvar

  Add envvar to disable error reporting

  Bartłomiej Dach · 2026-01-22 13:07:19 +01:00
  ff28839a09
• Fix wrong type in enabled check
  Bartłomiej Dach · 2026-01-22 12:57:47 +01:00
  52d5c986ef
• Merge pull request #36193 from frenzibyte/new-settings/overlay

  Update settings to use new "form" style controls

  Dean Herbert · 2026-01-22 20:27:16 +09:00
  dd9e70b29c
• Add visual hinting of keyboard shortcuts
  Dean Herbert · 2026-01-22 20:24:10 +09:00
  04e378c09f
• Fix some intermittent test failures
  Dean Herbert · 2026-01-22 19:25:25 +09:00
  d4cf46e3cd
• Merge branch 'master' into new-settings/overlay
  Dean Herbert · 2026-01-22 18:38:17 +09:00
  42302c45ec
• Add localisation support for PlaylistsSongSelectV2 (#36410)

  | master | pr |
  |-|-|
  | <img width="691" height="84" alt="osu_2026-01-20_18-16-38 — копия"
  src="https://github.com/user-attachments/assets/24e24131-525b-4603-b6f7-dbdd6e8be188"
  /> | <img width="694" height="76" alt="osu_2026-01-20_18-12-45 — копия"
  src="https://github.com/user-attachments/assets/d880b9c8-8a69-494e-863f-170f904a71b2"
  /> |
  | <img width="581" height="191" alt="osu_2026-01-20_18-16-38"
  src="https://github.com/user-attachments/assets/01256367-3275-40c3-9da2-0073e4e33a1d"
  /> | <img width="570" height="184" alt="osu_2026-01-20_18-12-45"
  src="https://github.com/user-attachments/assets/a9b2ce0a-b571-4f94-bf0e-7869bd32e6ae"
  /> |

  Denis Titovets · 2026-01-22 18:18:02 +09:00
  e2dd4d86b4
• Add envvar to disble error reporting

  https://github.com/ppy/osu/discussions/31832#discussioncomment-15555080

  Dean Herbert · 2026-01-22 18:12:27 +09:00
  6693307064
• Fix beatmap samples with incorrect 1 sample set suffix in the filename being shown in setup tab as belonging to custom sample bank 1 (#36425)

  To explain on the wordy and probably incoherent title: The patient zero
  for this was the following discord report:
  https://discord.com/channels/188630481301012481/1097318920991559880/1463029073998774375
  
  After information extraction, it turned out that the user manually used
  the "Edit externally..." feature to rename a sample to
  `normal-hitnormal1.mp3`, thinking (logically, to be fair), that the 1
  bank works the same way that all the others do.
  
  It doesn't, samples in the 1 bank do not have a numerical suffix in the
  filename - but the logic retrieving the sample sets to display in the
  setup tab was not checking that, leading to confusion wherein a sample
  would only "work" in the setup tab but not in the actual editor
  composer.
  
  Can be tested with [the beatmap provided by the
  user](https://discord.com/channels/188630481301012481/1097318920991559880/1463110516573470774).

  Bartłomiej Dach · 2026-01-22 18:05:29 +09:00
  f0e7817dda
• Merge pull request #36423 from peppy/standardise-ruleset-failure-logging

  Standardise ruleset error logging to always include exception in logs

  Bartłomiej Dach · 2026-01-22 08:59:18 +01:00
  a1d325370c
• Fix weird typo brain turned off
  Dean Herbert · 2026-01-22 16:43:46 +09:00
  1e8ffdf128
• Merge pull request #36404 from peppy/fix-carousel-thing

  Fix random selection not showing selection when all groups are collapsed

  Bartłomiej Dach · 2026-01-22 08:24:03 +01:00
  ea0b281f48
• 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
• Simplify logic further and fix regressing case
  Dean Herbert · 2026-01-22 14:59:42 +09:00
  6354286452
• Add failing test case showing visual state desync
  Dean Herbert · 2026-01-22 14:59:41 +09:00
  6f146a5ce9
• Merge branch 'master' into fix-carousel-thing
  Dean Herbert · 2026-01-22 01:55:28 +09:00
  5d651628bc
• Fix carousel items becoming incorrectly selected due to bindable leakage (#36414)

  As discussed in discord. Fixed from multiple angles.
  
  ---------
  
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Dean Herbert · 2026-01-22 01:06:40 +09:00
  10dc1314f6
• refactor: move presets hotkey logic inside ModPresetColumn class
  iwa · 2026-01-20 22:22:10 +01:00
  ce2d54f118
• revert: changes made for preset hotkeys in SequentialModHotkeyHandler
  iwa · 2026-01-20 22:21:21 +01:00
  042f716b2a
• revert: remove IPresetHotkeyHandler
  iwa · 2026-01-20 22:20:54 +01:00
  0ea060c612
• Refactor HandleFilterCompleted to (hopefully) be easier to parse

  This is not required to fix the issue, but it is required for my brain
  to follow the method to some degress.

  Dean Herbert · 2026-01-20 21:12:49 +09:00
  46b2d5374e
• Handle expand set logic locally rather than calling HandleItemSelected

  This avoids the implicit group expansion happening that the added code
  was attempting to fix.

  Dean Herbert · 2026-01-20 21:12:49 +09:00
  8860eec9f9
• Revert "Do not forcibly re-expand carousel groups on refilters if the user manually collapsed them"

  This reverts commit bc4d5d07d7.

  Dean Herbert · 2026-01-20 21:12:49 +09:00
  8c86ff36a2
• Revert "Fix current beatmap set being incorrectly expanded after collapsing group with current selection"

  This reverts commit 9ba9966078.

  Dean Herbert · 2026-01-20 21:12:48 +09:00
  fdf9092f41
• Add failing test showing incorrect behaviour on random select with collapsed groups
  Dean Herbert · 2026-01-20 21:12:48 +09:00
  76f05a4837
• Merge pull request #36401 from peppy/fix-skin-save-crash

  Fix skin saving crashing if hashable files are not present

  Bartłomiej Dach · 2026-01-20 11:04:23 +01:00
  ae1402c9cd
• Fix skin saving crashing if hashable files are not present

  This ends up with a bit of an undefined behaviour, but it's already a
  bit of an edge case (files missing in the `files` folder that are
  references in the database).
  
  First and foremost, let's stop the exception. If we allow it to throw,
  it's impossible to exit the skin editor in this state.
  
  Closes https://github.com/ppy/osu/issues/36135.

  Dean Herbert · 2026-01-20 17:41:10 +09:00
  741620d89c
• Fix changing combo colours in beatmap without custom samples opening new sample set popover (#36400)

  Reported [on reddit of all
  places](https://www.reddit.com/r/osugame/comments/1qhnfdn/every_time_i_make_an_adjustment_to_the_hitcircle/).
  
  The reason that this is happening is as follows:
  
  - Changing a combo colour raises `BeatmapSkinChanged`
  - `BeatmapSkinChanged` getting raised triggers the sample chooser
  dropdown to repopulate its items (as intended and correctly)
  - Setting items of a dropdown can also change its `Current.Value`,
  because the relevant logic attempts to ensure that `Current.Value` is
  valid in line with the new items
  - Therefore the `Current.Value` of the dropdown changes from `null` to
  sample set `-1` which corresponds to the "Add new..." item as it's the
  only item in the dropdown...
  - which is indistinguishable from the sequence of events that happens if
  the user manually opens the dropdown and clicks the "Add new..." item.
  
  This change sidesteps this entire car crash by just ensuring that even
  beatmaps without custom samples have at least set number 1 initialised
  (even if it's empty and has no samples). This means that the initial
  value of the dropdown is never `null`, and that every time that the
  value changes to the set `-1` it actually is due to user action.
  
  Should have known better than to play these dumb games.

  Bartłomiej Dach · 2026-01-20 17:10:40 +09:00
  4ee4aac708
• 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: align OnKeyDown condition with existing from ModColumn
  iwa · 2026-01-19 22:07:32 +01:00
  2a0bafde8c
• feat: add logic to handle numeric hotkeys to select presets from mod select overlay
  iwa · 2026-01-19 17:15:15 +01:00
  91ee5eebc9
• feat: expose a public Toggle method for ModPresetPanel
  iwa · 2026-01-19 17:14:34 +01:00
  6bf95068ae