1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 15:17:28 +08:00
Commit Graph

43408 Commits

Author SHA1 Message Date
Dean Herbert
b265505e58
Merge pull request #14278 from bdach/team-score-display-unify
Unify team score display logic with other components
2021-08-14 13:52:04 +09:00
kj415j45
e26ccf786e
code style format 2021-08-14 11:04:38 +08:00
kj415j45
5cfb89f18a
Apply suggestions from code review
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2021-08-14 10:56:52 +08:00
Bartłomiej Dach
e2cc96097f
Unify match score display formatting
Commas are already applied on the multiplayer leaderboard, as well as
the results screen.
2021-08-13 23:57:51 +02:00
Bartłomiej Dach
00317c0e30
Round when totalling up team scores instead of truncating
Matches score handling in `ScoreManager`.
2021-08-13 23:44:07 +02:00
Bartłomiej Dach
0642a337df
Merge pull request #14219 from peppy/multiplayer-team-vs-results
Show team versus team scores and winner at the results screen
2021-08-13 22:32:09 +02:00
Bartłomiej Dach
8f3fedade3
Merge branch 'master' into multiplayer-team-vs-results 2021-08-13 21:30:44 +02:00
Bartłomiej Dach
2e9ab78275
Split test scene into two to follow class split 2021-08-13 21:30:26 +02:00
Dean Herbert
74ddaa1840
Merge pull request #14275 from smoogipoo/hide-beatmap-wedge-left-border
Hide left border of beatmap wedge
2021-08-14 01:23:25 +09:00
smoogipoo
0e66a05963 Hide left border of beatmap wedge 2021-08-13 22:29:22 +09:00
smoogipoo
1c0ffd4621 Merge branch 'master' into multi-polling-request-refactor 2021-08-13 22:24:01 +09:00
Dan Balasescu
7725336008
Merge pull request #14249 from peppy/fix-playlists-cross-ruleset-entry
Fix entering a playlist room potentially showing settings screen incorrectly
2021-08-13 22:22:34 +09:00
smoogipoo
155e9e16a5 Refactorings 2021-08-13 22:09:47 +09:00
smoogipoo
d57508853e Merge branch 'master' into multi-polling-request-refactor 2021-08-13 22:04:31 +09:00
smoogipoo
1fcb1cdb10 Add todo 2021-08-13 22:01:47 +09:00
smoogipoo
44b3e3bfac Merge branch 'master' into fix-playlists-cross-ruleset-entry 2021-08-13 21:58:15 +09:00
Salman Ahmed
1fed9193f8 Revert reverted segment to fix failure 2021-08-13 15:24:10 +03:00
Salman Ahmed
c32ba9e38f Remove arbitrarily-set wait step with until step instead, keeping the comment 2021-08-13 15:06:11 +03:00
Salman Ahmed
7cf6b551d3 Replace until step with wait step with explanatory comment 2021-08-13 13:01:17 +03:00
Dean Herbert
8742fa3f68
Merge pull request #13971 from aitani9/fix-blinds-barrel-roll-compatibility
Make blinds move correctly when barrel roll mod is active
2021-08-13 18:48:13 +09:00
smoogipoo
fbadc4897e Remove test scene 2021-08-13 18:28:20 +09:00
smoogipoo
c71a581106 Fix exception when leaving match 2021-08-13 18:24:19 +09:00
smoogipoo
1f992e67f3 Fix listing polling rate when entering room 2021-08-13 18:17:25 +09:00
kj415j45
d527eb3d8b
Apply suggestions from code review
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-13 17:15:18 +08:00
smoogipoo
1bae7173d3 Fix initial multiplayer poll 2021-08-13 18:14:02 +09:00
smoogipoo
6a46105b5e Fix incorrect dependency 2021-08-13 18:12:32 +09:00
Salman Ahmed
f5cea0cacd Fix failing test and rename to match new behaviour 2021-08-13 12:12:20 +03:00
smoogipoo
83935540ca Add selection polling component to PlaylistsRoomSubScreen 2021-08-13 18:11:52 +09:00
Dan Balasescu
62970108df
Merge pull request #14269 from peppy/remove-unnecessary-delimiters
Fix searches at song select with '!' or ',' not matching as expected
2021-08-13 18:00:11 +09:00
Dean Herbert
72268d3e8a
Merge pull request #14150 from frenzibyte/improve-screen-offsetting
Improve overlay screen offsetting logic to be position-based
2021-08-13 17:59:41 +09:00
smoogipoo
7cbf4c48ed Fix multiplayer polling when not connected 2021-08-13 17:59:18 +09:00
Dan Balasescu
329ec62d62
Merge pull request #14267 from peppy/fix-loading-screen-depth
Fix weird margins on loading display in lounge
2021-08-13 17:55:07 +09:00
smoogipoo
8910781bcd Move listing polling component to LoungeSubScreen 2021-08-13 17:39:09 +09:00
Salman Ahmed
f43ab323ff Add shared class for notice text in settings 2021-08-13 11:12:44 +03:00
Dean Herbert
5a60b39643 Remove unnecessary delimiters from song select filter splitting 2021-08-13 16:42:58 +09:00
Dean Herbert
93b97e5110 Adjust ratio to match previous behaviour 2021-08-13 16:35:22 +09:00
Dean Herbert
da18c399e2 Remove unnecessary IsPresent override 2021-08-13 16:33:00 +09:00
Dean Herbert
c1d67976e6 Rename const, add xmldoc and make protected 2021-08-13 16:29:36 +09:00
Dean Herbert
bb36d1614f
Merge branch 'master' into improve-screen-offsetting 2021-08-13 16:23:02 +09:00
Dean Herbert
db52549152 Move below everything rather than proxying (works better with new design) 2021-08-13 16:20:53 +09:00
Dean Herbert
6a95fa0278 Merge branch 'master' into fix-loading-screen-depth 2021-08-13 16:20:38 +09:00
Dean Herbert
df24f7a81e
Merge pull request #14256 from smoogipoo/multiplayer-header-redesign
Update multiplayer header to the latest designs
2021-08-13 16:16:25 +09:00
Salman Ahmed
cd842ccef8
Improve message
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-08-13 10:15:50 +03:00
Dean Herbert
f9f3339885 Fix vertical offset not being handled correctly during score panel detach process 2021-08-13 16:14:23 +09:00
Dan Balasescu
f47f2b43b0
Merge branch 'master' into fix-loading-screen-depth 2021-08-13 16:09:00 +09:00
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