Commit Graph

11110 Commits

Author SHA1 Message Date
b1efc6d763 Merge branch 'master' into local-user-play-info 2021-08-17 16:23:44 +09:00
6ee6a46894 Remove unnecessary public prefix in interface specification 2021-08-17 16:22:14 +09:00
124f149cb5 Add key binding to focus chat input 2021-08-17 16:17:31 +09:00
30eee363dc Add chat display during multiplayer gameplay 2021-08-17 16:17:31 +09:00
0d283aa6a3 Expose LocalUserPlaying from Player 2021-08-17 16:16:49 +09:00
82eddeffef Add LocalUserPlayInfo interface to convey common information about player status 2021-08-17 16:15:47 +09:00
3a7b9bf096 Fix MatchSettingsOverlay not resetting focus on hide properly 2021-08-17 08:56:49 +03:00
f4b7ee5c7f Merge branch 'master' into hide-player-settings-overlay 2021-08-17 13:44:33 +09:00
081524b6c8 Privatise setters 2021-08-17 13:44:21 +09:00
b419ea716b Refactor beatmap info wedge to not fully refresh on star difficulty change
Makes it look awkward when changing difficulty via mod settings for
example.

Now the changes should instead only affect the displayed components which consume it
directly.
2021-08-17 05:46:06 +03:00
1e282432c9 Fix password in a better way 2021-08-17 09:40:25 +09:00
352949069a Move filter to LoungeSubScreen 2021-08-17 09:36:43 +09:00
97d5b80834 Fix joining with incorrect password 2021-08-17 09:18:21 +09:00
6320768a67 Merge branch 'master' into multi-polling-request-refactor 2021-08-17 08:44:56 +09:00
78f9f4a230 Move time clamp to Seek/transformSeekTo methods 2021-08-16 20:39:09 +02:00
a0a9777109 Fix merge conflicts. 2021-08-16 14:50:00 +02:00
1f942d15f8 Localise scoreboard 2021-08-16 13:38:57 +02:00
7bebbf9f74 Mark format strings as verbatim. 2021-08-16 12:46:41 +02:00
3ad7688eaf Merge pull request #14339 from peppy/revert-breaking-config-rename
Revert "Rename element in OsuSettings enum"
2021-08-16 19:18:22 +09:00
1c7cbc8621 Add missing readonly keyword to new bindable 2021-08-16 17:14:13 +09:00
8555a465ac Merge pull request #14318 from bdach/editor-colours-save
Add support for saving edited combo colours and displaying them in composer
2021-08-16 17:07:53 +09:00
fc89f2bac4 Revert "Rename element in OsuSettings enum"
This reverts commit c2bbe17562.
2021-08-16 16:56:48 +09:00
8d45f86bd3 Rename variable to better reflect its purpose 2021-08-16 16:48:40 +09:00
ae8a1adae8 Allow seeking via Player.Seek even if disabled 2021-08-16 16:47:57 +09:00
838bcc51b2 Avoid new bindable requirement 2021-08-16 16:27:19 +09:00
81480ac4fc Use PlayerConfiguration to convey no-seek state 2021-08-16 16:16:02 +09:00
7fe6f6dd14 Fix kick button action asserting and using User.User.ID rather than User.UserID 2021-08-16 09:47:23 +03:00
79cd062784 Let TeamDisplay take the full MultiplayerRoomUser rather than the underlying User 2021-08-16 09:47:23 +03:00
08d347f10b Merge branch 'master' into multi-polling-request-refactor 2021-08-16 13:12:08 +09:00
b6a2020c59 General refactorings from PR review 2021-08-16 13:09:04 +09:00
81f9442471 Inline update/addRoom in usage sites 2021-08-16 13:04:06 +09:00
554b09ac1b Fix SkinnableTargetsContainer blocked from processing scheduled tasks 2021-08-16 06:57:45 +03:00
f0fe79b568 Remove buffered container workarounds for now 2021-08-16 11:04:21 +09:00
d35886ef19 Reduce frame buffer render scale for blurred background 2021-08-16 11:03:49 +09:00
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
cc3468b4ab apply suggestions
- make `UserActivity.InGame` and derive that to `InSoloGame` and `InMultiplayerGame`
- rename `SoloGame` to `InSoloGame`
- rename `MultiplayerGame` to `InMultiplayerGame`
2021-08-16 06:32:33 +08:00
6108451449 Retrieve separated skin instance from working beatmap for editing 2021-08-15 21:18:09 +02:00
81280dfd25 Use editable skin structure in combo colour picker 2021-08-15 21:18:08 +02:00
0d64da8c63 Add skin providing container responding to beatmap skin edits 2021-08-15 21:18:08 +02:00
df43e758ee Add editable beatmap skin 2021-08-15 21:18:07 +02:00
d287db7961 Clamping seekTime to beatmap length 2021-08-15 14:48:56 +02:00
2cc096101e trim whitespace 2021-08-15 18:56:24 +08:00
2ddf28346a PlayerSettingsGroups -> PlayerSettings 2021-08-14 19:58:20 +03:00
4ed06a1021 apply suggestions 2021-08-14 22:39:12 +08:00
c2bbe17562 Rename element in OsuSettings enum
`ShowProgressGraph` -> `ShowDifficultyGraph`
2021-08-14 22:35:15 +08:00
a553942a7f update InitialActivity on multiplayer Player and SongSelect 2021-08-14 13:20:36 +08:00
b8c63eb1cb Merge branch 'master' into multiplayer-kick-support-events 2021-08-14 14:08:34 +09:00
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
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
00317c0e30 Round when totalling up team scores instead of truncating
Matches score handling in `ScoreManager`.
2021-08-13 23:44:07 +02:00