1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 19:32:58 +08:00
Commit Graph

43045 Commits

Author SHA1 Message Date
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
smoogipoo
83703e4283 Add colour provider to online play dependencies 2021-08-12 20:08:14 +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
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
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
524128441e Mark PollingComponent test as headless 2021-08-12 15:03:05 +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
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
543482111b Remove outdated todo 2021-08-12 10:40:14 +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
fbaa480b3e Fix out-of-order hits in editor causing exceptions 2021-08-12 10:08:54 +09:00
smoogipoo
bbb28d1b29 Don't use null-propagation for status 2021-08-12 09:14:46 +09:00
smoogipoo
58d76e9036 Use FinishTransforms() 2021-08-12 09:13:10 +09:00
Dan Balasescu
ce7ff04512
Merge pull request #14220 from peppy/update-framework
Update framework
2021-08-11 19:08:56 +09:00
smoogipoo
4002a1606e Round star ratings before comparing 2021-08-11 18:20:39 +09:00
smoogipoo
eb59f3c591 Revert "Buffer the entire star rating range to fix overlapping alpha"
This reverts commit c680012523.
2021-08-11 18:15:53 +09:00
smoogipoo
0f5bea235c Merge branch 'master' into lounge-redesign 2021-08-11 18:15:34 +09:00
Dan Balasescu
369794501b
Merge branch 'master' into update-framework 2021-08-11 18:11:36 +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
d6352637d6 Also add tooltip and context menu item 2021-08-11 17:45: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
7aab8c32ec Add kick button and hook up logic 2021-08-11 17:31:54 +09:00
Dean Herbert
e8ad0fba75 Add required server methods for kicking users 2021-08-11 17:20:41 +09:00
Dean Herbert
3f067e3a8d Remove likely unnecessary score null check 2021-08-11 16:59:42 +09:00
Dean Herbert
313db934da
Merge pull request #14148 from nekodex/context-menu-sounds
Add open/close sounds to context menus
2021-08-11 16:43:00 +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
d1dfb785d8
Merge branch 'master' into context-menu-sounds 2021-08-11 16:21:13 +09:00
Dean Herbert
f8683e2256 Update framework 2021-08-11 16:17:21 +09:00
Dean Herbert
ee3b373e8a Correctly handle tied scores 2021-08-11 14:48:37 +09:00
Dean Herbert
cf82bca09c Change logic to only handle the case of exactly two teams 2021-08-11 14:44:13 +09:00
Dan Balasescu
c54a37a4ca
Merge pull request #14218 from peppy/nub-animation-speed
Adjust checkbox / sliderbar animation speeds to match sound effects better
2021-08-11 12:56:14 +09:00
Dean Herbert
a3a9d0579f Adjust checkbox / sliderbar animation speeds to match sound effects better 2021-08-11 12:33:14 +09:00
Dan Balasescu
56b23fc765
Merge branch 'master' into context-menu-sounds 2021-08-11 11:46:10 +09:00
Dan Balasescu
298f7b9f18
Merge pull request #14173 from ggliv/catch-mod-mirror
Add "Mirror" mod to osu!catch
2021-08-11 10:09:18 +09:00
Dan Balasescu
a3159bda8c
Merge branch 'master' into catch-mod-mirror 2021-08-11 09:41:03 +09:00
Bartłomiej Dach
a9e53107d1
Also mirror banana showers 2021-08-10 22:33:28 +02:00