1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 16:07:24 +08:00
Commit Graph

4800 Commits

Author SHA1 Message Date
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
Dean Herbert
dfb68904d7
Merge pull request #14266 from smoogipoo/fix-multi-navigation-test-failure
Fix multiplayer navigation test failure
2021-08-13 14:52:51 +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
smoogipoo
2850f6ce95 Privatise counter again 2021-08-13 13:24:05 +09:00
smoogipoo
ee034874bb Merge branch 'master' into remove-comments-page 2021-08-13 13:17:13 +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
00ca066c39
Merge pull request #14202 from gagahpangeran/changelog-supporter
Add supporter promo section in changelog overlay
2021-08-13 00:33:57 +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
Dean Herbert
524128441e Mark PollingComponent test as headless 2021-08-12 15:03:05 +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
Dan Balasescu
2c935df190
Merge pull request #14221 from peppy/bring-back-osu-game-test-scene
Bring back `TestSceneOsuGame`
2021-08-11 18:09:51 +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
0ffe740ca1 Bring back TestSceneOsuGame
I marked this as headless to avoid it being "ungrouped", but it turns
out this is quite useful to have around and I have searched for it on
multiple occasions.
2021-08-11 16:24:49 +09:00
Dean Herbert
c376e652a4 Convey and show team scores at the multiplayer results screen 2021-08-11 15:32:14 +09:00
Gagah Pangeran Rosfatiputra
f2f84a2e23
wait for content to load in test 2021-08-11 12:11:39 +07:00
Gagah Pangeran Rosfatiputra
6d763ca3c7
Merge branch 'master' into changelog-supporter 2021-08-11 10:47:51 +07:00
Dan Balasescu
56b23fc765
Merge branch 'master' into context-menu-sounds 2021-08-11 11:46:10 +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
Gagah Pangeran Rosfatiputra
595763ae34
add test case for supporter and non supporter 2021-08-10 14:58:11 +07:00
Dean Herbert
5ea7909eea Fix incorrectly failing test 2021-08-10 16:23:53 +09:00
Gagah Pangeran Rosfatiputra
bdf6c2a5ed
add changelog supporter promo test scene 2021-08-10 12:00:26 +07: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
Dean Herbert
0b76460043 Merge branch 'master' into lounge-redesign 2021-08-09 16:28:28 +09:00
Jamie Taylor
52400961f6
Add open/close sounds to context menus 2021-08-06 23:47:02 +09:00