1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 10:27:35 +08:00
Commit Graph

43178 Commits

Author SHA1 Message Date
Bartłomiej Dach
e79150d4da
Reorder constructor arguments for HitExplosionEntry 2021-08-12 21:48:08 +02:00
Bartłomiej Dach
f3045b3152
Add comment about swapped sprite names 2021-08-12 21:48:07 +02:00
Bartłomiej Dach
68f454b51a
Enable NRT in explosion-related classes and streamline null handling 2021-08-12 21:48:07 +02: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
Bartłomiej Dach
828268ad4d
Add winner text background to increase contrast 2021-08-12 19:34:25 +02:00
Bartłomiej Dach
4d26bb6714
Scale score panel to remove overlap with team score display 2021-08-12 19:27:32 +02:00
TheOmyNomy
c56f38dcbc
Merge branch 'master' into legacy-cursor-trail-adjustments 2021-08-13 03:16:44 +10: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
TheOmyNomy
1069f9d501 Always add cursor trail for legacy cursor with disjoint trail 2021-08-13 00:13:03 +10:00
Gagah Pangeran Rosfatiputra
66ba24e865
create local link flow container 2021-08-12 20:36:47 +07:00
Gagah Pangeran Rosfatiputra
40db228e91
change to osu text flow container 2021-08-12 19:34:44 +07:00
Dean Herbert
8249ce7988
Merge branch 'master' into multiplayer-header-redesign 2021-08-12 21:00:46 +09:00
Dean Herbert
9e8137c6e4
Merge pull request #14127 from smoogipoo/lounge-redesign
Implement new multiplayer/playlists lounge screen designs
2021-08-12 21:00:28 +09:00
Salman Ahmed
bb1d74255e Remove unrequired parenthesis 2021-08-12 14:16:20 +03:00
Salman Ahmed
3d7866e82d Calculate horizontal offset on present overlays only 2021-08-12 14:15:01 +03:00
smoogipoo
83703e4283 Add colour provider to online play dependencies 2021-08-12 20:08:14 +09:00
smoogipoo
03351cf434 Add blur to background 2021-08-12 20:01:53 +09:00
smoogipoo
050f2d6b0d Add background to room subscreen 2021-08-12 19:51:03 +09:00
smoogipoo
047b37788b Merge online play filter control with the lounge subscreen 2021-08-12 19:48:15 +09:00
Dean Herbert
e89aea1fc2 Add some padding between scroll bar and content 2021-08-12 19:47:26 +09:00
Dean Herbert
10195e0c53 Add total user count 2021-08-12 19:47:26 +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
127fd4d292 Match font weight of design for hidden user count 2021-08-12 19:47:26 +09:00
Dean Herbert
2c07b68f6f Fix incorrect colour for hidden user display 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
smoogipoo
ab7bd1df9d Use full-screen background 2021-08-12 19:27:06 +09:00
Gagah Pangeran Rosfatiputra
18684ad21f
remove colour creation in add link 2021-08-12 17:08:54 +07:00
Gagah Pangeran Rosfatiputra
98859b3759
cache pink colour provider
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-12 17:06:11 +07:00
Gagah Pangeran Rosfatiputra
8b29f52d9f
update supporter note text
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-12 16:54:58 +07:00
Salman Ahmed
b58b5ec2b4 Apply horizontal offset changing once per frame
The previous way was causing every-frame invalidation when an overlay is
visible.
2021-08-12 12:44:38 +03:00
smoogipoo
b75c20fee4 Adjust positioning and paddings 2021-08-12 18:02:00 +09:00
smoogipoo
3b7aa262d5 Make header overlap content 2021-08-12 16:52:35 +09:00
smoogipoo
d07bb10d02 Remove breadcrumbs from header 2021-08-12 16:52:30 +09:00
Dean Herbert
ab1cc6ad48 Fix padding around recent participants icon being uneven 2021-08-12 16:50:09 +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
979495ddb2
Merge pull request #14248 from peppy/polling-component-test-headless
Mark `PollingComponent` test as headless
2021-08-12 16:08: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
Dean Herbert
4d6101f4e5 Lease selected room while in match screen to avoid lounge potentially changing it 2021-08-12 14:56:58 +09:00
Dean Herbert
054e0e8eed
Merge pull request #14241 from smoogipoo/fix-osu-editor-exception
Fix out-of-order hits in editor causing exceptions
2021-08-12 12:40:00 +09:00
Dean Herbert
ee4fc049bc
Merge branch 'master' into fix-osu-editor-exception 2021-08-12 12:15:04 +09:00
Dan Balasescu
448b66f36c
Merge pull request #14224 from peppy/multiplayer-kick-support
Add kick button (and required server shared interface updates)
2021-08-12 12:09:16 +09:00
Dan Balasescu
60e988aac3
Merge branch 'master' into multiplayer-kick-support 2021-08-12 11:46:56 +09:00
Dan Balasescu
7742749b71
Merge pull request #14179 from peppy/multiplayer-team-vs-leaderboard
Show team colours in gameplay leaderboard and add a team score bar
2021-08-12 11:46:48 +09:00