1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:42:58 +08:00
Commit Graph

43317 Commits

Author SHA1 Message Date
Dan Balasescu
444453c9e2
Merge branch 'master' into fix-mark-read-local-message 2021-08-16 11:28:57 +09:00
Dan Balasescu
411f92c936
Merge pull request #14321 from danielkariv/fixing-beatmap-details-icons-ui
Correct icons in beatmap details
2021-08-16 11:05:37 +09:00
Dean Herbert
f0fe79b568 Remove buffered container workarounds for now 2021-08-16 11:04:21 +09:00
Dean Herbert
d35886ef19 Reduce frame buffer render scale for blurred background 2021-08-16 11:03:49 +09:00
Dean Herbert
e8e387b549 Cache buffered background to fix multiplayer lounge performance
Consider this a request for comment. It's the cleanest solution I can
come up with without dropping either the blur, or use of
`ModelBackedDrawable`.

Intended to resolve https://github.com/ppy/osu/issues/14276.
2021-08-16 08:04:54 +09:00
Bartłomiej Dach
e744629a41
Fix broken obsoletion message 2021-08-16 01:01:56 +02:00
Daniel Kariv
38828b6b82 Updating beatmap details icons
changes the sizing and add yellow circle so the UI will fit more with osu-web style.
2021-08-16 00:40:31 +03:00
Daniel Kariv
f6773522d1 Correct icons in beatmap details
In relation to #13968. Replacing incorrect icons in beatmap details panel to correct ones from BeatmapStatisticsIcon class.
2021-08-16 00:12:27 +03:00
Bartłomiej Dach
6108451449
Retrieve separated skin instance from working beatmap for editing 2021-08-15 21:18:09 +02:00
Bartłomiej Dach
81280dfd25
Use editable skin structure in combo colour picker 2021-08-15 21:18:08 +02:00
Bartłomiej Dach
0d64da8c63
Add skin providing container responding to beatmap skin edits 2021-08-15 21:18:08 +02:00
Bartłomiej Dach
df43e758ee
Add editable beatmap skin 2021-08-15 21:18:07 +02:00
Opelkuh
8f698a42f7 Refactor MarkChannelAsRead test assert 2021-08-15 20:35:52 +02:00
Bartłomiej Dach
7c88a1c6de
Add a way to change custom combo colours via IHasComboColours
`IHasComboColours` was already mutable (via a strange
`AddComboColours()` method) and exposing a straight list is easier to
work with. `IHasCustomColours` is also similarly externally mutable (in
a way which is not easily removable).
2021-08-15 20:06:06 +02:00
Opelkuh
7d7c5c06f0 Fix code formatting 2021-08-15 16:02:25 +02:00
Opelkuh
2f9f1ba862 Add test for ChannelManager.MarkChannelAsRead 2021-08-15 15:44:23 +02:00
Bartłomiej Dach
3648e0ca26
Merge branch 'master' into auto-restart 2021-08-15 15:04:50 +02:00
Bartłomiej Dach
f9e2e80874
Add testing for auto-restart behaviour 2021-08-15 15:04:14 +02:00
Dan Balasescu
f49c9673cc
Merge pull request #14286 from kj415j45/readability-settings-rename
Rename element in OsuSettings enum
2021-08-15 18:13:10 +09:00
Jacob Van Meter
6472d85aae Added heart_size constant and adjusted the glow radius value
Added heart_size constant and adjusted the glow radius value to be more in line with the website
2021-08-14 21:48:57 -04:00
Opelkuh
7d6f7ac75e Fix mark channel as read error 2021-08-15 02:57:11 +02:00
Jacob Van Meter
71ccd38bb3 Corrected pippi background and promo positioning 2021-08-14 20:36:43 -04:00
Jacob Van Meter
772860232c Removed empty offset and corrected colour 2021-08-14 20:32:38 -04:00
Jacob Van Meter
95943fdb25 Add glow to supporter promo on changelog
Added glow to the supporter promo at the end of the changelog, as it is on the website.
2021-08-14 20:00:26 -04:00
Salman Ahmed
c8fb796660 Fix settings notice text class tinting everything with yellow 2021-08-14 20:14:28 +03:00
LiangXiang Shen
246a8882ce
Update translation key 2021-08-15 00:23:14 +08:00
Dean Herbert
9e799efb1d
Merge pull request #14291 from bdach/multi-leave-fix
Fix multiplayer client not leaving room
2021-08-15 00:52:42 +09:00
Bartłomiej Dach
498462dfd0
Fix room null-check racing against async schedule 2021-08-14 17:44:41 +02:00
kj415j45
c2bbe17562
Rename element in OsuSettings enum
`ShowProgressGraph` -> `ShowDifficultyGraph`
2021-08-14 22:35:15 +08:00
kj415j45
f87f86e671
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-08-14 22:24:57 +08:00
Dean Herbert
78ac092147
Merge pull request #14225 from peppy/multiplayer-kick-support-events
Add event flow for kick handling
2021-08-14 15:33:54 +09:00
Dean Herbert
b8c63eb1cb Merge branch 'master' into multiplayer-kick-support-events 2021-08-14 14:08:34 +09:00
Dean Herbert
e6b3aba6e1 Fix incorrectly directed call in TestMultiplayerClient 2021-08-14 14:08:29 +09:00
Dean Herbert
a10ba17b64
Merge pull request #14250 from peppy/leaderboard-limit-player-count
Add ability for gameplay leaderboard scroll when too many users are displayed
2021-08-14 14:08:18 +09:00
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