1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 21:43:21 +08:00
Commit Graph

483 Commits

Author SHA1 Message Date
smoogipoo
4b198d14eb Initial refactor of RoomSubScreen 2021-08-17 17:05:20 +09:00
Dean Herbert
a901fca54a
Merge branch 'master' into multi-polling-request-refactor 2021-08-17 16:23:46 +09:00
Dean Herbert
6a2d82c81a Add test coverage 2021-08-17 16:17:31 +09:00
Dean Herbert
e3b29df299 Add test scene for MultiplayerPlayer 2021-08-17 16:16:49 +09:00
smoogipoo
f4b7ee5c7f Merge branch 'master' into hide-player-settings-overlay 2021-08-17 13:44:33 +09:00
smoogipoo
5214731dc1 Refactor test a bit 2021-08-17 09:45:10 +09:00
smoogipoo
b672d4b936 Refactor RequestHandlingMultiplayerRoomManager to avoid confusion 2021-08-17 09:43:37 +09:00
smoogipoo
352949069a Move filter to LoungeSubScreen 2021-08-17 09:36:43 +09:00
smoogipoo
6320768a67 Merge branch 'master' into multi-polling-request-refactor 2021-08-17 08:44:56 +09:00
Salman Ahmed
67bac207cf Cover kicking a multiplayer room user with null User 2021-08-16 09:37:31 +03:00
Salman Ahmed
f82ed64aa7 Fix participant panel null user test no longer functioning properly
I guess the changes that involved `MultiplayerTestScene` having a test
user lookup cache caused this test case to false-pass silently.

Added an explicit assert which ensures the added user indeed has a null
`User` value.
2021-08-16 09:07:00 +03:00
Salman Ahmed
53c3eccfb5 Force HUD visibility mode to "Always" during testing 2021-08-16 07:21:37 +03:00
smoogipoo
08d347f10b Merge branch 'master' into multi-polling-request-refactor 2021-08-16 13:12:08 +09:00
Bartłomiej Dach
8f3fedade3
Merge branch 'master' into multiplayer-team-vs-results 2021-08-13 21:30:44 +02:00
Bartłomiej Dach
2e9ab78275
Split test scene into two to follow class split 2021-08-13 21:30:26 +02:00
Salman Ahmed
1fed9193f8 Revert reverted segment to fix failure 2021-08-13 15:24:10 +03:00
Salman Ahmed
c32ba9e38f Remove arbitrarily-set wait step with until step instead, keeping the comment 2021-08-13 15:06:11 +03:00
Salman Ahmed
7cf6b551d3 Replace until step with wait step with explanatory comment 2021-08-13 13:01:17 +03:00
smoogipoo
fbadc4897e Remove test scene 2021-08-13 18:28:20 +09:00
Salman Ahmed
f5cea0cacd Fix failing test and rename to match new behaviour 2021-08-13 12:12:20 +03:00
smoogipoo
8910781bcd Move listing polling component to LoungeSubScreen 2021-08-13 17:39:09 +09:00
Dean Herbert
df24f7a81e
Merge pull request #14256 from smoogipoo/multiplayer-header-redesign
Update multiplayer header to the latest designs
2021-08-13 16:16:25 +09:00
Dean Herbert
732dcd30c7 Merge branch 'master' into multiplayer-team-vs-results 2021-08-13 16:03:10 +09:00
Dean Herbert
699a61500a
Merge pull request #14264 from smoogipoo/fix-multi-spectate-test-failure
Fix multiplayer spectating test failures
2021-08-13 14:53:11 +09:00
smoogipoo
755b6460b6 Fix multiplayer navigation test failure 2021-08-13 14:05:44 +09:00
smoogipoo
8fc0edb283 Fix some multiplayer test failures 2021-08-13 13:54:52 +09:00
Salman Ahmed
fc22e806f4 Cover newly hidden/expired elements in existing test 2021-08-13 07:30:24 +03:00
Salman Ahmed
1892db7f37 Add test coverage 2021-08-13 06:38:28 +03:00
smoogipoo
7aa361d772 Remove now-incorrect test 2021-08-13 09:02:19 +09:00
Bartłomiej Dach
70005cb39d
Merge branch 'master' into multiplayer-team-vs-results 2021-08-12 20:39:48 +02:00
Bartłomiej Dach
53b4cdfb02
Handle ties in team vs. results screen 2021-08-12 20:38:24 +02:00
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