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

43337 Commits

Author SHA1 Message Date
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
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