Commit Graph

47578 Commits

Author SHA1 Message Date
cbb65e1e07 Merge branch 'master' into beatmap-card-expanded-state-fix 2021-12-15 22:20:30 +01:00
cd8dfac625 Merge pull request #16097 from smoogipoo/forego-resetting-spectate-state
Don't reset spectating state if spectator exited after gameplay finishes
2021-12-15 22:30:41 +09:00
33cf4ba7f6 Merge pull request #16075 from smoogipoo/prevent-idle-transition-during-load
Add AbortGameplay() to fix state transition race conditions during multiplayer load
2021-12-15 19:59:19 +09:00
4c53ec12e9 Merge branch 'master' into forego-resetting-spectate-state 2021-12-15 18:47:47 +09:00
2025183f5a Merge pull request #15990 from Susko3/number-textbox-only-numbers
Fix `SettingsNumberBox` accepting non-number characters
2021-12-15 18:39:54 +09:00
9e82a3e79a Merge branch 'master' into forego-resetting-spectate-state 2021-12-15 18:05:06 +09:00
39e642371d Merge pull request #16095 from smoogipoo/fix-playlist-exception
Fix exception when updating the room's visual playlist
2021-12-15 18:02:19 +09:00
18d7b79207 Don't reset spectating state if gameplay is finished 2021-12-15 17:40:30 +09:00
39a0a21132 Add test coverage of same scenario without deletion 2021-12-15 17:30:09 +09:00
643cee4f83 Merge branch 'master' into number-textbox-only-numbers 2021-12-15 09:13:19 +01:00
d22e1b9001 Add another until step to guard against async test issues 2021-12-15 17:00:06 +09:00
694ee68725 Update resources 2021-12-15 16:59:33 +09:00
740a6f16c7 Fix exception when updating the room's visual playlist 2021-12-15 16:53:25 +09:00
42f14667a3 Update framework 2021-12-15 16:50:55 +09:00
ad430a6277 Centralise hover state handling (and fix back-to-front conditionals) 2021-12-15 16:44:58 +09:00
6a1f535257 Refactor cancellation of expand to be more explicit 2021-12-15 16:38:19 +09:00
94d1a2aaca Remove unnecessary collapse call from BeatmapCard
This is already handled at the `BeatmapCardContent` level. This call
actually causes the buggy behaviour reported in
https://github.com/ppy/osu/discussions/16085.
2021-12-15 16:37:47 +09:00
7a9db22c52 Tidy up method naming and structure for expanded state changes 2021-12-15 16:29:12 +09:00
ef4ab74565 Also only expose Expanded state of BeatmapCard as read-only 2021-12-15 16:26:19 +09:00
41e6c24dad Expose Expanded state of BeatmapCardContent as read-only bindable
This is just to reduce complexity of these interactions by ensuring that
the expanded state can only be changed by the class itself.
2021-12-15 16:26:19 +09:00
e9187cc3cf Add failing test showing expanded state being unexpectedly lost 2021-12-15 16:26:19 +09:00
b326ccc196 Move logic to framework and update all usages 2021-12-15 07:13:24 +01:00
828072bcea Fix issue #15869
The taiko-slider is not included in  `Playfield`, so it doesn't get hidden when calling `drawableRuleSet.Playfield.Hide()`.   Calling `drawableRuleSet.Hide()` hides the taiko-slider, in addition to the rest of the `Playfield`.
2021-12-14 23:23:11 -05:00
0c11fe7413 Fix toast popups spamming samples when adjusting osu!mania scroll speed during gameplay
Not the most robust of fixes, but as per the reasoning described in the
issue thread, a proper fix will take considerably more effort. This
intends to fix the issue first and foremost, as it sounds so bad I'd
want to mute my sound before adjusting currently.

Closes #15718.
2021-12-15 12:45:23 +09:00
6bffeb6a24 Merge branch 'master' into fix-autopilot-touch-devices 2021-12-15 12:04:35 +09:00
9d85beddbe Fix null reference in some tests due to missing realm context factory 2021-12-15 11:16:37 +09:00
01ca9eb81c Merge pull request #16072 from rumoi/rhythm-bonus-performance-fix
Eliminate iterations with no effect from rhythm bonus calculation
2021-12-15 09:57:25 +09:00
e662a9f0c4 Remove redundant code. 2021-12-15 12:36:45 +13: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
da00c020be Remove whitespace 2021-12-15 07:33:49 +09:00
9ade8069a1 Rename to AbortGameplay() and handle additional states 2021-12-15 06:40:28 +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
e862b3775b Merge pull request #16081 from peppy/fix-menu-background-desync
Fix `BackgroundScreenDefault` incorrectly updating current background after being inactive
2021-12-14 22:01:31 +01:00
00154fe86d Merge branch 'master' into fix-menu-background-desync 2021-12-14 21:31:10 +01:00
74ea10179d Merge branch 'rhythm-bonus-performance-fix' of https://github.com/rumoi/osu into rhythm-bonus-performance-fix 2021-12-15 05:16:34 +13:00
4664bb1d29 Remove uneeded complexity 2021-12-15 05:16:10 +13: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
0950d8d327 Add back PlaylistRoomCreation test
Was spiritually removed in https://github.com/ppy/osu/pull/16045.

This implementation is mostly taken from that PR's comment thread
verbatim, and now works due to the associated changes to
`OnlinePlayBeatmapAvailabilityTracker`.
2021-12-14 19:16:52 +09: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
3bc2de4889 Add failing test coverage of modified beatmap import breaking online availability state 2021-12-14 19:11:23 +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
25a056dfad Remove pointless/broken test steps
These aren't accurate and are tested via a more accurate means directly
above.
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
eb3050b2ac Fix incorrect test 2021-12-14 15:08:00 +09:00
441b7baa93 Provide a realm factory to usages of ToLive/RealmLive 2021-12-14 14:26:34 +09:00