14879 Commits

Author	SHA1	Message	Date
Bartłomiej Dach	5551bae7ce	Merge branch 'master' into navigate-to-timestamp	2024-06-18 18:32:33 +02:00
Bartłomiej Dach	f88f05717a	Fix bottom timeline break visualisations not updating	2024-06-18 15:54:34 +02:00
Bartłomiej Dach	814f1e552f	Implement ability to manually adjust breaks	2024-06-18 15:51:29 +02:00
Bartłomiej Dach	a9e662a2b6	Add break display to editor timeline	2024-06-18 14:55:59 +02:00
Bartłomiej Dach	e1827ac28d	Address review feedback	2024-06-18 13:07:18 +02:00
Bartłomiej Dach	1b4a3b0e2e	Change editor speed adjustment back to adjusting tempo ... - Partially reverts https://github.com/ppy/osu/pull/12080 - Addresses https://github.com/ppy/osu/discussions/27830, https://github.com/ppy/osu/discussions/23789, https://github.com/ppy/osu/discussions/15368, et al. The important distinction here is that to prevent misuse when timing, the control will revert to 1.0x speed and disable when moving to timing screen, with a tooltip explaining why.	2024-06-18 09:46:00 +02:00
Bartłomiej Dach	310265c43f	Add slider placement binding description in tooltip	2024-06-18 08:16:25 +02:00
Bartłomiej Dach	659505f711	Adjust calls to GetContainingInputManager()	2024-06-18 07:41:19 +02:00
Bartłomiej Dach	8a4ae5d23d	Null-propagate all calls to GetContainingFocusManager()	2024-06-18 07:30:46 +02:00
Dean Herbert	316125d47a	Merge pull request #23443 from OliBomby/edit-nodesample ... Make NodeSamples editable	2024-06-18 11:12:02 +09:00
Bartłomiej Dach	5652a558f9	Allow to jump to a specific timestamp via bottom bar in editor ... Apparently this is a stable feature and is helpful for modding.	2024-06-17 17:07:55 +02:00
Dean Herbert	b535f7c519	Merge pull request #28507 from bdach/editor-opacity ... Reduce editor opacity of several editor components when hovering over composer	2024-06-17 22:16:08 +09:00
Dean Herbert	a6f09bc626	Merge pull request #28468 from bdach/daily-challenge/event-feed ... Implement event feed view for daily challenge screen	2024-06-17 20:16:48 +09:00
Dean Herbert	d3d325c46c	Record on single line	2024-06-17 19:16:23 +08:00
Bartłomiej Dach	7cfe8d8df2	Reduce editor opacity of several editor components when hovering over composer ... Addresses https://github.com/ppy/osu/discussions/24384.	2024-06-17 12:14:28 +02:00
Bartłomiej Dach	07f1994a13	Align beat snap control width with right toolbox	2024-06-17 11:47:37 +02:00
Bartłomiej Dach	3884bce239	Remove unused delegate for now ... To silence inspections.	2024-06-17 11:09:07 +02:00
Bartłomiej Dach	f7910f774d	Remove redundant type spec	2024-06-17 10:54:52 +02:00
Bartłomiej Dach	03049d45bb	Remove stuff that looks bad after moving timeline toggle controls	2024-06-17 10:23:00 +02:00
Bartłomiej Dach	b42752c9f0	Move timeline toggle controls to "view" menu	2024-06-17 10:16:40 +02:00
Dean Herbert	15fbad0097	Merge pull request #28480 from bdach/storyboard-pass-fail-show ... Implement toggling visibility of pass and fail storyboard layers	2024-06-16 11:08:00 +09:00
Dean Herbert	ff2d721029	Inline enabled setting	2024-06-15 17:34:04 +08:00
Shiumano	6c82f1de9b	Set to enable or disable at load time	2024-06-14 21:43:17 +09:00
Bartłomiej Dach	67ca7e4135	Implement toggling visibility of pass and fail storyboard layers ... Closes https://github.com/ppy/osu/issues/6842. This is a rather barebones implementation, just to get this in place somehow at least. The logic is simple - 50% health or above shows pass layer, anything below shows fail layer. This does not match stable logic all across the board because I have no idea how to package that. Stable defines "passing" in like fifty ways: - in mania it's >80% HP (bb57924c15/osu!/GameModes/Play/Rulesets/Mania/RulesetMania.cs#L333-L336) - in taiko it's >80% *accuracy* (bb57924c15/osu!/GameModes/Play/Rulesets/Taiko/RulesetTaiko.cs#L486-L492) - there's also the part where "geki additions" will unconditionally set passing state (bb57924c15/osu!/GameModes/Play/Player.cs#L3561-L3564) - and also the part where at the end of the map, the final passing state is determined by checking whether the user passed more sections than failed (bb57924c15/osu!/GameModes/Play/Player.cs#L3320) The biggest issues of these are probably the first two, and they can *probably* be fixed, but would require a new member on `Ruleset` and I'm not sure how to make one look, so I'm not doing that at this time pending collection of ideas on how to do that.	2024-06-14 13:59:02 +02:00
Bartłomiej Dach	bdeea37a44	Commit active placement when starting drag selection via timeline ... This was reported in https://github.com/ppy/osu/pull/28474, albeit the code changes proposed there did not fix the issue at all. See 8b6385f7d0 for demonstration of the crash scenario. Basically what is happening there is: - The starting premise is that there is a spinner placement active. - At this time, a drag selection is started via the timeline. - Once the drag selection finds at least one suitable object to select, it mutates `SelectedItems`. - When selection changes for any reason, the `HitObjectComposer` decides to switch to the "select" tool, regardless of why the selection changed. - Changing the active tool causes the current placement - if any - to be committed, which mutates the beatmap. - Back at the drag box selection code, this causes a "collection modified when enumerating" exception. The proposed fix here is to eagerly commit active placement - if any - when drag selection is initiated via the timeline, which avoids this issue. This also appears to vaguely match stable behaviour and is sort of consistent with the logic of committing any outstanding changes upon switching to the selection tool.	2024-06-14 09:32:40 +02:00
Joppe27	47f89b8969	Clamp X value to avoid excessive balance shift	2024-06-13 18:06:19 +02:00
Bartłomiej Dach	8c4aa84037	Implement event feed view for daily challenge screen	2024-06-13 09:05:45 +02:00
Bartłomiej Dach	ae6dd9d053	Use extracted headings on daily challenge screen	2024-06-12 11:44:19 +02:00
Bartłomiej Dach	51c598627a	Move out section header component from editor ... This sort of thing has been showing up on flyte designs more and more so I want to start using it more over that rather ugly "overlined" text that's there on multiplayer screens right now.	2024-06-12 11:43:40 +02:00
Bartłomiej Dach	2be6b29f21	Implement time remaining display for daily challenge screen	2024-06-12 11:43:24 +02:00
Bartłomiej Dach	6fb0cabf36	Add start date to Room	2024-06-12 11:43:18 +02:00
Dean Herbert	94b7148a9e	Merge pull request #28440 from bdach/daily-challenge/new-screen ... Add minimal viable new screen for daily challenge feature	2024-06-12 17:49:02 +09:00
Bartłomiej Dach	5e002fbf9b	Fix user mod select button being inserted in incorrect place	2024-06-12 08:59:50 +02:00
Dean Herbert	90481223dd	Merge pull request #28445 from bdach/mania-key-count-change-force-reload ... Attempt full editor reload on key count change	2024-06-12 14:42:59 +09:00
Dan Balasescu	39b219bacc	Merge pull request #28441 from bdach/fix-editor-stacking-not-applying-immediately ... Fix stack leniency not applying immediately after change	2024-06-12 12:24:28 +09:00
OliBomby	869cd40195	Fixed samples without additions contributing to common addition bank while not having an editable addition bank	2024-06-11 21:31:18 +02:00
OliBomby	12dd60736a	remove code already covered by updatePrimaryBankState	2024-06-11 21:20:42 +02:00
Bartłomiej Dach	922837dd3a	Reload scrolling composer on control point changes	2024-06-11 12:01:35 +02:00
Bartłomiej Dach	da53a11d3c	Attempt full editor reload on key count change	2024-06-11 11:31:49 +02:00
Bartłomiej Dach	3afe98612c	Add RestoreState() to IEditorChangeHandler	2024-06-11 11:31:30 +02:00
Dean Herbert	c640fbbaf0	Merge branch 'master' into daily-challenge/new-screen	2024-06-11 18:24:31 +09:00
ColdVolcano	4048a4bdfb	fix accuracy counter separating whole and fraction parts with wireframes off	2024-06-11 02:20:14 -06:00
Bartłomiej Dach	25b2dfa601	Fix stack leniency not applying immediately after change	2024-06-10 14:34:22 +02:00
Bartłomiej Dach	073ddcebe4	Hide daily challenge from playlists listing	2024-06-10 13:12:21 +02:00
Bartłomiej Dach	e6da17d248	Add minimal viable variant of new daily challenge screen	2024-06-10 13:09:12 +02:00
Bartłomiej Dach	ffd788c65c	Use room mod select overlay rely on explicit binding rather than DI resolution	2024-06-10 12:45:51 +02:00
Bartłomiej Dach	dd6e9308b3	Extract user mod select button for reuse	2024-06-10 12:45:27 +02:00
Bartłomiej Dach	d80f09e0c0	Adjust online play header to be reusable for new daily challenge screen	2024-06-10 12:43:58 +02:00
Bartłomiej Dach	19f39ca1b6	Extract OnlinePlayScreenWaveContainer from OnlinePlayScreen	2024-06-10 12:42:37 +02:00
Bartłomiej Dach	7d5dc750e5	Use slightly lighter shade of pink for alternative colour	2024-06-10 12:04:52 +02:00
Bartłomiej Dach	0efa028e0a	Restructure popover updates to be more centralised	2024-06-10 11:55:51 +02:00
Bartłomiej Dach	acf4dbb62c	Merge branch 'master' into mutually-exclusive-save-related-actions	2024-06-10 10:30:35 +02:00
Bartłomiej Dach	1d6b7e9c9b	Refactor further to address code quality complaints	2024-06-10 10:30:30 +02:00
Salman Ahmed	6201220994	Merge branch 'master' into footer-v2-become-global	2024-06-08 14:13:05 +03:00
Dean Herbert	daf85c320a	Merge pull request #22237 from mk56-spn/LeaderBoardScore_clean ... New leaderboard score card design implementation	2024-06-08 20:06:17 +09:00
Dean Herbert	7fc6ad5340	Merge pull request #28184 from frenzibyte/footer-v2-transitions ... Add basic animation to new footer and buttons	2024-06-08 19:43:23 +09:00
Salman Ahmed	5f8f6caedd	Use OsuGame.SHEAR	2024-06-07 22:45:22 +03:00
Salman Ahmed	6f729be573	Merge branch 'master' into LeaderBoardScore_clean	2024-06-07 22:42:49 +03:00
Salman Ahmed	f59d94bba4	Move transitions inside ScreenFooterButton and re-use Content from base implementation instead ... The point is to apply the transitions against a container that's inside of `ScreenFooterButton`, because the `ScreenFooterButton` drawable's position is being controlled by the flow container it's contained within, and we cannot apply the transitions on it directly.	2024-06-07 22:07:39 +03:00
Bartłomiej Dach	4cd1ccc4d4	Merge branch 'master' into add-rank-display	2024-06-07 09:33:03 +02:00
Bartłomiej Dach	e13e9abda9	Disallow running save-related operations concurrently ... Closes https://github.com/ppy/osu/issues/25426. Different approach to prior ones, this just disables the relevant actions when something related to save/export is going on. Still ends up being convoluted because many things you wouldn't expect to touch save do touch save, so it's not just a concern between export and save specifically.	2024-06-07 08:13:51 +02:00
Dean Herbert	dd3f4bcdab	Fix code quality and null handling	2024-06-07 00:01:50 +08:00
Xesquim	860afb8123	Creating method in ModUtils to calculate the rate for the song	2024-06-06 10:06:07 -03:00
OliBomby	e873698221	Add some in-depth xmldoc to GetSamples	2024-06-06 14:57:25 +02:00
OliBomby	fcc8671cbd	undo useless change	2024-06-06 14:50:24 +02:00
OliBomby	71ce400359	Fix wasteful recreating of container	2024-06-06 14:48:17 +02:00
Bartłomiej Dach	7a8a37dae6	Use established constants	2024-06-06 13:42:31 +02:00
Bartłomiej Dach	86b13074a0	Merge branch 'master' into edit-nodesample	2024-06-06 13:42:25 +02:00
OliBomby	4f8c167cf9	clean up to match logic in CircularDistanceSnapGrid	2024-06-05 18:56:18 +02:00
OliBomby	d8994786f6	Merge remote-tracking branch 'upstream/master' into grids-2	2024-06-05 17:18:48 +02:00
Dean Herbert	212be6b9a7	Merge branch 'master' into grids-1	2024-06-05 15:20:04 +09:00
Bartłomiej Dach	ecfcf7a2c0	Add xmldoc mention about performance overhead of PerformOnSelection()	2024-06-04 10:36:30 +02:00
Bartłomiej Dach	f13ca28d5e	Fix performance overhead from ternary state bindable callbacks when selection is changing ... Closes https://github.com/ppy/osu/issues/28369. The reporter of the issue was incorrect; it's not the beat snap grid that is causing the problem, it's something far stupider than that. When the current selection changes, `EditorSelectionHandler.UpdateTernaryStates()` is supposed to update the state of ternary bindables to reflect the reality of the current selection. This in turn will fire bindable change callbacks for said ternary toggles, which heavily use `EditorBeatmap.PerformOnSelection()`. The thing about that method is that it will attempt to check whether any changes were actually made to avoid producing empty undo states, *but* to do this, it must *serialise out the entire beatmap to a stream* and then *binary equality check that* to determine whether any changes were actually made: 7b14c77e43/osu.Game/Screens/Edit/EditorChangeHandler.cs (L65-L69) As goes without saying, this is very expensive and unnecessary, which leads to stuff like keeping a selection box active while a taiko beatmap is playing under it dog slow. So to attempt to mitigate that, add precondition checks to every single ternary callback of this sort to avoid this serialisation overhead. And yes, those precondition checks use linq, and that is *still* faster than not having them.	2024-06-04 10:32:12 +02:00
Bartłomiej Dach	4fcb902341	Merge branch 'master' into grids-1	2024-06-03 12:33:51 +02:00
Dean Herbert	96514132c1	Fix occasional test failures on new menu content tests ... Scheduled data transfer could still overwrite test data.	2024-06-03 12:24:56 +09:00
Bartłomiej Dach	69990c35cb	Add commentary on presence of IsPresent override	2024-05-31 08:47:19 +02:00
Dean Herbert	53b7c29488	Add test coverage of menu banner link opening	2024-05-31 03:15:26 +09:00
Bartłomiej Dach	50bd0897f6	Fix main menu button backgrounds not covering their entire width sometimes ... I thought I had fixed this already once but it still looks broken. Basically when hovering over main menu buttons every now and then it will look like their backgrounds are not covering their entire width when they expand. The removed X position set looks wrong to me when inspecting the draw visualiser with the element because the element looks to be off centre horizontally, and removing it fixes that.	2024-05-30 10:38:22 +02:00
Dean Herbert	fdb47f8dfa	Fix incorrect handling of nested objects when inside parent object's duration	2024-05-29 23:30:47 +09:00
Dean Herbert	126837fadd	Apply results rather than fake a replay frame	2024-05-29 23:28:37 +09:00
Dean Herbert	3b5b7b2f88	Fix the majority of cases where gameplay stil doesn't end due to judgement count mismatch	2024-05-29 22:57:17 +09:00
Dean Herbert	d2c86b0813	Avoid passing beatmap in from editor when it's already present	2024-05-29 21:32:55 +09:00
Dean Herbert	16e2fa2c6a	Merge branch 'master' into fix/editor-test-exit	2024-05-29 21:08:36 +09:00
Bartłomiej Dach	7b7e439d03	Merge branch 'master' into scale-tool	2024-05-29 10:15:48 +02:00
Bartłomiej Dach	4c881b5633	Use better name if we're renaming	2024-05-29 09:40:29 +02:00
OliBomby	d143a697d2	refactor CanScaleFromPlayfieldOrigin and GetClampedScale to derived class	2024-05-28 17:12:16 +02:00
OliBomby	8eb23f8a60	remove redundant CanScaleFromSelectionOrigin	2024-05-28 16:19:57 +02:00
OliBomby	a89ba33b47	rename CanScaleSelectionOrigin/PlayfieldOrigin to make clear its not the origin being scaled	2024-05-28 16:14:16 +02:00
Dean Herbert	8c4931eeec	Merge branch 'master' into footer-v2-transitions	2024-05-28 18:49:39 +09:00
Dean Herbert	4408039b3e	Merge branch 'master' into footer-v2-back-button	2024-05-28 15:50:34 +09:00
Bartłomiej Dach	405c72c0d6	Fix mod display not being aligned with mapper text	2024-05-27 13:36:44 +02:00
Dean Herbert	75d961e6f2	Pass the same thing in twice for better maybe	2024-05-27 20:30:01 +09:00
Dean Herbert	d976224912	Standardise padding on both sides of difficulty icon	2024-05-27 19:59:25 +09:00
Bartłomiej Dach	1e2cac3e92	Remove unused using directive	2024-05-27 11:44:55 +02:00
Dean Herbert	740a3377fa	Merge branch 'master' into LeaderBoardScore_clean	2024-05-27 17:18:41 +09:00
Dean Herbert	b6471f0b9c	Allow previewing audio of playlist items	2024-05-27 17:09:37 +09:00
Bartłomiej Dach	bdfce4b9da	Fix xmldoc reference	2024-05-27 08:26:00 +02:00
Dean Herbert	11c3d11db9	Fix cinema mod not hiding playfield skin layer	2024-05-27 14:52:28 +09:00
Joseph Madamba	8e14c24ee3	Follow slanted flow logic precedent in test ... See `ModSelectOverlay` components.	2024-05-26 00:24:03 -07:00
OliBomby	37530eebcc	Enable scale buttons at the correct times	2024-05-25 20:35:06 +02:00
OliBomby	4eeebdf60c	calculate max scale bounds for scale slider	2024-05-25 20:17:27 +02:00
Salman Ahmed	2c18c10ac8	Move to SelectV2 namespace	2024-05-25 17:20:10 +03:00
OliBomby	497701950d	fix nitpick	2024-05-24 18:11:28 +02:00
Dean Herbert	2134ff7a1b	Merge pull request #28071 from Fabiano1337/lazer-speedkeys ... Make ctrl-up/down change speed modifier of mods	2024-05-24 23:20:04 +09:00
Bartłomiej Dach	9f19ab092d	Merge branch 'master' into grids-1	2024-05-24 14:39:55 +02:00
Bartłomiej Dach	c800bb5339	Merge branch 'master' into lazer-speedkeys	2024-05-24 13:19:26 +02:00
Bartłomiej Dach	b1b207960a	Actually use return value	2024-05-24 13:09:44 +02:00
Bartłomiej Dach	63406b6feb	Rewrite implementation	2024-05-24 13:03:42 +02:00
Bartłomiej Dach	7255cc3344	Fix tests dying on a nullref	2024-05-24 11:25:29 +02:00
Bartłomiej Dach	807d982a72	Move workaround to subscreen	2024-05-24 10:35:33 +02:00
Bartłomiej Dach	a80dbba9d0	Update to not use obsoleted method	2024-05-24 10:35:31 +02:00
Bartłomiej Dach	4089071299	Merge branch 'master' into fix-editor-didnt-save	2024-05-24 10:16:46 +02:00
Bartłomiej Dach	8a2dd4d816	Merge branch 'master' into scaling	2024-05-23 15:10:40 +02:00
Bartłomiej Dach	128029e2af	Fix aspect ratio lock applying when shift pressed on a non-corner anchor ... It doesn't make sense and it wasn't doing the right thing.	2024-05-23 15:08:43 +02:00
Bartłomiej Dach	9e86a08405	Simplify scale origin computation	2024-05-23 14:07:43 +02:00
Bartłomiej Dach	070668c96f	Use ShiftPressed instead of explicitly checking both physical keys ... Not only is this simpler, but it also is more correct (for explanation why, try holding both shift keys while dragging, and just releasing one of them - the previous code would briefly turn aspect ratio off).	2024-05-23 13:57:34 +02:00
Bartłomiej Dach	bfa23ec7a4	Fix main menu button animation not playing on initial show	2024-05-23 11:46:48 +02:00
Dean Herbert	357e55ae1f	Make gradient layer a bit more dynamic	2024-05-23 17:39:59 +08:00
Dean Herbert	a3639e0ce3	Remove unused field	2024-05-23 17:19:11 +08:00
Dean Herbert	88a2f74326	Adjust animation	2024-05-23 16:00:23 +08:00
Dean Herbert	f85a1339d9	Unload daily challenge background less aggressively	2024-05-23 14:23:02 +08:00
Dean Herbert	6c37560842	Merge branch 'master' into daily-challenge-mvp	2024-05-23 10:57:05 +08:00
Dean Herbert	66ceda1d67	Update focus specifications in line with framework changes	2024-05-22 21:32:49 +08:00
Fabian van Oeffelt	0df634574f	Improve readability	2024-05-22 13:59:33 +02:00
Dean Herbert	d0b1ebff5a	Revert "Temporary rollback of framework / SDL3" ... This reverts commit d7d569cf4e.	2024-05-22 16:29:39 +08:00
Dean Herbert	1fdebe94ac	Merge branch 'master' into lazer-speedkeys	2024-05-22 12:05:04 +08:00
Dean Herbert	02a388cba6	Fix enum not being at end (and adjust naming)	2024-05-22 12:03:48 +08:00
Dean Herbert	99d99cede0	Basic cleanup ... Before I gave up on attempting to fix the method.	2024-05-22 11:59:34 +08:00
Fabian van Oeffelt	3403789c6f	Toast now only shows when speed is actually changed	2024-05-21 16:11:20 +02:00
Fabian van Oeffelt	148afd1201	Change Speedchange behaviour to keep changing while holding key, Add Toast to nofity user what just happend	2024-05-21 14:47:34 +02:00
Dean Herbert	d7d569cf4e	Temporary rollback of framework / SDL3	2024-05-21 14:36:16 +08:00
Fabian van Oeffelt	3fdbd735ce	change to single Function, ... Nightcore now switches into Daycore, keep Adjustpitch after change	2024-05-18 18:40:51 +02:00
Salman Ahmed	0a391d5c4e	Remove duplicate back button class	2024-05-18 08:39:45 +03:00
Bartłomiej Dach	c9b7aaf442	Fix formatting	2024-05-17 11:50:23 +02:00
Bartłomiej Dach	a4f8ed2a0e	Add button to access daily challenge playlist from main menu	2024-05-17 11:15:52 +02:00
Salman Ahmed	8b285f5b1e	Add dummy SongSelectV2 screen to house new footer buttons (and new components going forward)	2024-05-16 07:48:58 +03:00
Salman Ahmed	2b5818a4d7	Fix DI crash in beatmap options popover	2024-05-16 07:48:58 +03:00
Salman Ahmed	03220598b8	Move screen footer to OsuGame	2024-05-16 07:48:58 +03:00
Salman Ahmed	921be3ca01	Add back receptor, logo tracking, and own colour provider to screen footer	2024-05-16 07:48:58 +03:00
Salman Ahmed	d0e8632fbf	Refactor ScreenFooter to prepare for global usage and add transitions	2024-05-16 07:48:10 +03:00
Salman Ahmed	a2794922d5	Add TopLevelContent layer for applying external transforms on footer buttons	2024-05-16 07:48:10 +03:00
Salman Ahmed	820cfbcb00	Remove unused using directives	2024-05-16 07:47:57 +03:00
Salman Ahmed	310b4d90cc	Move SHEAR constant to OsuGame and revert back to 0.2x (i.e. master) ... Discussed in [discord](https://discord.com/channels/188630481301012481/188630652340404224/1240490608934653984).	2024-05-16 07:28:02 +03:00
Salman Ahmed	9265290acf	Change shear factor everywhere to 0.15x	2024-05-16 05:33:01 +03:00
Salman Ahmed	7fce4cc494	Make ScreenFooterButtonMods share shear factor with base class	2024-05-16 05:30:28 +03:00
Salman Ahmed	9446f45acf	Fix shear factor of ScreenFooterButtons not matching anything else ... When shear factors differ between components that are close to each other (`BackButtonV2` and `ScreenFooterButton` in this case), they look completely ugly.	2024-05-16 05:30:28 +03:00
Salman Ahmed	7e8d5a5b0a	Add new footer back button	2024-05-16 05:30:28 +03:00
Salman Ahmed	21f5d891bb	Rename and move footer classes to appropriate places	2024-05-16 04:41:16 +03:00
OliBomby	c4ac6d20a0	fix code quality	2024-05-15 23:40:51 +02:00
OliBomby	8df5f22b4e	Merge remote-tracking branch 'upstream/master' into scaling	2024-05-15 23:05:19 +02:00