Commit Graph

30000 Commits

Author SHA1 Message Date
18d7b79207 Don't reset spectating state if gameplay is finished 2021-12-15 17:40:30 +09:00
2cea39a92a Merge pull request #16083 from peppy/fix-online-availability-after-reimport
Fix `OnlinePlayBeatmapAvailabilityTracker` failng after modified reimport of existing beatmap
2021-12-15 08:31:02 +09:00
ee6f125948 Merge pull request #15967 from tbrose/chat-mention-fix
Check word boundaries during username mention matching
2021-12-15 08:04:39 +09:00
4c81fd8b7c Merge pull request #16068 from peppy/fix-fail-animation-background-dim
Improve appearance of player-wide background after failing with low background dim
2021-12-15 06:32:02 +09:00
00154fe86d Merge branch 'master' into fix-menu-background-desync 2021-12-14 21:31:10 +01:00
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
453ecd21b3 Fix OnlinePlayBeatmapAvailabilityTracker potentially in incorrect state
Adter an import of a modified version of a beatmap (that was already
present in the local database), it's feasible that one of these trackers
would not see the state change due to the nuances of the import process.
2021-12-14 19:16:11 +09:00
04551ea61e Merge pull request #16080 from smoogipoo/fix-storyboard-start-time
Fix incorrect storyboard life time start with looping commands
2021-12-14 18:33:56 +09:00
cebfeb5220 Merge pull request #16045 from smoogipoo/multiplayer-local-beatmap-query
Rework multiplayer's current item tracking
2021-12-14 18:33:30 +09:00
79dd9674fc Use longer form to read better
Using `l.StartTime` reads like a coding issue, even though if you go
down the call chain looks to be correct.
2021-12-14 17:41:09 +09:00
8c6f50ddb1 Fix BackgroundScreenDefault incorrectly updating current background after being inactive
If the beatmap was changed but then reverted to the previously displayed
map, the background may have displayed incorrectly on resuming.

Closes #15804.
2021-12-14 16:40:50 +09:00
b6a272e31a Add failing test coverage of BackgroundScreeNDefault's beatmap background tracking when active/non-active 2021-12-14 16:40:34 +09:00
7e576ae9d3 Add note about how the background colour is restored 2021-12-14 13:25:19 +09:00
357a661379 Fix storyboard sprites sometimes starting too early 2021-12-14 13:13:12 +09: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
70045494ba Re-simplify code by removing BeatmapManager event instead 2021-12-13 16:09:54 +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
cac684c044 Improve appearance of player-wide background after failing with low background dim 2021-12-13 14:53:11 +09:00
c097dc8048 Add note about reasoning behind MultiplayerClient.GetAPIBeatmap call 2021-12-13 13:39:32 +09:00
3ea07b426b Merge branch 'master' into multiplayer-local-beatmap-query 2021-12-13 13:27:34 +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
bf3abb2455 Merge branch 'master' into multiplayer-local-beatmap-query 2021-12-12 16:37:41 +09:00
a6e77f172d Add some comments 2021-12-12 16:30:37 +09:00
d6c08fae48 Fix incorrect global beatmap with availability changes 2021-12-11 23:08:21 +09:00
ece2cddb7f Fix DrawableRoomPlaylistItem lookup interfering with tests 2021-12-11 22:51:20 +09:00
25b274c323 Fix starting gameplay too early after import 2021-12-11 22:47:50 +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
6057037e35 Move playlist item beatmap population to MatchSubScreen 2021-12-10 20:08:59 +09: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