Commit Graph

29977 Commits

Author SHA1 Message Date
a831744f05 Merge remote-tracking branch 'origin/chat-mention-fix' into chat-mention-fix 2021-12-14 16:24:05 +01:00
8e79fac389 Fixes code quality check failed 2021-12-14 16:23:51 +01:00
51b6b9d857 Merge branch 'master' into chat-mention-fix 2021-12-14 11:49:57 +09:00
a076eda834 Merge pull request #16062 from smoogipoo/retry-score-submission-timeout
Increase score submission timeout
2021-12-14 11:03:20 +09:00
419a34e7b4 Merge branch 'master' into test-score-refactoring 2021-12-14 07:30:06 +09:00
7564658b5e Reduce to 30s 2021-12-14 06:40:45 +09:00
b0d14526ea Move test ScoreInfo creation to TestResources
The main goal here is to remove the inheritance, since realm doesn't
like that. Unfortunate that we can't use object initialisers in a few of
these places, but no real way around that.
2021-12-13 16:34:50 +09:00
7318ff3f98 Refactor KeyBindingStore to clean up any excess bindings for individual actions
While this isn't strictly required (outside of rulesets, potentially),
I think it's best that we keep these counts in a sane state.

Right now, it will remove any excess. Arguably, in the case an entry is
found with too many, we should wipe all entries and re-populate the
defaults. Interested in opinions on that before merging. See
https://github.com/ppy/osu/discussions/15925 for an example where wiping
may be the more appropriate behaviour.
2021-12-13 15:26:51 +09:00
c375c87094 Merge pull request #16065 from frenzibyte/reorder-version-overlay
Display game version overlay behind the overlays layer
2021-12-13 13:25:30 +09:00
d0fbbf110b Expose ScreenContainer for access in OsuGameDesktop 2021-12-13 06:52:36 +03:00
fd979a52fe Increase score submission request timeout to 60s 2021-12-13 07:15:21 +09:00
2cd2b10ce1 Fix results sometimes showing incorrect score position 2021-12-13 06:54:57 +09:00
1aac978a7b Merge pull request #16029 from peppy/editor-mod-reset
Fix editor not resetting mods when entering
2021-12-11 20:20:11 +09:00
63a017bc8e Use Array.Empty instead 2021-12-11 19:33:37 +09:00
cdb8237a4b Merge branch 'master' into pre-realm-score-tidy 2021-12-11 19:25:39 +09:00
3a4266bd5e Merge branch 'master' into update-framework 2021-12-10 17:50:33 +03:00
c1b3ee6bb2 Fix editor not resetting mods when entering
Would leave the user potentially in a test mode that is in a weird
state (ie. if cinema mod was enabled). Eventually we'll add the ability
to choose mods for test play, but that will be done in a saner way.

Closes #15870.
2021-12-10 18:57:45 +09:00
3b899af061 Update libraries 2021-12-10 18:46:47 +09:00
f7c5a3f506 Use similar method of consuming OnlineID as done in beatmap classes 2021-12-10 18:34:31 +09:00
c9f6c5c673 Add MatchesOnlineID implementation for IScoreInfo 2021-12-10 18:34:31 +09:00
5f6e887be7 Remove OnlineID comparison from ScoreInfo.Equals
This matches the implementation we have for `BeatmapInfo` and
`BeatmapSetInfo`. All comparisons of `OnlineID` should be done directly
using them (ie. how it's done in `ScoreModelDownloader`).
2021-12-10 18:17:43 +09:00
e98060ac37 Remove unused using 2021-12-10 17:55:18 +09:00
73227c084e Update framework 2021-12-10 17:42:40 +09:00
970a9ae074 Add update thread asserts to RoomManager methods 2021-12-10 17:22:24 +09:00
3633494509 Merge pull request #16020 from smoogipoo/host-enqueue-2
Add support for enqueueing items in host-only mode, and changing arbitrary playlist items
2021-12-10 16:23:48 +09:00
c6d0d6451d Change IScoreInfo.User to an interface type 2021-12-10 16:11:49 +09:00
bff02bedbf Rename APIScoreInfo to APIScore 2021-12-10 16:11:49 +09:00
dbb08f7d46 Use OnlineID for set operations 2021-12-10 16:11:48 +09:00
7ac63485ef Add setter for ScoreInfo.OnlineID 2021-12-10 16:11:48 +09:00
bf1418bafc Use OnlineID instead of legacy IDs for equality and lookups 2021-12-10 16:11:48 +09:00
4e6286920c Merge pull request #16017 from peppy/fix-child-set-after-disposal
Fix potential crash due to children being mutated after disposal
2021-12-10 15:38:34 +09:00
de0f37b08d Separate editing and adding playlist items 2021-12-10 15:26:48 +09:00
88670c3b01 Document OpenSongSelection and mark null param 2021-12-10 14:14:22 +09:00
50bf2f368d Merge branch 'master' into host-enqueue-2 2021-12-10 14:09:19 +09:00
9ac8e6c81c Add missing null check before attempting to populate bpm info 2021-12-10 13:53:48 +09:00
612f47bb9f Add the ability to create playlists of 2 weeks ~ 3 months in duration 2021-12-10 13:45:29 +09:00
1952819db2 Merge pull request #16019 from smoogipoo/cleanup-playlist-item-buttons
Cleanup duplicated classes in DrawableRoomPlaylistItem
2021-12-10 12:01:26 +09:00
35a208a478 Merge pull request #15999 from peppy/restore-user-volume-muted-notification
Fix the unmute notification potentially overwriting user's volume levels unnecessarily
2021-12-10 02:58:59 +09:00
671582a925 Allow host to enqeue items and items to be edited 2021-12-10 01:15:19 +09:00
048a495115 Add edit button to DrawableRoomPlaylistItem 2021-12-10 01:08:54 +09:00
4d1c06c061 Add support for host enqueueing in TestMultiplayerClient 2021-12-10 01:03:36 +09:00
05aa9635a8 Privatise button again 2021-12-10 00:38:18 +09:00
f9af239ed9 Cleanup duplicated classes in DrawableRoomPlaylistItem 2021-12-09 23:56:49 +09:00
538a822760 Merge branch 'master' into multiplayer-playlist-deletion 2021-12-09 19:04:06 +09:00
a3b53ac2f6 Change comparison to match in all locations 2021-12-09 18:58:47 +09:00
b393f83028 Merge pull request #16009 from smoogipoo/cleanup-drawable-playlist
Cleanup DrawableRoomPlaylist and DrawableRoomPlaylistItem
2021-12-09 18:54:16 +09:00
e7e61cd9ab Fix potential crash due to children being mutated after disposal
This is a bit of an unfortunate edge case where the unbind-on-disposal
doesn't help, since the binding is happening in BDL, and the usage is in
a nested `LoadComponentAsync` call. Combine those and you have a recipe
for disaster.
2021-12-09 18:52:00 +09:00
dfe19f3509 Minor code reformatting 2021-12-09 17:53:40 +09:00
0963b00453 Disallow item selection in playlists song select 2021-12-09 17:33:59 +09:00
17d676200b Xmldoc fixes from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-12-09 17:33:36 +09:00