1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 05:23:21 +08:00
Commit Graph

7964 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
969c0e9c9d Merge branch 'master' into veldrid-renderer 2023-03-14 17:35:38 +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
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
tsrk
44297a7d0a
refactor: make KCD a CompositeDrawable 2023-03-08 00:47:16 +00:00
Terochi
bedf4cc259 Remove extra code 2023-03-07 16:03:11 +01: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
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
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
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
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
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
3183f5cee2
Merge branch 'master' into revert-result-in-playfield 2023-02-19 16:33:10 +01:00
Bartłomiej Dach
704dddf14b
Merge branch 'master' into skin-editor-clipboard 2023-02-17 22:59:18 +01:00
Bartłomiej Dach
6afa65bd3d
Merge branch 'master' into skinnable-clean-up-documentation 2023-02-17 20:59:18 +01: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
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
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