1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

43399 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
9c839a6d1e
Merge pull request #14258 from TheOmyNomy/legacy-cursor-trail-adjustments
Always show cursor trail for legacy cursor with disjoint trail
2021-08-13 16:00:40 +09:00
Dean Herbert
248805da1a
Merge pull request #14239 from bdach/catch-legacy-explosions-v2
Implement legacy hit explosions for osu!catch
2021-08-13 15:38:40 +09:00
Dean Herbert
dd7ca4b77b Increase "create room" button height 2021-08-13 15:35:45 +09:00
Salman Ahmed
543f6039e2 Display on Windows and Linux only 2021-08-13 09:26:53 +03:00
Dean Herbert
3b6a8a2bae Rename background sprite and reduce load delay 2021-08-13 15:25:00 +09:00
Dean Herbert
5cec50bdd1 Add comment mentioning why event bindings are not unbound 2021-08-13 15:24:43 +09:00
Salman Ahmed
c5ee8753b4 Notify users to read OpenTabletDriver's FAQ when tablet not detected 2021-08-13 09:20:52 +03:00
Dean Herbert
bf024fbd21
Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 15:06:37 +09:00
Dean Herbert
76b1c76dbf Merge branch 'master' into legacy-cursor-trail-adjustments 2021-08-13 14:55:34 +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
Dean Herbert
7c64735b79
Merge pull request #14265 from peppy/update-framework
Update framework
2021-08-13 14:51:49 +09:00
Dean Herbert
90755c0307 Replace condition with matching precalculated bool 2021-08-13 14:50:59 +09:00
Dean Herbert
93574acf72 Fix exception messaging 2021-08-13 14:46:57 +09:00
Dean Herbert
641d57e5e1 Change scroll container subclass name to hopefully read better 2021-08-13 14:46:28 +09:00
Dean Herbert
a1b72e7f97 Remove redundant array type specification 2021-08-13 14:41:07 +09:00
Dean Herbert
b9721f5261 Centralise screen exit logic and guard against non-current screen 2021-08-13 14:39:03 +09:00
Dean Herbert
0f45155b8e Fix remaining cases of invalid bindable operations during lease 2021-08-13 14:29:28 +09:00
Dean Herbert
92d4c9224a Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 14:28:14 +09:00
Dean Herbert
89eded457c Fix weird margins on loading display in lounge 2021-08-13 14:27:28 +09:00
Dan Balasescu
066473393c
Merge branch 'master' into catch-legacy-explosions-v2 2021-08-13 14:12:02 +09:00
Dan Balasescu
80d06a7e37
Merge pull request #8010 from EVAST9919/remove-comments-page
Remove CommentsPage component and move it's logic to CommentsContainer
2021-08-13 14:11:14 +09:00
smoogipoo
755b6460b6 Fix multiplayer navigation test failure 2021-08-13 14:05:44 +09:00
Dean Herbert
8fd6a9eb4b Update framework 2021-08-13 14:01:38 +09:00
smoogipoo
8fc0edb283 Fix some multiplayer test failures 2021-08-13 13:54:52 +09:00
Salman Ahmed
fc22e806f4 Cover newly hidden/expired elements in existing test 2021-08-13 07:30:24 +03:00
Salman Ahmed
34c2b317e2 Hide song progress bar on multi-spectator player 2021-08-13 07:30:09 +03:00
Salman Ahmed
e7cf6b2d23 Expire hold-to-quit button on multi-spectator player 2021-08-13 07:29:55 +03:00
Salman Ahmed
8dc7a925e7 Expire instead of hiding and disabling visibility state
Since it's a temporary change until the spectator interface gets
improved, no need to add further logic.
2021-08-13 07:28:59 +03:00
smoogipoo
2850f6ce95 Privatise counter again 2021-08-13 13:24:05 +09:00
Dean Herbert
e93660c0f4 Update resources 2021-08-13 13:19:34 +09:00
LiangXiang Shen
cbeecff347
Apply suggestions from code review
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2021-08-13 12:17:38 +08:00
smoogipoo
ee034874bb Merge branch 'master' into remove-comments-page 2021-08-13 13:17:13 +09:00
smoogipoo
e913c8f92f Change strings to verbatim 2021-08-13 13:07:02 +09:00
smoogipoo
55ddc2c6e3 Merge branch 'master' into fix-blinds-barrel-roll-compatibility 2021-08-13 12:45:04 +09:00
Salman Ahmed
1892db7f37 Add test coverage 2021-08-13 06:38:28 +03:00
Salman Ahmed
c10320f239 Hide and disable player settings overlay on multi-spectator player 2021-08-13 06:35:16 +03:00
Salman Ahmed
2b86416cb2 Hide player settings overlay on multi-spectator player loader 2021-08-13 06:35:16 +03:00
smoogipoo
7cc0a2a76f Refactor to fix InterpolateMovements=false 2021-08-13 12:10:33 +09:00
smoogipoo
5241029513 Use new FadeExponent shader uniform 2021-08-13 10:27:26 +09:00
smoogipoo
7aa361d772 Remove now-incorrect test 2021-08-13 09:02:19 +09:00
Bartłomiej Dach
b84f238106
Adjust scaling numbers to be closer to stable 2021-08-12 22:33:12 +02:00
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