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

4854 Commits

Author SHA1 Message Date
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
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
smoogipoo
047b37788b Merge online play filter control with the lounge subscreen 2021-08-12 19:48:15 +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
e84224f64c Rename AddPlayer method now that there's no conflict 2021-08-12 16:20:37 +09:00
Dean Herbert
68dbbc17e8 Add support for automatic scrolling in gameplay leaderboard 2021-08-12 16:20:37 +09:00
smoogipoo
14fe2eea2a Add empty step to multiplayer TestEmpty() test 2021-08-12 16:20:08 +09:00
Dean Herbert
f4591b01d7 Add test step to show leaderboard in expanded state by default 2021-08-12 15:21:00 +09:00
Dean Herbert
b713ba1bd4 Add test coverage 2021-08-12 15:12:48 +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
Salman Ahmed
d099bb8ab6 Calculate offsets from overlay ScreenSpaceDrawQuads instead 2021-08-07 21:08:26 +03:00
Salman Ahmed
19a19f915c Adjust settings panel to autosize to zero when hiding it
Previously, when hiding the settings overlay, it remains to have a width
of `56` (sidebar width), this is due to the panel content being placed
next to the sidebar, so therefore the content has to move 400
(PANEL_WIDTH) + 56 (sidebar_width) backwards, for the overlay to have a
width of 0 on hide.
2021-08-07 21:07:08 +03:00
Salman Ahmed
ae733e202f Fix tests executing before overlays load 2021-08-07 00:36:52 +03:00
Salman Ahmed
8dc0650ca7 Add test coverage 2021-08-06 22:56:43 +03:00
Jamie Taylor
52400961f6
Add open/close sounds to context menus 2021-08-06 23:47:02 +09:00
smoogipoo
bdfdd00afe Adjust spacings and sizings of left-side details 2021-08-06 18:52:01 +09:00
Dean Herbert
6164903fec
Merge branch 'master' into new-difficulty-colours 2021-08-06 18:05:53 +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
Salman Ahmed
d0ce0cf9f5 Merge branch 'master' into new-difficulty-colours 2021-08-04 17:12:15 +03: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
Salman Ahmed
692e320ea5 Add visual test scene 2021-08-03 15:02:18 +03: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
118e13227a Update existing test to make use of ManualInputManager.Keys 2021-08-03 19:08:59 +09:00
smoogipoo
11b9ba86cb Fix TestSceneSpectator reusing cached spectator client 2021-08-03 18:28:08 +09:00
smoogipoo
062207fcd9 Fix TestSceneCurrentlyPlayingDisplay reusing cached spectator client 2021-08-03 18:16:58 +09:00
Salman Ahmed
db760b0dbf Merge branch 'master' into localisation-header 2021-08-03 05:16:02 +03:00
Bartłomiej Dach
4334121e8e
Add testing for colour palette behaviour 2021-07-31 23:52:33 +02:00
Bartłomiej Dach
3f005886d6
Add support for removing colours from palette 2021-07-31 23:52:33 +02:00
Dean Herbert
665bd3690a Add a few cases of missing ConfigureAwait calls in tests project 2021-07-30 15:27:24 +09:00
Bartłomiej Dach
0691c0dd63
Switch Colour{Display,Palette} to use Colour4 2021-07-29 23:14:32 +02:00
Dan Balasescu
6f35036f53
Merge pull request #14027 from gagahpangeran/comment-markdown
Add support for markdown in comments
2021-07-27 14:38:59 +09:00
Dan Balasescu
7ae1b5bae7
Merge pull request #14022 from peppy/fix-invalid-ruleset-causing-crash
Fix invalid/unavailable ruleset causing game-wide crash
2021-07-27 02:39:26 +09:00
Gagah Pangeran Rosfatiputra
dc864abbd8
add link test 2021-07-26 21:08:57 +07:00
Gagah Pangeran Rosfatiputra
f80c46e2a0
add heading test 2021-07-26 21:04:08 +07:00
Gagah Pangeran Rosfatiputra
55e8a44db6
add test for DrawableComment
Can reproduce the issue at https://github.com/ppy/osu/issues/13993
2021-07-26 18:15:59 +07:00
Dean Herbert
04c8ea2813 Add failing test for the global ruleset being set to an invalid value 2021-07-26 16:33:56 +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
Salman Ahmed
5141bf66eb Add failing test case 2021-07-26 04:41:47 +03:00
Dean Herbert
84b67deb4d
Merge pull request #13958 from ByAgenT/refactor-keybindings-overlay
Move and merge Overlays.KeyBinding into Overlays.Settings.Sections.Input
2021-07-22 15:16:04 +09:00
Dan Balasescu
4c63e8e036
Merge pull request #13964 from peppy/fix-mod-overflow
Fix mod display overflowing on contracted results panels
2021-07-21 18:52:00 +09:00
Dean Herbert
adda96ac86
Merge pull request #13962 from ekrctb/platform-action
Adapt to framework `PlatformAction` type change
2021-07-21 18:17:38 +09:00
Dean Herbert
a261f1ef8f
Merge pull request #13960 from ekrctb/selection-box-can-flip
Allow specifying different value of scaling and flipping support for a selection box
2021-07-21 18:05:18 +09:00
Dan Balasescu
b390018e64
Merge branch 'master' into fix-mod-overflow 2021-07-21 17:26:47 +09:00
Dan Balasescu
b556d6d382
Merge pull request #13963 from peppy/tidy-mod-display
Tidy up `ModDisplay`
2021-07-21 17:26:39 +09:00