1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 14:32:55 +08:00
Commit Graph

47303 Commits

Author SHA1 Message Date
Dean Herbert
0ec1e1e2d5
Merge pull request #16091 from MyDogsEd/fix-issue-#15869
Fix the taiko scroller bar appearing during cinema mod
2021-12-16 12:05:00 +09:00
Dean Herbert
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
Dean Herbert
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
Dan Balasescu
4c53ec12e9
Merge branch 'master' into forego-resetting-spectate-state 2021-12-15 18:47:47 +09:00
Dean Herbert
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
Dean Herbert
9e82a3e79a Merge branch 'master' into forego-resetting-spectate-state 2021-12-15 18:05:06 +09:00
Dean Herbert
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
Dan Balasescu
18d7b79207 Don't reset spectating state if gameplay is finished 2021-12-15 17:40:30 +09:00
Dean Herbert
39a0a21132 Add test coverage of same scenario without deletion 2021-12-15 17:30:09 +09:00
Susko3
643cee4f83 Merge branch 'master' into number-textbox-only-numbers 2021-12-15 09:13:19 +01:00
Dan Balasescu
d22e1b9001 Add another until step to guard against async test issues 2021-12-15 17:00:06 +09:00
Dean Herbert
694ee68725 Update resources 2021-12-15 16:59:33 +09:00
Dan Balasescu
740a6f16c7 Fix exception when updating the room's visual playlist 2021-12-15 16:53:25 +09:00
Dean Herbert
42f14667a3 Update framework 2021-12-15 16:50:55 +09:00
Susko3
b326ccc196 Move logic to framework and update all usages 2021-12-15 07:13:24 +01:00
JamesTheGeek
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
Dan Balasescu
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
rumoi
e662a9f0c4 Remove redundant code. 2021-12-15 12:36:45 +13:00
Dan Balasescu
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
Dan Balasescu
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
Dan Balasescu
da00c020be Remove whitespace 2021-12-15 07:33:49 +09:00
Dan Balasescu
9ade8069a1 Rename to AbortGameplay() and handle additional states 2021-12-15 06:40:28 +09:00
Dan Balasescu
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
Bartłomiej Dach
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
Bartłomiej Dach
00154fe86d
Merge branch 'master' into fix-menu-background-desync 2021-12-14 21:31:10 +01:00
rumoi
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
rumoi
4664bb1d29 Remove uneeded complexity 2021-12-15 05:16:10 +13:00
tbrose
a831744f05 Merge remote-tracking branch 'origin/chat-mention-fix' into chat-mention-fix 2021-12-14 16:24:05 +01:00
tbrose
8e79fac389 Fixes code quality check failed 2021-12-14 16:23:51 +01:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
3bc2de4889 Add failing test coverage of modified beatmap import breaking online availability state 2021-12-14 19:11:23 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
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
Dean Herbert
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
Dean Herbert
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
Dean Herbert
b6a272e31a Add failing test coverage of BackgroundScreeNDefault's beatmap background tracking when active/non-active 2021-12-14 16:40:34 +09:00
Dan Balasescu
eb3050b2ac Fix incorrect test 2021-12-14 15:08:00 +09:00
Dean Herbert
7e576ae9d3 Add note about how the background colour is restored 2021-12-14 13:25:19 +09:00
Dan Balasescu
357a661379 Fix storyboard sprites sometimes starting too early 2021-12-14 13:13:12 +09:00
Dan Balasescu
51b6b9d857
Merge branch 'master' into chat-mention-fix 2021-12-14 11:49:57 +09:00
Dan Balasescu
750bfae909 Fix TestMultiplayerClient not handling all users bailing from gameplay 2021-12-14 11:35:56 +09:00
Dan Balasescu
2f1dc91211 Add AbortLoad() method to abort gameplay loads 2021-12-14 11:30:42 +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
Dan Balasescu
6e3558b222 Remove weird test 2021-12-14 06:38:57 +09:00