Commit Graph

42919 Commits

Author SHA1 Message Date
d9190607e4 Add test coverage for both teams winning 2021-08-12 20:21:53 +02:00
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
d08d22e3e9 Ensure tests wait for screen load 2021-08-12 19:57:05 +02:00
828268ad4d Add winner text background to increase contrast 2021-08-12 19:34:25 +02:00
4d26bb6714 Scale score panel to remove overlap with team score display 2021-08-12 19:27:32 +02:00
a223f111cb Move text to avoid overlapping the results panel 2021-08-11 15:50:01 +09:00
430a0e496c Add winner text 2021-08-11 15:32:14 +09:00
c376e652a4 Convey and show team scores at the multiplayer results screen 2021-08-11 15:32:14 +09:00
735c5085dd Fix match score display not doing an initial value update 2021-08-11 14:50:47 +09:00
ee3b373e8a Correctly handle tied scores 2021-08-11 14:48:37 +09:00
cf82bca09c Change logic to only handle the case of exactly two teams 2021-08-11 14:44:13 +09:00
a503274e1d Pass through MultiplayerRoomUsers instead of ints to avoid re-retrieval 2021-08-10 18:39:20 +09:00
53d03745e0 Remove unused test scene 2021-08-10 17:48:47 +09:00
498daef998 Merge branch 'master' into multiplayer-team-vs-leaderboard 2021-08-10 13:09:15 +09:00
6da977f99a Merge pull request #14178 from peppy/simplify-player-users-test-usage
Simplify method of marking players as playing in test scenes
2021-08-10 12:49:38 +09:00
478a7c15be Merge pull request #14172 from TheOmyNomy/fix-legacy-slider-body-colour-interpolation
Fix legacy slider body colour interpolation
2021-08-10 11:16:42 +09:00
c5b490c441 Use non linear colour interpolation for legacy health display 2021-08-10 11:29:31 +10:00
76e5a40b8e Remove unnecessary "in" keyword 2021-08-09 20:53:02 +10:00
58714dbe71 Fix ordering of teams to match colours 2021-08-09 19:48:53 +09:00
490f9e1848 Fix overlap in spectator view 2021-08-09 19:45:16 +09:00
fe7c1d0181 Merge branch 'simplify-player-users-test-usage' into multiplayer-team-vs-leaderboard 2021-08-09 19:24:35 +09:00
ea6e441dec Simplify method of marking players as playing in test scenes 2021-08-09 19:21:22 +09:00
551929cf5a Simplify method of marking players as playing in test scenes 2021-08-09 19:18:13 +09:00
5f3d087101 Also add team score display to multiplayer spectator screen 2021-08-09 19:17:51 +09:00
121648b593 Add gameplay-specific team score display which can expand and contract 2021-08-09 19:17:51 +09:00
24accdcab0 Add LegacyUtils class with non linear colour interpolation method 2021-08-09 18:56:47 +10:00
3686c657d2 Merge branch 'master' into fix-legacy-slider-body-colour-interpolation 2021-08-09 18:48:03 +10:00
359b6ec174 Merge pull request #14176 from peppy/update-framework
Update framework
2021-08-09 17:34:30 +09:00
ebbf6467e8 Support more than two teams 2021-08-09 17:23:02 +09:00
cdc173e867 Add tracking of team totals to leaderboard implementation 2021-08-09 17:08:32 +09:00
77c9aadd05 Add team colour support to multiplaye gameplay leaderboard panels 2021-08-09 17:06:25 +09:00
e1d4eee1d2 Add the ability to set custom overriding colours on GameplayLeaderboardScores 2021-08-09 17:06:21 +09:00
ab522e1569 Add test coverage of team display on leaderboard 2021-08-09 17:06:21 +09:00
1e5d9003d3 Add the ability for tests to alter the room and user states which during testing 2021-08-09 16:58:36 +09:00
1f69c61fd8 Update framework 2021-08-09 16:38:21 +09:00
0fa1f085df Store MultiplayerRoomUser as part of tracked data 2021-08-09 16:31:18 +09:00
54ffb8dc4e Add basic multiplayer gameplay test coverage 2021-08-09 16:31:18 +09:00
fcec714b4f Add safeties to avoid MultiplayerPlayer crashing when beatmap can't be loaded 2021-08-09 16:31:18 +09:00
aa4c6b9341 Bring across tournament score display for game usage 2021-08-09 16:30:37 +09:00
e08b1223ab Move team colours to OsuColour 2021-08-09 16:30:37 +09:00
aa6abb3e33 Merge pull request #14175 from Joehuu/replace-appveyor-badge
Update build status badge to github actions
2021-08-09 15:31:09 +09:00
a552b659d3 Update build status badge to github actions 2021-08-08 19:36:27 -07:00
140d29d537 Use helper methods instead of local valueAt() method 2021-08-08 23:54:35 +10:00
9e805dcd44 Fix legacy slider body colour interpolation 2021-08-08 21:27:32 +10:00
c8a0b6058f Merge pull request #14147 from nekodex/more-missing-sounds
Misc hover/select sound usage updates
2021-08-08 04:14:04 +09:00
db270a79ab Update resources 2021-08-08 03:54:20 +09:00
404a4234cb Merge branch 'master' into more-missing-sounds 2021-08-08 03:49:17 +09:00
ff1730f9f8 Do not play open/close samples for top-level menus 2021-08-07 14:38:54 +02:00
a9c99f149a Merge pull request #14149 from peppy/update-framework
Update framework
2021-08-07 02:04:08 +09:00
2f187cb90f Update framework 2021-08-07 01:17:58 +09:00