1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 20:27:52 +08:00
Commit Graph

1518 Commits

Author SHA1 Message Date
Bartłomiej Dach
7200855d46
Rename Judgement{Tally -> CountController} 2023-06-26 19:30:04 +02:00
Bartłomiej Dach
8d91580dc1
Rename {KeyCounter -> InputCount}Controller 2023-06-26 19:27:42 +02:00
tsrk
350d722c8d
Merge branch 'master' into hud/kc-skinnable 2023-06-25 15:42:08 +02:00
Bartłomiej Dach
25842105ce
Merge pull request #23976 from peppy/gameplay-sample-trigger-source-correctness
Adjust `GameplaySampleTriggerSource` to only switch samples when close enough to the next hit object
2023-06-25 08:23:55 +02:00
Bartłomiej Dach
d7ae430ec2
Merge branch 'master' into framework-update 2023-06-24 18:47:52 +02:00
Dean Herbert
3585c3f1d5 Apply required nullability changes 2023-06-24 09:58:36 +09:00
Dean Herbert
0ab0c52ad5 Automated pass 2023-06-24 01:00:03 +09:00
Bartłomiej Dach
2f77675fe7
Fix errors in tests due to mismatching NRT annotations 2023-06-20 21:57:32 +02:00
Dean Herbert
92e89c7df7 Update test expectations 2023-06-20 21:02:34 +09:00
Dean Herbert
04dad6c6e8 Use IGameplayClock to ensure our clock source is correct 2023-06-20 20:47:56 +09:00
tsrk
61101335cc
test: fix KeyCounterController not provided as a dependency 2023-06-16 19:00:09 +02:00
tsrk
f9321a24d9
test: change hideTarget drawable and testing logic
Doesn't change what it needs to test conceptually
2023-06-16 17:24:40 +02:00
Ruki
aba8219d06
Merge branch 'master' into hud/kc-skinnable 2023-06-15 15:48:43 +02:00
tsrk
7e70598773
test: move back key counter tests in ctor 2023-06-15 12:02:30 +02:00
tsrk
42b740a175
Merge branch 'master' into hud/kc-skinnable 2023-06-14 22:19:45 +02:00
tsrk
c637fddf73
refactor: decouple Trigger logic from KeyCounterDisplay
This allows to keep a coeherent state regardless of the progress of the play
2023-06-14 21:13:35 +02:00
tsrk
758831b983
test: remove hard usages of KeyCounterDisplay 2023-06-14 13:25:24 +02:00
Dean Herbert
062fd58602 Add test to known time 2023-06-12 16:43:28 +09:00
Dean Herbert
c9f9569e4a Add ability to change background colour in song progress test scene 2023-06-12 16:22:40 +09:00
Bartłomiej Dach
f51b8a6a05
Fix code quality inspection 2023-06-06 21:11:24 +02:00
Bartłomiej Dach
7694aa7219
Add test coverage 2023-06-06 20:36:44 +02:00
Dean Herbert
1558723420 Merge branch 'master' into scorev2 2023-05-29 20:06:32 +09:00
Dan Balasescu
6d9ba9248d Massage tests a bit more 2023-05-25 16:38:22 +09:00
Dean Herbert
e68ba6366c Update new usages of "soft" to use the new constant 2023-05-24 14:04:10 +09:00
Dean Herbert
298989ffd2 Merge branch 'master' into sample-set-controls 2023-05-24 14:03:04 +09:00
Dan Balasescu
fee3d43596 Merge branch 'master' into scorev2 2023-05-23 19:07:54 +09:00
Dan Balasescu
7cbf48ffcf Fix TestSceneScoring and incorrect combo calculations 2023-05-19 14:09:19 +09:00
Joseph Madamba
caa79704ac
Add test coverage for failing case 2023-05-17 20:23:37 -07:00
Bartłomiej Dach
59ece64d25
Merge branch 'master' into skin-editor-change-handler-improvement 2023-05-03 19:42:42 +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
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
c6fc180659 remove all test usages of SampleControlPoint 2023-04-26 14:21:52 +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
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
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
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
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
9b45591c2f Add failing test coverage of saving failed replay causing progression to results 2023-03-29 14:00:11 +09:00
Terochi
1478a26cc0 Addressed changes 2023-03-21 23:15:49 +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
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
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
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
Bartłomiej Dach
92edb0f868
Merge branch 'master' into skin-editor-depth-changing 2023-02-27 19:24:53 +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
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
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
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
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
Dean Herbert
96fbd04698 Add failing test coverage of skip no longer working in replay playback 2023-02-10 18:57:04 +09:00
ekrctb
5ddaf8ea3c Fix test setting invalid TimeOffset 2023-02-09 17:43:04 +09:00
Bartłomiej Dach
e937022b09
Merge branch 'master' into middle-click-replay-pause 2023-02-02 20:52:03 +01:00
Dean Herbert
edecd2ee25 Merge branch 'master' into middle-click-replay-pause 2023-02-02 15:25:51 +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
Dean Herbert
34a6106170 Add more logging in TestScenePause to better understand test failures 2023-02-02 01:01:32 +09: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
ekrctb
8405a3e172 Add test for RevertResult 2023-01-23 18:51:55 +09: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
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
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
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
tsrk
66441d4421
test: remove test for ArgonSongProgressGraph 2023-01-17 13:16:11 +00:00
Dean Herbert
181473c5fc Rename flow to better match its purpose 2023-01-17 18:28:08 +09:00
Dean Herbert
35ad66eef9 Give flow container a type to avoid locally casting in every location 2023-01-17 18:27:33 +09:00
Dean Herbert
09c7ab3af6 Rename exposed settings to make more sense 2023-01-17 18:27:15 +09:00
Dean Herbert
f923dc5009 Use framework Direction instead of local enum
It should be stable enough to use.
2023-01-17 18:27:15 +09:00
Dean Herbert
65bd2e74fd Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-17 18:00:42 +09:00
MK56
a55ce9b586
Merge branch 'master' into JudgementCounter 2023-01-17 09:55:45 +01:00
Dean Herbert
53e7873f6c
Merge branch 'master' into fix-pause-gameplay-action-not-closing 2023-01-17 17:41:16 +09:00
Salman Ahmed
b681a0d47f Fix intermittent failure in score submission tests 2023-01-13 22:57:40 +03:00
MK56
1597bcbb6f
Merge branch 'master' into JudgementCounter 2023-01-11 11:04:37 +01:00
Joseph Madamba
974a8d520c Add basic toggle pause tests 2023-01-10 15:51:22 -08:00
Joseph Madamba
404d34f592 Refactor pause test to actually use quick exit action keybinding 2023-01-10 15:43:50 -08:00
Joseph Madamba
51dbe2c3a3 Refactor pause test to actually use back action keybinding 2023-01-10 15:43:06 -08:00
tsrk
eac8e9f6fb
test: make test not actually test anything 2023-01-09 22:21:34 +01:00
tsrk
48deef4056
test: adapt and create tests to cover new components 2023-01-09 22:07:18 +01:00
tsrk
0f1fe1d683
refactor(hud/gameplay/SongProgress): Add interface to designate SongProgressBars 2023-01-09 21:48:53 +01:00
Joseph Madamba
93a57b6871 Separate pausing test instead of using test cases 2023-01-07 11:30:02 -08:00