Dan Balasescu
51b6b9d857
Merge branch 'master' into chat-mention-fix
2021-12-14 11:49:57 +09:00
Dean Herbert
a076eda834
Merge pull request #16062 from smoogipoo/retry-score-submission-timeout
...
Increase score submission timeout
2021-12-14 11:03:20 +09:00
Dan Balasescu
19f7f4dc02
Merge pull request #16070 from peppy/test-score-refactoring
...
Move test `ScoreInfo` creation to `TestResources`
2021-12-14 10:03:52 +09:00
Dan Balasescu
419a34e7b4
Merge branch 'master' into test-score-refactoring
2021-12-14 07:30:06 +09:00
Dan Balasescu
01c7ff71c2
Merge pull request #16069 from peppy/clean-up-excess-bindings
...
Refactor `KeyBindingStore` to clean up any excess bindings for individual actions
2021-12-14 06:48:08 +09:00
Dan Balasescu
7564658b5e
Reduce to 30s
2021-12-14 06:40:45 +09:00
Dean Herbert
9e9341597d
Remove unused using statement
2021-12-13 17:59:04 +09:00
Dean Herbert
309290a3c9
Use new method in more places that can benefit from it
2021-12-13 16:56:43 +09:00
Dean Herbert
654b47c7ec
Move "excess mods" test behaviour to local usages
...
There were only two of these, so it doesn't make sense to add extra
complexity in the test resources class.
2021-12-13 16:41:30 +09:00
Dean Herbert
99ac71c1fe
Simplify usages where the ruleset being used is osu! ruleset
2021-12-13 16:37:20 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
4cac87e933
Add test coverage showing that KeyBindingStore won't remove excess key bindings
2021-12-13 15:26:32 +09:00
Dean Herbert
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
Dean Herbert
7566722877
Merge pull request #16061 from smoogipoo/fix-results-score-position
...
Fix results sometimes showing incorrect score position
2021-12-13 12:59:10 +09:00
Salman Ahmed
d92f5039cd
Reorder version overlay to display behind game-wide overlays
2021-12-13 06:53:18 +03:00
Salman Ahmed
d0fbbf110b
Expose ScreenContainer for access in OsuGameDesktop
2021-12-13 06:52:36 +03:00
Dan Balasescu
fd979a52fe
Increase score submission request timeout to 60s
2021-12-13 07:15:21 +09:00
Dan Balasescu
2cd2b10ce1
Fix results sometimes showing incorrect score position
2021-12-13 06:54:57 +09:00
Dan Balasescu
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
Dan Balasescu
ff0c5121e4
Merge pull request #16025 from peppy/pre-realm-score-tidy
...
Clean up various issues surrounding `ScoreInfo` in preparation for realm migration
2021-12-11 20:16:43 +09:00
Dan Balasescu
63a017bc8e
Use Array.Empty instead
2021-12-11 19:33:37 +09:00
Dan Balasescu
cdb8237a4b
Merge branch 'master' into pre-realm-score-tidy
2021-12-11 19:25:39 +09:00
Salman Ahmed
1373d1cde2
Merge pull request #16028 from peppy/update-framework
2021-12-10 18:24:42 +03:00
Salman Ahmed
3a4266bd5e
Merge branch 'master' into update-framework
2021-12-10 17:50:33 +03:00
Dean Herbert
02c29ba228
Merge pull request #16027 from peppy/add-threading-asserts
...
Add update thread asserts to `RoomManager` methods
2021-12-10 19:21:22 +09:00
Dean Herbert
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
Dean Herbert
5e9510be36
Add test coverage of editor resetting mods on entering
2021-12-10 18:57:33 +09:00
Dean Herbert
3b899af061
Update libraries
2021-12-10 18:46:47 +09:00
Dean Herbert
f7c5a3f506
Use similar method of consuming OnlineID as done in beatmap classes
2021-12-10 18:34:31 +09:00
Dean Herbert
c9f6c5c673
Add MatchesOnlineID implementation for IScoreInfo
2021-12-10 18:34:31 +09:00
Dean Herbert
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
Dan Balasescu
e98060ac37
Remove unused using
2021-12-10 17:55:18 +09:00
Dean Herbert
73227c084e
Update framework
2021-12-10 17:42:40 +09:00
Dean Herbert
970a9ae074
Add update thread asserts to RoomManager methods
2021-12-10 17:22:24 +09:00
Dean Herbert
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
Dean Herbert
c6d0d6451d
Change IScoreInfo.User to an interface type
2021-12-10 16:11:49 +09:00
Dean Herbert
bff02bedbf
Rename APIScoreInfo to APIScore
2021-12-10 16:11:49 +09:00
Dean Herbert
dbb08f7d46
Use OnlineID for set operations
2021-12-10 16:11:48 +09:00
Dean Herbert
7ac63485ef
Add setter for ScoreInfo.OnlineID
2021-12-10 16:11:48 +09:00
Dean Herbert
bf1418bafc
Use OnlineID instead of legacy IDs for equality and lookups
2021-12-10 16:11:48 +09:00
Dean Herbert
261847bbec
Avoid touching ScoreInfo.User directly
2021-12-10 15:39:29 +09:00
Dan Balasescu
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
Dan Balasescu
e626ab9300
Merge pull request #16024 from peppy/longer-playlist-options
...
Add the ability to create playlists of 2 weeks ~ 3 months in duration
2021-12-10 15:37:24 +09:00
Dan Balasescu
de0f37b08d
Separate editing and adding playlist items
2021-12-10 15:26:48 +09:00
Dean Herbert
88670c3b01
Document OpenSongSelection and mark null param
2021-12-10 14:14:22 +09:00
Dean Herbert
50bf2f368d
Merge branch 'master' into host-enqueue-2
2021-12-10 14:09:19 +09:00
Dean Herbert
9ac8e6c81c
Add missing null check before attempting to populate bpm info
2021-12-10 13:53:48 +09:00
Dean Herbert
612f47bb9f
Add the ability to create playlists of 2 weeks ~ 3 months in duration
2021-12-10 13:45:29 +09:00
Dean Herbert
1952819db2
Merge pull request #16019 from smoogipoo/cleanup-playlist-item-buttons
...
Cleanup duplicated classes in DrawableRoomPlaylistItem
2021-12-10 12:01:26 +09:00
