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

502 Commits

Author SHA1 Message Date
Bartłomiej Dach
d9190607e4
Add test coverage for both teams winning 2021-08-12 20:21:53 +02:00
Bartłomiej Dach
f06f13215b
Split off multiplayer team results screen to separate class
The previous version tried to keep both normal multiplayer and team
multiplayer results as one screen, but didn't check that team-specific
components aren't null in `LoadComplete()`.

To decrease number of conditional, split off the team results screen to
a separate implementation, and choose one or the other at push time in
`MultiplayerPlayer`, depending on team count.
2021-08-12 20:01:31 +02:00
Bartłomiej Dach
d08d22e3e9
Ensure tests wait for screen load 2021-08-12 19:57:05 +02:00
Dean Herbert
8249ce7988
Merge branch 'master' into multiplayer-header-redesign 2021-08-12 21:00:46 +09:00
smoogipoo
83703e4283 Add colour provider to online play dependencies 2021-08-12 20:08:14 +09:00
Dean Herbert
7b66616dc4 Simplify logic and test/fix edge case 2021-08-12 19:47:26 +09:00
Dean Herbert
8a67304b9f Fix recent participants hidden user logic not handling edge case correctly
Hiding just one user never makes sense, so this will now always show up
to the required circle count until two users are required to be hidden.
This will make the listing more consistent with the width requirement
spec.
2021-08-12 19:47:26 +09:00
Dean Herbert
512382987e Add colour provider for multiplayer usage 2021-08-12 19:47:26 +09:00
Dean Herbert
5f3ceaf0ad
Merge branch 'master' into lounge-redesign 2021-08-12 16:31:14 +09:00
smoogipoo
14fe2eea2a Add empty step to multiplayer TestEmpty() test 2021-08-12 16:20:08 +09:00
Dan Balasescu
60e988aac3
Merge branch 'master' into multiplayer-kick-support 2021-08-12 11:46:56 +09:00
smoogipoo
9393c6351d Fix another potential test case failure 2021-08-12 11:08:52 +09:00
smoogipoo
531fba8f39 Fix potential test case failure 2021-08-12 11:05:31 +09:00
smoogipoo
5d0b92e28c Fix multi spectator test not showing teams 2021-08-12 10:38:20 +09:00
smoogipoo
c160e50f4f Merge branch 'master' into multiplayer-team-vs-leaderboard 2021-08-12 10:27:31 +09:00
smoogipoo
0f5bea235c Merge branch 'master' into lounge-redesign 2021-08-11 18:15:34 +09:00
Dean Herbert
bb51ebd0ef Don't show button on self 2021-08-11 17:42:46 +09:00
Dean Herbert
50bda6023c Add test coverage 2021-08-11 17:31:54 +09:00
Dean Herbert
c376e652a4 Convey and show team scores at the multiplayer results screen 2021-08-11 15:32:14 +09:00
Dean Herbert
a503274e1d Pass through MultiplayerRoomUsers instead of ints to avoid re-retrieval 2021-08-10 18:39:20 +09:00
Dean Herbert
53d03745e0 Remove unused test scene 2021-08-10 17:48:47 +09:00
smoogipoo
e0e0d5deb0 Remove unused using 2021-08-10 17:25:10 +09:00
Dean Herbert
5ea7909eea Fix incorrectly failing test 2021-08-10 16:23:53 +09:00
Dean Herbert
ea6e441dec Simplify method of marking players as playing in test scenes 2021-08-09 19:21:22 +09:00
Dean Herbert
551929cf5a Simplify method of marking players as playing in test scenes 2021-08-09 19:18:13 +09:00
Dean Herbert
5f3d087101 Also add team score display to multiplayer spectator screen 2021-08-09 19:17:51 +09:00
Dean Herbert
121648b593 Add gameplay-specific team score display which can expand and contract 2021-08-09 19:17:51 +09:00
Dean Herbert
ebbf6467e8 Support more than two teams 2021-08-09 17:23:02 +09:00
Dean Herbert
cdc173e867 Add tracking of team totals to leaderboard implementation 2021-08-09 17:08:32 +09:00
Dean Herbert
ab522e1569 Add test coverage of team display on leaderboard 2021-08-09 17:06:21 +09:00
Dean Herbert
1e5d9003d3 Add the ability for tests to alter the room and user states which during testing 2021-08-09 16:58:36 +09:00
Dean Herbert
54ffb8dc4e Add basic multiplayer gameplay test coverage 2021-08-09 16:31:18 +09:00
smoogipoo
bdfdd00afe Adjust spacings and sizings of left-side details 2021-08-06 18:52:01 +09:00
smoogipoo
0ea982c036 Update recent participants list to use participant_count 2021-08-05 22:49:41 +09:00
smoogipoo
fd6d488657 Add thousands separator to rank range pill 2021-08-05 21:40:09 +09:00
smoogipoo
bd394d9377 Fix pluralisation 2021-08-05 20:56:23 +09:00
smoogipoo
c56b6a5379 Fix compilation failure 2021-08-05 20:52:40 +09:00
smoogipoo
0246e6f850 Merge branch 'master' into lounge-redesign 2021-08-05 19:55:15 +09:00
Dan Balasescu
0211521a97
Merge branch 'master' into multiplayer-create-with-enter 2021-08-05 17:07:03 +09:00
Dan Balasescu
5811dff853
Merge pull request #14120 from peppy/multiplayer-team-vs-team-selection
Add ability to choose Team Versus match type and view / switch teams
2021-08-05 17:02:14 +09:00
smoogipoo
fbf89493ad Merge branch 'master' into lounge-redesign 2021-08-04 19:53:55 +09:00
Dean Herbert
42e14fb492 Merge branch 'update-platform-action-triggers' into multiplayer-create-with-enter 2021-08-04 17:31:38 +09:00
Dean Herbert
9b9dacf3fe Update usages of Drawable.Click() 2021-08-04 17:30:33 +09:00
Dean Herbert
69e6c08cc2 Add test coverage of changing teams via clicking 2021-08-03 23:42:37 +09:00
Dean Herbert
75426f84f1 Fire initial match user states in TestMultiplayerClient 2021-08-03 23:42:37 +09:00
Dean Herbert
a0119f8cd6 Add basic test coverage 2021-08-03 23:42:37 +09:00
smoogipoo
56ded4fde6 Fix DrawableRoom test scene 2021-08-03 20:33:34 +09:00
smoogipoo
8b3feaabfc Fix more compile errors 2021-08-03 20:07:42 +09:00
smoogipoo
1b6b7ce343 Merge branch 'master' into lounge-redesign 2021-08-03 20:02:31 +09:00
Dean Herbert
3c7a49f431 Add test coverage of keyboard room creation flow 2021-08-03 19:11:10 +09:00
Dean Herbert
888954747c Rename class, add commenting and avoid firing requests to create rooms for testing purposes 2021-07-26 15:47:13 +09:00
Dan Balasescu
488dd3ea52
Merge pull request #13980 from peppy/fix-online-song-select-background
Fix song select background not showing in multiplayer/playlists
2021-07-26 15:16:39 +09:00
Dean Herbert
32e29d0428 Ensure lounge is loaded before continuing with tests 2021-07-26 14:29:16 +09:00
Dean Herbert
971a67c669 Add failing test coverage for misordered rooms 2021-07-26 13:46:55 +09:00
Bartłomiej Dach
db9cf443c7
Allow confirming room password by pressing Enter 2021-07-21 00:04:51 +02:00
Dean Herbert
26cc4af87c Revert unintended changes 2021-07-20 16:44:51 +09:00
Dean Herbert
4113eae6ad Add test coverage of fail scenario 2021-07-20 16:37:13 +09:00
smoogipoo
7956f73f62 Move initial content into step 2021-07-19 22:31:53 +09:00
smoogipoo
57a99886d5 Fix password icon not disappearing when no password 2021-07-19 22:31:01 +09:00
smoogipoo
05295241b8 Add room joining tests 2021-07-19 20:55:14 +09:00
smoogipoo
2eec524f27 Fix password not copied from multiplayer client 2021-07-19 20:20:08 +09:00
smoogipoo
1b9d297911 Add test 2021-07-19 20:08:29 +09:00
Dean Herbert
c6bc95767d Simplify popover hide logic and add test coverage 2021-07-17 22:31:47 +09:00
Dean Herbert
567a94a28b Remove unused using statements 2021-07-17 15:35:08 +09:00
Dean Herbert
d609839ff6 Fix test not working due to popover container being too global 2021-07-17 15:04:00 +09:00
Dean Herbert
b5dd9403b1 Merge branch 'master' into add-password-support 2021-07-14 23:53:03 +09:00
smoogipoo
dfe7cc40a9 Move create room button into the lounge 2021-07-14 18:55:01 +09:00
smoogipoo
0e89bafd17 Add special category pill + secondary background 2021-07-14 16:48:53 +09:00
smoogipoo
c5977f3318 Merge branch 'master' into lounge-redesign 2021-07-14 12:47:16 +09:00
smoogipoo
28ff92e34e Add test 2021-07-13 17:31:28 +09:00
smoogipoo
0cb80e105b Renamespace classes 2021-07-13 16:02:18 +09:00
smoogipoo
ab282b9e59 Remove RoomInspector from the lounge 2021-07-13 16:00:42 +09:00
smoogipoo
8c4a257742 Add recent participants 2021-07-13 15:10:44 +09:00
Dean Herbert
947460c3c5 Add test flow for joining passworded rooms via UI 2021-07-12 18:25:04 +09:00
Dean Herbert
a3e0168a46 Update tests 2021-07-12 18:25:04 +09:00
Dean Herbert
3c49b46c5f Add lock overlay for rooms which are password protected 2021-07-12 18:22:52 +09:00
smoogipoo
aba09b20a5 Add host under room title 2021-07-12 16:28:22 +09:00
smoogipoo
4ac812de86 Add rank range pill 2021-07-12 16:15:26 +09:00
Dean Herbert
84b0a3290c Add multiplayer lounge test coverage 2021-07-12 15:49:19 +09:00
smoogipoo
ac26374a93 Merge branch 'master' into lounge-redesign 2021-07-12 13:54:42 +09:00
smoogipoo
8929aa0ca7 Initial redesign of DrawableRoom 2021-07-07 14:47:24 +09:00
smoogipoo
1a832a4e6b Add clickability to test 2021-07-07 14:47:24 +09:00
smoogipoo
33615646bd Rename DrawableRoom test scene 2021-07-07 14:47:24 +09:00
smoogipoo
6bc0020825 Fix intermittent spectate button test failures 2021-07-06 20:28:55 +09:00
smoogipoo
b209868d96 Fix another potential failure 2021-07-06 17:57:24 +09:00
smoogipoo
8b12ec9586 Fix intermittent ready button test failures 2021-07-06 17:52:27 +09:00
Dan Balasescu
32e6c9c5d3
Merge pull request #13786 from peppy/multiplayer-test-fixes
Fix multiplayer test failures due to leaderboard load process
2021-07-06 16:33:41 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Dean Herbert
10e7c846e5 Add local UserLookupCache to avoid online requests being fired from multiplayer tests 2021-07-05 19:41:00 +09:00
Dean Herbert
9c2fed4806 Move setup steps to SetUpSteps and add empty test case 2021-07-05 19:10:27 +09:00
Dean Herbert
7b0f970e7d Fix ongoing operation being begun in an async context 2021-07-02 16:09:02 +09:00
Dean Herbert
f2d9d78455 Fix some incorrectly invoked async calls 2021-07-02 14:43:48 +09:00
smoogipoo
4c95af4b16 Add star rating range display 2021-07-01 20:35:31 +09:00
smoogipoo
aa7405afa1 Increase number of sent frames to prevent timing issues 2021-06-30 20:16:57 +09:00
Dean Herbert
741ecbb2df Merge branch 'master' into spectator-start-at-end-2 2021-06-30 15:06:30 +09:00
Dean Herbert
4337577448 Remove unused private methods 2021-06-30 14:31:27 +09:00
smoogipoo
331b7237ab Attempt to fix one more intermittent test failure 2021-06-29 23:02:20 +09:00
smoogipoo
6dd3c6fe93 Make MultiSpectatorScreen and tests more resillient to timing 2021-06-29 22:45:51 +09:00
smoogipoo
8e04d73b67 Merge branch 'rework-multiplayer-test-scenes' into spectator-start-at-end-2 2021-06-29 17:06:57 +09:00
smoogipoo
bcdf36e77b Merge branch 'master' into spectator-start-at-end-2 2021-06-29 15:53:58 +09:00
smoogipoo
06beeee4d8 Cleanup match header test 2021-06-29 15:39:01 +09:00
smoogipoo
d035633f95 Load participants list after joining room 2021-06-25 20:56:13 +09:00
smoogipoo
3e5ae7ea58 Don't join room in participants test 2021-06-25 20:44:00 +09:00
smoogipoo
1ed61b9b98 Fix up dependencies class names 2021-06-25 20:11:38 +09:00
smoogipoo
57f2b4f812 Fix incorrect parent class 2021-06-25 20:09:03 +09:00
smoogipoo
04cc390c41 Fix TestSceneMultiplayer resolving the wrong client 2021-06-25 19:16:54 +09:00
smoogipoo
a27a647ae7 Rename RoomDependencies -> OnlinePlayDependencies 2021-06-25 18:07:47 +09:00
smoogipoo
c0d2b41d4c Move SpectatorClient into multiplayer dependencies 2021-06-25 17:55:16 +09:00
smoogipoo
7aefbe3da1 Move UserLookupCache inside dependencies 2021-06-25 17:37:02 +09:00
smoogipoo
d6ab08c958 Remove manual dependencies in TestSceneMultiplayerGameplayLeaderboard 2021-06-25 15:30:28 +09:00
smoogipoo
81a812e216 Rework MultiplayerTestScene to make use of OnlinePlayTestScene 2021-06-25 15:00:10 +09:00
smoogipoo
aa5d22d04a Remove "test container", make everything go through OnlinePlayTestScene 2021-06-25 13:02:19 +09:00
smoogipoo
8fba7d2423 Remove MultiplayerTestScene inheritance from simple test scenes 2021-06-24 21:02:29 +09:00
smoogipoo
a21cf87b5f Split room manager and allow overrides 2021-06-24 19:14:05 +09:00
smoogipoo
5115299e9a Merge RoomManagerTestScene into OnlinePlaySubScreenTestScene 2021-06-24 19:09:31 +09:00
smoogipoo
a7b5c3bed1 Add OnlinePlaySubScreenTestScene 2021-06-24 17:01:28 +09:00
smoogipoo
4af119a407 Re-namespace 2021-06-24 16:29:06 +09:00
smoogipoo
c9ec4b9da4 Remove RoomTestScene inheritance from simple test scenes 2021-06-24 16:02:20 +09:00
Joseph Madamba
49000b9501 Add multiplayer leave navigation tests 2021-06-22 19:30:40 -07:00
smoogipoo
0a8daab4f7 Pause master clock when too far ahead 2021-06-11 19:15:53 +09:00
smoogipoo
e9ebbd298d Add a few more tests 2021-06-11 18:13:54 +09:00
smoogipoo
58d71e4aea Remove local "next frame" storage 2021-06-10 22:41:38 +09:00
Dean Herbert
6ef9b346e1 Fix newly found inspections from 2021.1EAP1 2021-06-01 14:33:21 +09:00
Dean Herbert
b16d10bd95 Provide game-wide resources via IStorageResourceProvider 2021-05-31 18:57:47 +09:00
Dean Herbert
121dd175e6 Fix test failure in TestSceneMultiplayerGameplayLeaderboard
The transfer of users was not accounting for the fact that the
`StartPlay` calls are now scheduled and not necessarily run in time.
2021-05-27 19:57:21 +09:00
smoogipoo
a74405d0ed Merge branch 'master' into restructure-spectator-client 2021-05-20 18:53:42 +09:00
smoogipoo
9d07749959 Improve implementation of TestSpectatorClient
There was a lot of weirdness here, such as storing the playing users,
clearing the playing users from test scenes (!!), and storing the users
being wathed.
This was all a thing because the previous implementation overrode the
base method implementations, which is no longer a thing.
2021-05-20 17:41:46 +09:00
smoogipoo
6beeb7f7c4 Rename SpectatorStreamingClient -> SpectatorClient 2021-05-20 15:55:07 +09:00
smoogipoo
d197a7f6f5 Rename multiplayer client classes 2021-05-20 15:39:45 +09:00
smoogipoo
5b03092968 Fix possible test failure 2021-05-13 11:53:50 +09:00
smoogipoo
273cd18b8a Use test streaming client in gameplay leaderboard test 2021-05-12 14:19:36 +09:00
smoogipoo
21fc0ba43b Combine test spectator streaming client implementations 2021-05-12 13:05:02 +09:00
smoogipoo
f5bc389998 Fix flaky tests 2021-05-11 19:31:32 +09:00
smoogipoo
bc4213eea1 Add test for changing back to idle on deletion 2021-05-11 19:26:58 +09:00
smoogipoo
7fe8737d94 Add failing tests 2021-05-11 19:21:44 +09:00
smoogipoo
811282a975 Add failing test 2021-05-11 19:01:41 +09:00
Dean Herbert
6da4105da6 Remove Sync namespace (feels unnecessary) 2021-05-03 13:38:53 +09:00
smoogipoo
94d0b06493 Expose mute adjustment instead 2021-04-26 19:01:30 +09:00
Dean Herbert
120fb8974d Combine more instances of test player IDs 2021-04-26 17:22:16 +09:00
Dean Herbert
737a15c2d4 Extract out test player IDs to constants 2021-04-26 17:04:39 +09:00
Dean Herbert
55f383c71e Rename test to match new MultiSpectatorLeaderboard class name 2021-04-26 16:48:40 +09:00
Dean Herbert
6d30a1a80f Reference constant for test startup delay 2021-04-26 16:45:20 +09:00
smoogipoo
b41897fd9b Rename testscene to match class 2021-04-23 19:23:52 +09:00
smoogipoo
b25340653d Fix failing tests 2021-04-23 00:49:14 +09:00
smoogipoo
4f0857f946 Xmldocs and general refactorings 2021-04-22 23:52:22 +09:00
smoogipoo
ee25949751 Rename classes 2021-04-22 23:39:02 +09:00
smoogipoo
64579d50ac Use only single PlayerInstance for hit sample playback 2021-04-22 22:59:47 +09:00
smoogipoo
2bea625613 Fix initial playback states not being correct 2021-04-21 23:22:11 +09:00
smoogipoo
d5b26b0ab5 Fix incorrect test spectator client implementation 2021-04-16 23:01:34 +09:00
smoogipoo
a7aa3cb263 Merge branch 'gcc-abstraction' into multiplayer-spectator-screen 2021-04-16 20:16:26 +09:00