1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 13:07:24 +08:00
Commit Graph

10289 Commits

Author SHA1 Message Date
cdwcgt
4549a865d9
Merge branch 'master' into export 2023-05-04 00:18:01 +09:00
cdwcgt
c609e6345c
remove Use Current Mods menu item 2023-05-03 23:02:50 +09:00
cdwcgt
3a15783a3c
remove wait, use AddUntilStep 2023-05-03 22:59:01 +09:00
cdwcgt
25bf4e68ec
remove useless wait 2023-05-03 22:53:13 +09:00
Cootz
f0d35eb12b Update testing 2023-05-03 13:12:11 +03:00
Dean Herbert
b932e4d986 Rename DrawableUsername to DrawableChatUsername and only pass message ID 2023-05-03 18:53:22 +09:00
Dean Herbert
4f55afb60d Merge branch 'master' into chat-report 2023-05-03 18:50:38 +09:00
Dean Herbert
384693a431 Fix test failure in MultiplayerMatchSongSelect due to multiple overlays present
https://github.com/ppy/osu/actions/runs/4868337922/jobs/8681736995?pr=23308.
2023-05-03 14:30:58 +09:00
Dean Herbert
6b017ac05f
Merge pull request #23308 from OliBomby/sample-control-points
Remove SampleControlPoint and DifficultyControlPoint from HitObject
2023-05-03 14:21:51 +09:00
Dean Herbert
e394b487e0
Merge branch 'master' into edit-mods-preset 2023-05-03 12:06:16 +09:00
Dean Herbert
e42b0cc5b1
Merge pull request #23370 from peppy/fix-editor-playfield-padding
Add more padding around playfield in editor to avoid overlap with tool areas
2023-05-03 11:44:55 +09:00
Bartłomiej Dach
95badb9455
Adjust composer tests to new screen layout
`TestSceneHitObjectComposer.TestPlacementFailsWhenClickingButton()` was
attempting to cover the case of the user clicking a toolbox button which
was in front of the playfield, and ensure that the click did not result
in a placement. However, since the paddings in
67f83f246b were added, it is impossible
for a toolbox button to be in front of the playfield in the collapsed
state, which the test was relying on.

The test scenario is still however relevant in the case of the toolbox
being expanded, as in that state the toolbux buttons may very well end
up being in front of the playfield, and they still should not result in
a hitobject being placed. To ensure that this is the case, add a few
extra test steps ensuring that the toolbox is expanded first before
trying to retrieve an overlapping button.
2023-05-02 18:45:45 +02:00
Cootz
a6ca049739 Manually implement @bdach prototype 2023-05-02 14:15:33 +03:00
Dean Herbert
94ae9d7664
Merge pull request #23357 from OliBomby/fix-reverse-crash
Prevent infinite repeat count when adjusting repeats of 0 length slider
2023-05-02 19:53:26 +09:00
Andrei Zavatski
ba5088f71a Add missing ruleset shader tests 2023-05-02 11:55:05 +03:00
Andrei Zavatski
8160d56264 Update test shaders 2023-05-02 11:51:05 +03:00
Dean Herbert
1e4a628cb1
Merge pull request #23284 from Hy0tic/multiplier-doesnt-update-with-preset-mod
Fix issue where multiplier show wrong value when adjusting speed on preset
2023-05-02 14:59:41 +09:00
Dean Herbert
e3c384c6b5 Merge branch 'master' into sample-control-points 2023-05-02 14:38:39 +09:00
Dean Herbert
983a8f7dfe
Merge branch 'master' into fix-reverse-crash 2023-05-02 13:14:34 +09:00
Dean Herbert
87db891143 Adjust test to reliabily fail 2023-05-02 13:12:11 +09:00
Bartłomiej Dach
1fb4c814f4
Remove no longer needed API call mocking
The online ID will be reset unconditionally after any local change is
made to any beatmap. That behaviour no longer depends on online lookups
succeeding or failing.

This may change at a later date when beatmap submission is integrated
into lazer - the idea is that online IDs would get re-populated on local
beatmaps once they are submitted to web.
2023-05-01 19:08:41 +02:00
Bartłomiej Dach
8ab3a87b13
Add failing test case covering online ID reset on save
This test scene passes at e58e1151f3 and
fails at current master, due to an inadvertent regression caused by
e72f103c17.

As it turns out, the online lookup flow that was causing UI thread
freezes when saving beatmaps in the editor, was also responsible for
resetting the online ID of locally-modified beatmaps if online lookup
failed.
2023-05-01 18:17:35 +02:00
OliBomby
dbb2a8980b add test 2023-05-01 15:56:23 +02:00
Terochi
4d52ce769b Revert SaveState() calling on initialization 2023-05-01 12:53:58 +02:00
OliBomby
608fa3cc73 Merge remote-tracking branch 'upstream/master' into sample-control-points 2023-04-30 19:47:03 +02:00
Bartłomiej Dach
7cedbca9be
Merge branch 'master' into multiplier-doesnt-update-with-preset-mod 2023-04-30 17:36:00 +02:00
Bartłomiej Dach
d35355970f
Add test case covering failure scenario 2023-04-30 17:23:45 +02:00
Terochi
8f02bd80f9 Addressed changes 2023-04-30 16:11:52 +02:00
Terochi
949dc1c0f9 Improved logic 2023-04-30 12:05:55 +02:00
Terochi
585318400c Refactor tests 2023-04-30 02:32:20 +02:00
Terochi
9a9e02b110 Added tests 2023-04-30 02:00:35 +02:00
OliBomby
a6e780a1b9 Update CheckMutedObjectsTest.cs 2023-04-29 23:52:30 +02:00
Dean Herbert
2643100644 Add xmldoc to new test mentioning failure rate and general purpose 2023-04-29 11:05:10 +09:00
Dean Herbert
32f8c674f4 Extract beatmap retrieval method for more legibility 2023-04-29 11:01:29 +09:00
Dean Herbert
a6f0186112 Improve legibility and code quality of new test 2023-04-29 10:51:56 +09:00
Dean Herbert
428b5fad3c Rename test scene to explicitly mention navigation testing 2023-04-29 10:51:56 +09:00
Cootz
d9b3c97179 Fix testing 2023-04-29 10:29:33 +09:00
Cootz
c5357d30ab Add test 2023-04-29 10:29:33 +09:00
Bartłomiej Dach
07efa7d660
Merge branch 'master' into fix-storyboard-loop-end-time 2023-04-26 21:53:26 +02:00
OliBomby
354cd23874 removed all usage of hitobject's DifficultyControlPoint 2023-04-26 18:17:02 +02:00
OliBomby
c44f71a737 remove all regular usage of DifficultyControlPoint 2023-04-26 17:55:38 +02:00
OliBomby
9f8d7bccba fix usings 2023-04-26 17:34:02 +02:00
OliBomby
c6fc180659 remove all test usages of SampleControlPoint 2023-04-26 14:21:52 +02:00
Dean Herbert
27f81288ef
Merge branch 'master' into keep-shared-settings-ruleset-change 2023-04-26 15:51:31 +09:00
Dean Herbert
6a3b587374
Merge pull request #23260 from Haspamelodica/master
Fix some videos with uppercase file extensions not displaying correctly in-game
2023-04-26 14:29:25 +09:00
Terochi
0841e73a39 Improved readability and sounds 2023-04-25 21:07:17 +02:00
Bartłomiej Dach
196b5b41eb
Also disable counting on argon display in test
Mostly for my own peace of mind.
2023-04-25 20:17:57 +02:00
Bartłomiej Dach
753fa09356
Fix test failures due to type mismatch 2023-04-25 20:10:11 +02:00
Daniel Kirschten
54e8aa8fe9
Merge branch 'master' into master 2023-04-25 16:04:02 +02:00
Dean Herbert
0c3a015953 Fix key counter test not testing the full binding of IsCounting 2023-04-25 21:37:19 +09:00
Dean Herbert
d8b4db3a13
Merge branch 'master' into gameplay/argon-key-counter_le-retour 2023-04-25 19:54:31 +09:00
Dean Herbert
e330052852 Add second definition of EndTime for storyboard elements to account for loops in lifetime 2023-04-25 15:22:11 +09:00
Dean Herbert
dce0c5fac8 Add test coverage of expected behaviour for playback of loops with no explicit end time 2023-04-25 15:14:32 +09:00
Haspamelodica
3166f88c17 Removed unneccessary using directive 2023-04-21 10:11:47 +02:00
Haspamelodica
e9fb836e9c Added tests for video backgrounds 2023-04-21 03:24:11 +02:00
Dean Herbert
01260e5f54 Merge branch 'master' into shader-cache-stages 2023-04-19 20:47:34 +09:00
Dean Herbert
26a2d1fdea
Merge pull request #23000 from Joehuu/fix-beatmap-terminology
Fix song select matching label not using right terminology
2023-04-18 13:53:05 +09:00
Joseph Madamba
c80a25328d
Shorten label to just "matches" 2023-04-17 20:59:41 -07:00
Dan Balasescu
c0a25144cf Apply changes to custom ShaderManager 2023-04-18 11:31:56 +09:00
Bartłomiej Dach
0cc92ce5f9
Add failing test case
Covering nested object reverts not firing the parent's `RevertResult`
event in accordance with what the xmldoc of the event states.
2023-04-11 18:24:34 +02:00
Joseph Madamba
d0cbe206a9
Revert back to one number with "matching beatmap difficulties" label 2023-04-10 23:37:29 -07:00
Dean Herbert
52bb7891f7
Merge branch 'master' into fix-count-not-updating-when-deleting 2023-04-11 09:04:02 +09:00
Bartłomiej Dach
1f2c96c8e8
Merge branch 'master' into gd-onlinesetoverlay 2023-04-10 15:35:03 +02:00
Bartłomiej Dach
6e08105e2c
Remove usage of "diff" vernacular 2023-04-10 15:27:10 +02:00
Joseph Madamba
bfb7ead689
Add failing text box beatmap difficulty count test 2023-04-09 22:12:50 -07:00
cdwcgt
dd69089117
code quality 2023-04-09 15:51:31 +09:00
cdwcgt
def6da98fc
fix test in #22653 2023-04-09 15:43:05 +09:00
cdwcgt
52fc6de13f
merge fix
wtf?
2023-04-09 15:12:15 +09:00
cdwcgt
ce6a87b4a3
Merge remote-tracking branch 'upstream/master' into export 2023-04-09 15:02:47 +09:00
cdwcgt
de21b4a2f7
use Live<TModel>
Use RealmAccess only when needed
2023-04-09 22:21:15 +09:00
Joseph Madamba
ed208ef127
Fix more typos and adjust font size to match web 2023-04-07 21:10:37 -07:00
Dean Herbert
0c71fa1bbd
Merge branch 'master' into gameplay/argon-key-counter_le-retour 2023-04-06 23:39:57 +09:00
Dean Herbert
e6872629f3
Merge pull request #22868 from peppy/no-epilepsy-warning-storyboard-disable
Don't show epilepsy warning when storyboards are disabled
2023-04-06 12:32:38 +09:00
tsrk
809b817e8e
Merge branch 'master' into gameplay/argon-key-counter_le-retour 2023-04-05 22:57:36 +02:00
Bartłomiej Dach
ba753a8aac
Merge branch 'master' into update-skinnable-sound-before-playing 2023-04-05 22:56:25 +02:00
Bartłomiej Dach
27055919a3
Merge branch 'master' into fix-old-beatmap-crash-on-load 2023-04-05 21:39:42 +02:00
Bartłomiej Dach
6df7614b9d
Add tests for suppressing epilepsy warning when storyboard disabled 2023-04-05 20:56:50 +02:00
Bartłomiej Dach
02c6126be7
Ensure storyboards are enabled in existing epilepsy warning tests 2023-04-05 20:53:54 +02:00
Bartłomiej Dach
432f698697
Merge branch 'master' into gameplay/key-counter-abstraction 2023-04-05 19:45:14 +02:00
Bartłomiej Dach
8cc425774b
Merge branch 'master' into fix-replay-fail-on-exit 2023-04-03 21:23:23 +02:00
Bartłomiej Dach
b5d9284de2
Merge pull request #23108 from peppy/fix-overlay-toggles-during-disclaimer
Fix attempting to show overlay during game intro playing hide sound effects
2023-04-03 20:48:03 +02:00
cdwcgt
9e0277b2fd
useless using 2023-04-04 00:19:14 +09:00
cdwcgt
735b48679e
use LinkFlowContainer directly 2023-04-03 20:09:49 +09:00
Dean Herbert
6239789188 Fix missing using statements in multiple test scenes 2023-04-03 15:37:10 +09:00
Dean Herbert
b0c09df259 Merge branch 'master' into gameplay/key-counter-abstraction 2023-04-03 15:33:35 +09:00
Dean Herbert
43d7386623
Merge pull request #22926 from Joehuu/fix-sort-direction-not-resetting
Fix beatmap listing sort direction not resetting when changing criteria
2023-04-03 15:32:10 +09:00
Dean Herbert
a097433cb1 Fix overlay toggle keys working during disabled activation modes
Closes #23104.
2023-04-03 15:03:47 +09:00
cdwcgt
2cf8636366
show guest diff author in BeatmapPicker 2023-04-02 22:25:58 +09:00
Dean Herbert
e66569b394 Update ruleset dependency tests in line with nullable changes 2023-04-02 21:04:44 +09:00
Dean Herbert
9b45591c2f Add failing test coverage of saving failed replay causing progression to results 2023-03-29 14:00:11 +09:00
cdwcgt
f01247f1ab test 2023-03-28 21:41:00 +09:00
cdwcgt
899860dd77 Merge branch 'master' into chat-report 2023-03-28 21:14:11 +09:00
Dean Herbert
d31b37e87e Merge branch 'master' into fix-ubo-not-bound 2023-03-26 16:14:11 +09:00
Joseph Madamba
e1906a90eb
Use image@2x from tournament banner api 2023-03-25 13:08:46 -07:00
cdwcgt
26f2d9047d code style fix 2023-03-23 01:11:44 +09:00
cdwcgt
8518d15b8d use endpoint 2023-03-23 01:00:38 +09:00
Dean Herbert
ad5bdf6511 Merge branch 'master' into fix-ubo-not-bound 2023-03-22 16:46:39 +09:00
Dean Herbert
db227b1798 Merge branch 'master' into chat-report 2023-03-22 16:26:28 +09:00
Terochi
1478a26cc0 Addressed changes 2023-03-21 23:15:49 +01:00
Joseph Madamba
df3ccdff9f
Add failing beatmap listing sort direction on criteria change test 2023-03-21 15:08:37 -07:00
Bartłomiej Dach
9ff9cd3b7f
Merge branch 'master' into skin-editor-cyclic-selection 2023-03-21 19:49:55 +01:00
Dean Herbert
fb51221c2b Add test coverage of cyclic selection triggering when more than one item is selected 2023-03-21 21:31:10 +09:00
Salman Ahmed
678e8ed736 Update UBO usages inline with framework changes 2023-03-16 14:06:35 +03:00
cdwcgt
d025c441ca delay mod save after click save or not popover hidden 2023-03-16 19:48:45 +09:00
Cootz
556964eae0
Merge branch 'master' into BitmapUpdatesOnScore 2023-03-16 12:16:42 +03:00
Dean Herbert
a81408ca06 Add failing test coverage showing that replay will fail on exiting gameplay 2023-03-16 17:12:46 +09:00
Dean Herbert
159c8833c7 Add test coverage of SkinnableSound not updating in time when not present 2023-03-16 15:41:05 +09:00
Dean Herbert
5378cdff20 Apply NRT to TestSceneSkinnableSound 2023-03-16 15:10:35 +09:00
Dean Herbert
5f9b13a775 Rename Add/AddRange methods as they are no longer conflicting with Container 2023-03-15 18:02:41 +09:00
Dean Herbert
8908648f97 Fix super-dodgy cast of IEnumerable to Drawable 2023-03-15 18:01:22 +09:00
Dean Herbert
0a19b1e9cf
Merge pull request #22860 from rozukke/fix-skin-ini-import
Fix import of skins with non-ASCII names that have been previously exported by lazer
2023-03-15 15:36:51 +09:00
Dean Herbert
1cf870d956 Add test coverage and fix fail case where a drag selection ends incorrectly with cyclic selection 2023-03-15 15:16:48 +09:00
Dean Herbert
3c4e2d8700 Add tests covering drag selection 2023-03-14 21:04:51 +09:00
Dean Herbert
6546f5968a Merge branch 'master' into skin-editor-cyclic-selection 2023-03-14 20:43:56 +09:00
Dean Herbert
b5ea855b6c Fix failing DrawableRulesetDependencies test 2023-03-14 20:37:50 +09:00
Dean Herbert
969c0e9c9d Merge branch 'master' into veldrid-renderer 2023-03-14 17:35:38 +09:00
rozukke
4570c0030f Add test to check for import of exported skin with non-ASCII name 2023-03-13 23:37:45 +11:00
Dean Herbert
c35c81293a Add test coverage ensuring images specified as videos are used as background image instead 2023-03-13 18:24:16 +09:00
Dean Herbert
3aea058c98 Add test coverage ensuring images are not read as videos 2023-03-13 18:24:16 +09:00
Dean Herbert
12f240e11a Apply simple NRT changes to touched test scenes 2023-03-13 18:24:16 +09:00
Terochi
8e8dda3ac0 Big simplifying 2023-03-11 23:29:36 +01:00
cdwcgt
15f11bb1e8 scorll container and save mod after popover hidden
Requires manual handling of many visual effects
2023-03-11 12:31:33 +09:00
Terochi
b51c41a804 Addressed changes 2023-03-09 20:14:58 +01:00
cdwcgt
f4e2620402 fix test 2023-03-10 00:56:22 +09:00
cdwcgt
d009cd8422 test 2023-03-09 22:49:45 +09:00
tsrk
d806b85a30
revert: make counters an IEnumerable again
As suggested by bdach as this would make the last two commits useless

Refs: 5d15426
2023-03-09 10:25:03 +00:00
Bartłomiej Dach
ab87f5e0c9
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-03-08 22:37:09 +01:00
tsrk
44297a7d0a
refactor: make KCD a CompositeDrawable 2023-03-08 00:47:16 +00:00
Bartłomiej Dach
72695f7c90
Merge branch 'master' into omit-barline-in-timing-control-point 2023-03-07 22:46:24 +01:00
Terochi
9ea93e0a9f Add more tests 2023-03-07 20:38:33 +01:00
Bartłomiej Dach
cfafa8af8c
Merge branch 'master' into hud/player-components 2023-03-07 19:44:12 +01:00
Terochi
bedf4cc259 Remove extra code 2023-03-07 16:03:11 +01:00
Cootz
5d41d343fd
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-03-07 15:46:52 +03:00
cdwcgt
54564e0557 new design 2023-03-07 21:13:35 +09:00
Dean Herbert
28520414aa Move KeyCounter components to HUD namespace 2023-03-07 16:41:39 +09:00
Dean Herbert
15d65059b5 Tidy up Add method logic 2023-03-07 16:21:57 +09:00
Dean Herbert
8f6df5ea0f
Merge branch 'master' into gameplay/key-counter-abstraction 2023-03-07 16:09:45 +09:00
Dean Herbert
d2fcdf6e0e Add test coverage of cyclic selection in skin editor 2023-03-07 15:11:47 +09:00
tsrk
952814604e
style: fix late night oopsies 2023-03-06 20:06:56 +00:00
cdwcgt
0095fd85ca remove == true 2023-03-07 02:18:34 +09:00
cdwcgt
4858d3fd42 Added ability to edit mod presets 2023-03-07 02:00:40 +09:00
Bartłomiej Dach
ec15e2b9cc
Merge branch 'master' into dont-filter-results-on-sort-mode 2023-03-06 17:57:47 +01:00
tsrk
ddee6400df
test: add coverage for Player{Avatar,Flag} 2023-03-05 23:46:51 +00:00
Bartłomiej Dach
9d4bb2ecf7
Add failing test coverage for clearing sidebar contents 2023-03-04 14:08:50 +01:00
Bartłomiej Dach
2f25fb4083
Move NonSkinnableScreenPlaceholder to outer scope 2023-03-04 13:22:43 +01:00
Bartłomiej Dach
3dd3b5e77a
Add failing test case 2023-03-04 13:17:54 +01:00
Cootz
322f3e86ba
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-03-03 20:02:09 +03:00
Dean Herbert
a14dede036 Ensure TestBeatmapCarousel.Items only returns actually visible items (and in correct order)
Turns out that items could be in an order that isn't the same as how
things look on the carousel, so this change ensures that for testing
purposes they are sorted by Y position.

Also uses the `CarouselItem.Visible` flag to ensure that we don't have
to wait for drawable fade transitions after a filter operation.
2023-03-03 17:18:34 +09:00
Dean Herbert
7a092ea995 Add better coverage and more comments explaining the structure of test setup 2023-03-03 17:18:14 +09:00
Dean Herbert
82293c0c86 Don't filter away results with missing data when using "Date Submitted" or "Date Ranked" sort modes
From a user's perspective, changing a sort / order mode shouldn't filter
away results, but we were doing this.

In terms of UX expectations, in stable this kind of scenario would
results in a group being added to the end of son select with "Not
ranked" or "Unknown". I think we should aim to match this eventually.
2023-03-03 16:36:18 +09:00
Dean Herbert
bd11d5d29a
Merge pull request #22743 from Joehuu/scroll-back-to-previous
Add ability to scroll back to previous position after scrolling to top via button on overlays
2023-03-01 22:55:47 +09:00
Dean Herbert
1250c1f0c1 Update test assertions to match stable expectations
These changes were taken from https://github.com/ppy/osu/pull/22582.

Minor adjustments were applied to match stable expectations, which is to
say there cannot be an inherited control point with omit barline
specification (in the editor the setting is greyed out when inheritance
is turned on).
2023-02-28 19:28:21 +09:00
Dean Herbert
2615453b31 Rename SettingSource tests to match attribute name 2023-02-28 11:45:32 +09:00
Bartłomiej Dach
92edb0f868
Merge branch 'master' into skin-editor-depth-changing 2023-02-27 19:24:53 +01:00
Joseph Madamba
fa710ae1b0
Rename ScrollToTopButton to ScrollBackButton 2023-02-26 14:39:34 -08:00
Joseph Madamba
d98d330da2
Add expected behavior test for scroll back to previous position 2023-02-26 14:30:46 -08:00
Dan Balasescu
dd9748a25c Adjust DrawNodes to use UBOs 2023-02-25 01:42:55 +09:00
Terochi
09e7c21b23 Implemented a more complex setting conversion logic + tests 2023-02-24 15:11:22 +01:00
tsrk
6307b3948a
style: use Trigger initialisation 2023-02-22 17:59:39 +00:00
Bartłomiej Dach
d679703fa2
Merge pull request #22659 from peppy/fix-taiko-drum-nested-sample-detection
Fix `GameplaySampleTriggerSource` not considering nested objects when determining the best sample to play
2023-02-22 18:56:59 +01:00
tsrk
1beec71037
refactor(KeyCounterDisplay): apply suggestions
I also took the freedom to add type checking, as we can't limit the
usage of `Add()` since it's a Container. The exception thrown also
advises of using the suggested `AddTrigger()` instead.
2023-02-22 14:58:27 +00:00
Dean Herbert
a8c692a215
Merge pull request #22635 from peppy/use-overlays-container-more
Use `Overlays` container rather than `KeyBindingInputManager` for flashlight
2023-02-22 18:30:21 +09:00
Dean Herbert
32a9c066df Add test coverage of bring-to-front / send-to-back operations 2023-02-22 18:17:20 +09:00
Dean Herbert
90ca635a17 Fix weird nullability in TestSceneSkinEditor 2023-02-22 18:17:20 +09:00
Dean Herbert
f61fbcf3fc Update assertion to also check GameplayClockContainer's current time 2023-02-22 15:26:09 +09:00
Dean Herbert
a511e64fa5 Seek using GameplayClockContainer 2023-02-22 14:41:20 +09:00
Bartłomiej Dach
d59d153654
Fix test compile failures from Audio hoisting 2023-02-21 21:03:00 +01:00
Terochi
dd53a70071 Addressed change requests 2023-02-21 21:01:31 +01:00
Bartłomiej Dach
3d2fcb0cca
Merge branch 'master' into fix-taiko-drum-nested-sample-detection 2023-02-21 20:53:06 +01:00
Bartłomiej Dach
ec1bf7b0b2
Merge branch 'master' into skin-editor-clipboard 2023-02-21 19:35:58 +01:00
Terochi
191604340f Added a way for mod settings to be kept when changing ruleset + test 2023-02-21 19:05:10 +01:00
Cootz
1fa6864500
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-02-21 18:47:59 +03:00
Cootz
90aa4288d0 Reduce the allowed length by 5 to account for (99) suffix. Move truncating logic to GetFilename. Update tests. 2023-02-21 18:35:53 +03:00
Dean Herbert
9321ec29dc Update slider sample source asserts to match expected behaviour
As pointed out in review, if the current time is after the end of the
slider, the correct hit object to use for sample retrieval is the object
itself, not any nested object.
2023-02-21 14:04:38 +09:00
Dean Herbert
e686b4393e Add wait steps to ensure frame-stable clock has caught up before checking state 2023-02-21 14:04:19 +09:00
Dean Herbert
5ba6059911 Merge branch 'master' into fix-taiko-drum-nested-sample-detection 2023-02-21 13:58:15 +09:00
Bartłomiej Dach
c9999bdeb1
Merge branch 'master' into skin-per-ruleset-layouts 2023-02-20 20:14:38 +01:00
Bartłomiej Dach
3183f5cee2
Merge branch 'master' into revert-result-in-playfield 2023-02-19 16:33:10 +01:00
Cootz
5fa75805cc
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-02-18 15:52:17 +03:00
Bartłomiej Dach
704dddf14b
Merge branch 'master' into skin-editor-clipboard 2023-02-17 22:59:18 +01:00
Bartłomiej Dach
6b9472c367
Merge branch 'master' into skin-per-ruleset-layouts 2023-02-17 22:58:38 +01:00
Bartłomiej Dach
6afa65bd3d
Merge branch 'master' into skinnable-clean-up-documentation 2023-02-17 20:59:18 +01:00
cdwcgt
e84e011d5d Merge branch 'master' into export 2023-02-17 22:15:19 +09:00
Dean Herbert
9793774377 Update SkinDeserialisationTest to work with new serialisation structure 2023-02-17 16:22:48 +09:00
Dean Herbert
6b3652f567 Change serialisation format of skin layouts to allow more flexibility
Also adds per-ruleset storage for each container type.
2023-02-17 14:19:19 +09:00
Dean Herbert
372b6b794c I don't know what .ots is but let's not use random file extension that make no sense 2023-02-17 13:46:27 +09:00
Dean Herbert
8ef3fb26e0 More constants and assert fixes 2023-02-17 13:46:27 +09:00
Dean Herbert
86d110e893 Simplify test storage by removing nested storage 2023-02-17 13:43:42 +09:00
Dean Herbert
4560ae6b02 Mark test as fixture 2023-02-17 13:39:31 +09:00
Dean Herbert
99236f0ae8 Move long filename to fixture level 2023-02-17 13:39:24 +09:00
Dean Herbert
96b1498932 Rename max length variable to make sense (it's a filename limit, not path) 2023-02-17 13:33:22 +09:00
Dean Herbert
415220a447 Tidy up new test method code quality 2023-02-17 13:30:00 +09:00
Cootz
810712386d
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-02-17 01:51:24 +03:00
Cootz
f4038a49a1 Fix inspectCode issues 2023-02-17 01:50:24 +03:00
Cootz
1d8b348e4c Improve naming 2023-02-17 01:46:15 +03:00
Cootz
6cb00cd42f Add more test cases 2023-02-17 01:44:45 +03:00
tsrk
ddd6c1a1c6
refactor(KeyCounter): address bindables issues
`IsCounting` is back being an auto-property.
`countPresses` is now encapsulated and being exposed as an
`IBindable<int>` via `CountPresses`
2023-02-16 22:20:34 +00:00
Bartłomiej Dach
3ee046000e
Merge branch 'master' into revert-result-in-playfield 2023-02-16 21:54:29 +01:00
Bartłomiej Dach
2fdf1fd876
Merge branch 'master' into fix-taiko-drum-nested-sample-detection 2023-02-16 19:43:02 +01:00
Bartłomiej Dach
5bdc5dfadd
Add one more assert to keep coverage from previous implementation 2023-02-16 19:02:51 +01:00
Cootz
6819a45a1b Improve code slightly 2023-02-16 16:42:07 +03:00
Cootz
f1da213bea Add tests 2023-02-16 16:26:57 +03:00
Dean Herbert
b59ec551f6 Add test coverage of GameplaySampleTriggerSource not considering nested objects 2023-02-16 18:21:33 +09:00
Dean Herbert
979c079f8b Refactor GameplaySampleTriggerSource test to not be realtime dependent 2023-02-16 17:58:44 +09:00
Dean Herbert
9d02a2ef0e Apply NRT to GamepleSampleTriggerSource tests 2023-02-16 17:58:44 +09:00
Dean Herbert
2fbaf88a3c Add clipboard dependency to SkinEditor specific tests
This is usually provided by the `SkinEditorOverlay`, which is not always
present in tests.
2023-02-16 15:24:38 +09:00
tsrk
74e7cc2056
feat: implement new design of key counter 2023-02-15 22:18:02 +00:00
tsrk
076eb81b21
refactor: rename trigger classes
Makes it better to understand their purpose
2023-02-15 21:46:13 +00:00
tsrk
157bba7830
refactor: rename Trigger class to InputTrigger 2023-02-15 21:41:36 +00:00
Dean Herbert
a92e42bb84 Rename SkinnableTargetContainer to SkinComponentsContainer
Also use full `SkinComponentsContainerLookup` instead of the sub-type.
This will potentially be useful once we bring in per-ruleset targets.
2023-02-15 18:37:41 +09:00
Dean Herbert
b1cf6d83d8 Move extension methods closer to serialisation classes 2023-02-15 18:37:41 +09:00
Dean Herbert
d159d6b970 Rename ISkinnableDrawable to ISerialisableDrawable 2023-02-15 18:37:41 +09:00
Dean Herbert
856efd9fd9 Rename SkinnableDrawableInfo to SerialisedDrawableInfo 2023-02-15 18:23:19 +09:00
Dean Herbert
9e651a7ca2 Rename SkinnableInfo to SkinnableDrawableInfo 2023-02-15 18:23:17 +09:00
Dean Herbert
6010dde86e Move SkinnableInfo to better namespace 2023-02-15 18:23:10 +09:00
Dean Herbert
d9b4d932c9 Fix test container lookup failure 2023-02-15 17:47:34 +09:00
Dean Herbert
ca75f0ec77 Apply NRT to TestSceneBeatmapSkinFallbacks 2023-02-15 17:30:21 +09:00
Dean Herbert
8bbd00822c Simplify and rename SkinnableTargetComponentsContainer 2023-02-15 17:30:21 +09:00
Dean Herbert
51d4ae5241
Merge branch 'master' into footer_V2_implementation 2023-02-14 14:00:53 +09:00
Bartłomiej Dach
939144fb6c
Merge pull request #22628 from EVAST9919/letterbox-no-containers
Remove unnecessary containers in `LetterboxOverlay`
2023-02-13 23:54:48 +01:00
mk56-spn
6e6421caea Change FooterV2.cs colour to use ColourProvider instead of OsuColour.
Remove unnecessary `FillFlowContainer`
2023-02-13 22:12:25 +01:00
Andrei Zavatski
006356e617 Add TestSceneLetterboxOverlay 2023-02-13 14:17:33 +03:00
tsrk
11d0e185b8
refactor: separate impl of KeyCounterDisplay
This allows for different layouts of display. Idk, maybe someone would
want to mix both variants? (don't do this please). This commit is mostly
prep for further changes.
2023-02-13 01:36:12 +00:00
Joseph Madamba
cb51b9e350 Use existing ModdingBeatmap activity 2023-02-12 15:01:50 -08:00
Joseph Madamba
bbeef53569 Add TestingBeatmap activity 2023-02-12 13:11:42 -08:00
Joseph Madamba
afb66d8af4 Make user activity class names more specific 2023-02-12 12:32:17 -08:00
Bartłomiej Dach
7b2c5ab7eb
Merge pull request #22608 from peppy/update-dependencies
Update realm and other dependencies
2023-02-11 12:37:02 +01:00
Dean Herbert
20f3ab167e Re-centralise BannedApiAnalysers nuget package 2023-02-11 19:36:40 +09:00
Bartłomiej Dach
8292052dc2
Merge pull request #22598 from peppy/fix-skip-intro-replay
Fix "skip" key binding no longer working in replay playback
2023-02-11 11:27:10 +01:00
Dean Herbert
0c5dae5f26
Merge pull request #22529 from ItsShamed/dsc/presence
Add support for `Watching` and `Spectating` activities in `ReplayPlayer` and `SoloSpectatingPlayer`
2023-02-11 17:29:47 +09:00
Dean Herbert
86c8675910 Update realm and other dependencies 2023-02-11 13:52:24 +09:00
Dean Herbert
96fbd04698 Add failing test coverage of skip no longer working in replay playback 2023-02-10 18:57:04 +09:00
Dean Herbert
eccde923e5
Merge pull request #22554 from Walavouchey/ranking-accuracycircle-readability
Improve readability of `AccuracyCircle`
2023-02-10 17:03:46 +09:00
ekrctb
5ddaf8ea3c Fix test setting invalid TimeOffset 2023-02-09 17:43:04 +09:00
Dean Herbert
92eb6b6717 Simplify TestSceneAccuracyCircle test specifications 2023-02-09 15:42:03 +09:00
Joseph Madamba
3b5d573db1 Display tournament banner on user profile 2023-02-08 17:16:09 -08:00
Walavouchey
9544a1d26d use values closer to the extremities for test cases 2023-02-09 00:02:32 +01:00
Walavouchey
6ace6bfee1 ensure AccuracyCircle doesn't land in gaps created by RankNotches 2023-02-08 13:20:53 +01:00
Dean Herbert
b0131db1dc Update test assertions in line with new state saving logic 2023-02-08 15:55:17 +09:00
Dean Herbert
3a3c2e78a1 Merge branch 'master' into skin-editor-undo-support 2023-02-08 15:41:58 +09:00
Dean Herbert
38031fdf23 Add test coverage of stores stored in database as well 2023-02-08 15:38:07 +09:00
Dean Herbert
d4d985ba0f Improve test to also check that reverting hash restores old scores 2023-02-08 15:34:46 +09:00
Dean Herbert
c7eec371f5 Clean up tests somewhat 2023-02-08 15:22:17 +09:00
Dean Herbert
b6809e156b
Merge pull request #22432 from mk56-spn/sheared_slider_implementation_clean_ii
Implement a sheared slider for the updated design
2023-02-08 15:01:00 +09:00
Cootz
338d96534a Add leaderboard test on beatmap update 2023-02-08 05:01:54 +03:00
PC
7e127dafe2 Update reference 2023-02-07 11:52:47 +03:00
Cootz
cb26601cb4 Fix test's score generation 2023-02-07 02:29:28 +03:00
Bartłomiej Dach
12f6d461b9
Merge pull request #22532 from peppy/fix-long-storyboard-outro
Fix storyboard outro time potentially running too long
2023-02-06 20:30:36 +01:00
tsrk
bc89f8dc5b
feat: add name and rulset verb display support 2023-02-06 12:44:00 +00:00
Dean Herbert
c691a0d3af
Merge branch 'master' into sheared_slider_implementation_clean_ii 2023-02-06 17:49:33 +09:00
Dean Herbert
c078d3a344
Merge pull request #22357 from EXtremeExploit/groups-probationary-badges
Make probationary groups a bit transparent
2023-02-06 17:43:57 +09:00
Dean Herbert
679ec986d5 Fix storyboard outro time potentially running too long 2023-02-06 16:39:44 +09:00
tsrk
e878bb42a4
test: add test for watching activity 2023-02-06 00:53:56 +00:00
Susko3
364217829c Add test for ArchiveImportIPCChannel 2023-02-03 18:39:46 +01:00
Susko3
13fc649edf Refactor test to more closely match how OsuGameDesktop works 2023-02-03 18:22:51 +01:00
mk56-spn
e1af5e110a Remove ``RoundedNub.cs` and make `Nub.cs`` non abstract again 2023-02-03 12:19:09 +01:00
Dean Herbert
3345e34544 Move beatmap specific logic out of EditorChangeHandler 2023-02-03 17:53:54 +09:00
Dean Herbert
4ec46c7476
Merge branch 'master' into footer_V2_implementation 2023-02-03 16:30:16 +09:00
Dean Herbert
a1200b8fe8 Adjust footer button colour handling to read better and take into account mouse down 2023-02-03 16:27:20 +09:00
Bartłomiej Dach
e937022b09
Merge branch 'master' into middle-click-replay-pause 2023-02-02 20:52:03 +01:00
Bartłomiej Dach
6c0aada86a
Merge pull request #22490 from peppy/skin-overlay-namespace
Move skin editor to overlays namespace
2023-02-02 18:14:16 +01:00
mk56-spn
3f0ce75bf5 Rename NormalSliderBar.cs to RoundedSliderBar.cs 2023-02-02 17:24:45 +01:00
mk56-spn
7c5a65bdb7 Rename NormalNub.cs to RoundedNub.cs 2023-02-02 17:23:09 +01:00
Dean Herbert
edecd2ee25 Merge branch 'master' into middle-click-replay-pause 2023-02-02 15:25:51 +09:00
Dean Herbert
b792dc3af0
Merge pull request #22281 from cdwcgt/editor-check-previewtime
Add preview time setting check
2023-02-02 15:10:06 +09:00
Dean Herbert
50659f3d52
Merge pull request #22428 from EVAST9919/triangles-new-masking
Implement Masking property for `TrianglesV2` background
2023-02-02 14:22:16 +09:00
Dean Herbert
8dc2e6872e Move skin editor to overlays namespace 2023-02-02 14:00:31 +09:00
Bartłomiej Dach
4fc7d37a1b
Fix wonky log message 2023-02-01 22:58:11 +01:00
Bartłomiej Dach
efc9a34b98
Merge branch 'master' into add-more-logging 2023-02-01 22:55:28 +01:00
Dean Herbert
34a6106170 Add more logging in TestScenePause to better understand test failures 2023-02-02 01:01:32 +09:00
Dean Herbert
d54db8de64
Merge branch 'master' into fix-clicking-metadata-relevance-sort 2023-02-01 19:39:13 +09:00
Andrei Zavatski
faee012a2a Add texelSize slider to TriangleBorder shader test scene 2023-02-01 10:37:44 +03:00
cdwcgt
209bc3c1ed remove useless setup 2023-02-01 11:53:26 +08:00
Dean Herbert
b19d43f012 Merge branch 'master' into conflicting-filenames-in-skin-alt 2023-01-31 16:06:28 +09:00
Bartłomiej Dach
c5e1f54185
Fix sample store creation mutating shared resource store 2023-01-30 20:48:52 +01:00
Bartłomiej Dach
a8f828d203
Add another failing test case 2023-01-30 20:48:52 +01:00
Bartłomiej Dach
55a045b2b2
Adjust beatmap skin resources test to facilitate loading many 2023-01-30 20:48:52 +01:00
mk56-spn
f5d579144b Remove free mods button 2023-01-30 12:57:24 +01:00
Salman Ahmed
20f4061e30 Move ongoing operation wait step to proper place 2023-01-29 00:24:15 +03:00
Joseph Madamba
845bbf55fe Add failing beatmap listing search on initial open test 2023-01-28 12:10:50 -08:00
Bartłomiej Dach
9bdb78791f
Add failing test case 2023-01-28 20:02:25 +01:00
Bartłomiej Dach
a126c72a4f
Adjust skin resources test to facilitate loading many 2023-01-28 20:02:25 +01:00
mk56-spn
76146b5c53 Address naming discrepancy in TestSceneShearedSliderBar.cs 2023-01-26 15:12:52 +01:00
mk56-spn
2f90ffccfc Implement ShearedSliderBar.cs and corresponding TestSceneShearedSliderBar.cs 2023-01-26 15:03:22 +01:00
mk56-spn
374c3b56f6 Rename Nub.cs to NormalNub.cs 2023-01-26 15:03:11 +01:00
mk56-spn
3988131475 Rename OsuSliderBar.cs as NormalSliderBar.cs 2023-01-26 12:12:56 +01:00
Dean Herbert
13937cf555
Merge branch 'master' into stream-tool-2 2023-01-26 16:08:20 +09:00
Andrei Zavatski
7cd21e12f3 Implement masking property for TrianglesV2 background 2023-01-26 09:46:41 +03:00
Andrei Zavatski
d09d6f31d7 Implement Masking property for TrianglesBackground 2023-01-25 12:20:51 +03:00
Dean Herbert
e3a5c233e9 Update test to use newer assetion logic 2023-01-25 17:39:35 +09:00
Dean Herbert
f0406c34fd Merge branch 'master' into revert-result-in-playfield 2023-01-25 17:35:33 +09:00
Dean Herbert
67e9de43be
Merge pull request #22386 from EVAST9919/triangles-og-shhader
Use `TriangleBorder` shader in `Triangles` background
2023-01-25 17:25:18 +09:00
Dean Herbert
59ee6922b1
Merge pull request #22399 from bdach/user-profile/update-cover
Update appearance of profile cover area to match web
2023-01-25 16:35:44 +09:00
Dean Herbert
4674956ccf
Merge pull request #22318 from naoey/fix-copy-difficulty-moving-collections
Fix creating a copy of a difficulty in the editor removing the original beatmap from user collections
2023-01-25 15:06:46 +09:00
Dean Herbert
68a9d945b9
Merge branch 'master' into user-profile/update-cover 2023-01-25 14:30:35 +09:00
Dean Herbert
6efab635d8
Merge branch 'master' into fix-copy-difficulty-moving-collections 2023-01-25 14:11:32 +09:00
Bartłomiej Dach
a3bb6d1fab
Revert a few more relative to absolute changes
Because not sure why they were changed in the first place.
2023-01-25 00:00:23 +01:00
Bartłomiej Dach
4d7cd59df3
Fix TestAbsoluteImage() no longer actually testing absolute image URL 2023-01-24 23:58:39 +01:00
Bartłomiej Dach
f2df36e6a5
Persist cover visibility to user settings
Follows web precedent, wherein the setting is saved to local storage.
2023-01-24 23:30:12 +01:00
Bartłomiej Dach
ef7812412b
Update top header container appearance 2023-01-24 23:06:44 +01:00
Jai Sharma
c991aa5ca4 TestSceneWikiMarkdownContainer: Revert CurrentPath changes and update markdown img links only 2023-01-24 22:01:53 +00:00
Andrei Zavatski
04995b66da Add seed slider to Triangles test sceen 2023-01-24 07:09:25 +03:00
Jai Sharma
2454eb8cd9 TestSceneWikiMarkdownContainer: Add visual test for inline and fenced code syntax 2023-01-24 00:53:45 +00:00
Jai Sharma
f067a84631 TestSceneWikiMarkdowContainer: Update image paths 2023-01-24 00:51:07 +00:00
naoey
e6de167adb
Revert split and make collections boolean internal to BeatmapManager 2023-01-24 07:27:26 +09:00
mk56-spn
bc94f1b773 add free mods button to test 2023-01-23 16:43:38 +01:00
ekrctb
8405a3e172 Add test for RevertResult 2023-01-23 18:51:55 +09:00
Dean Herbert
432e0a6a37
Merge branch 'master' into level-badge-colour 2023-01-23 15:46:15 +09:00
Dean Herbert
736965e009 Fix test scene potentially overflowing visible region 2023-01-23 15:45:44 +09:00
cdwcgt
5afb733fb2
change IssueTemplatePreviewTimeConflict's text 2023-01-23 15:26:28 +09:00
EXtremeExploit
b62d4deb6f
Fix also typo on filename 2023-01-22 17:17:19 -03:00
EXtremeExploit
55976df307
Fix typo in test class name 2023-01-22 16:43:03 -03:00
EXtremeExploit
aeebbe4003
Add group badges test from #22280 2023-01-22 15:12:40 -03:00
EXtremeExploit
64c9654910
Make probationary groups a bit transparent 2023-01-22 13:32:05 -03:00
Bartłomiej Dach
e1acf85bb3
Merge branch 'master' into groups-modes 2023-01-22 10:09:34 +01:00
EXtremeExploit
05f77d2cab
Add modes text to groups tooltip 2023-01-22 01:36:53 -03:00
Joseph Madamba
da03abc812 Fix comment editor text boxes not having sound feedback 2023-01-21 17:32:42 -08:00
naoey
1c1c9915bb
Split saving new and existing beatmaps into separate flows 2023-01-22 10:27:33 +09:00
naoey
a1b5c9d910
Don't transfer MD5 hashes in collections when copying beatmaps
Fixes #22306.

Changes beatmap saving so that by default it does not transfer
the hashes in collections, and only transfers them when saving the same
difficulty in the editor.

Issue seems to have been introduced in https://github.com/ppy/osu/pull/20641.
2023-01-22 01:14:18 +09:00
Dean Herbert
e86748626a
Merge pull request #22296 from frenzibyte/actually-fix-beatmap-options 2023-01-20 10:21:55 +09:00
Salman Ahmed
8174ef06c3 Fix intermittent failure in playlists match loading test 2023-01-20 01:18:41 +03:00
Salman Ahmed
f0464b0340 Actually fix intermittent failure in beatmap options state test 2023-01-19 22:47:35 +03:00
mk56-spn
b22363ed8c Fix JudgementCounterDisplay.cs max judgement always showing upon changing display mode 2023-01-19 10:31:02 +01:00
Dean Herbert
56ce8504ae Merge branch 'master' into comment-reply 2023-01-19 16:01:47 +09:00
Dean Herbert
db8084570d
Merge pull request #22285 from bdach/segmented-graph-tint
Apply draw colour to segmented graph
2023-01-19 13:36:19 +09:00
Dean Herbert
e58abf7d1a
Merge pull request #22284 from bdach/judgement-counter-broken
Fix "show max judgement" setting not applying initially on judgement counter display
2023-01-19 09:09:06 +09:00
Bartłomiej Dach
b62ff8d644
Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-18 23:52:12 +01:00
Bartłomiej Dach
e09b768a99
Add test steps demonstrating failure 2023-01-18 23:07:40 +01:00
Bartłomiej Dach
7299d227d1
Add failing test case 2023-01-18 21:42:22 +01:00
Bartłomiej Dach
06212bca51
Restructure test scene to demonstrate failure 2023-01-18 21:41:00 +01:00
ansel
7f4d8bdcaa Add test 2023-01-18 21:27:42 +03:00
Bartłomiej Dach
4a6f6300c5
Merge branch 'master' into fix-carousel-sort-change-after-play 2023-01-18 17:15:20 +01:00
cdwcgt
997a1a8b02
add test for CheckPreviewTime 2023-01-19 01:08:56 +09:00
StanR
8ae82484b5 Usings 2023-01-18 16:38:58 +03:00
StanR
24ed84aad0 Add tiered level badge colouring 2023-01-18 16:25:11 +03:00
Dean Herbert
3b27774561 Remove OnlineID sort consideration 2023-01-18 19:21:02 +09:00
Dean Herbert
43a037c189
Merge pull request #21620 from mk56-spn/JudgementCounter
Add a judgement counter to skin components
2023-01-18 18:43:49 +09:00
Dean Herbert
d4f2cd244d Fix broken test step 2023-01-18 18:12:40 +09:00
Dean Herbert
42e9b2b48c Tidy up clock logic in all SongProgress classes 2023-01-18 16:29:42 +09:00
Dean Herbert
5ead85f461 Limit catch-up speed in test to emulate gameplay 2023-01-18 16:13:43 +09:00
Dean Herbert
8030194cd5 Use actual beatmap's hitobjects in test to better display density 2023-01-18 16:11:46 +09:00
Dean Herbert
bfb75730a9 Prefix subclasses of DefaultSongProgress with Default 2023-01-18 15:45:16 +09:00
Dean Herbert
04c0a5d728 Update TestSceneSongProgress to properly work with new implementation 2023-01-18 15:44:19 +09:00
Dean Herbert
5a272b4bd6
Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-18 15:25:02 +09:00
Dean Herbert
e8770b84cd Remove no longer necessary interface type 2023-01-18 15:23:55 +09:00
Dean Herbert
f9dd3f6def Switch test to specifically target the argon verison of the progress bar 2023-01-18 15:23:55 +09:00
Dean Herbert
5429979049 Combine common code into SongProgress base class 2023-01-18 15:23:55 +09:00
Dean Herbert
45c5bd8403 Simplify HUD test to not require casting to specific ProgressBar type 2023-01-18 14:37:09 +09:00
Bartłomiej Dach
f5459909f9
Merge branch 'master' into comment-editor-3 2023-01-17 21:31:08 +01:00
Bartłomiej Dach
6f11fbdeed
Merge branch 'master' into fix-carousel-sort-change-after-play 2023-01-17 20:46:06 +01:00