1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 01:27:29 +08:00
Commit Graph

32494 Commits

Author SHA1 Message Date
Dean Herbert
7d8cf1bbb6 Merge branch 'master' into first-run-setup 2022-04-21 15:49:39 +09:00
Dan Balasescu
54ca4b9d36 Remove unused using 2022-04-21 15:34:14 +09:00
Dean Herbert
e54d3702a6 Specify web proxy in SignalR connection building
Might solve https://github.com/ppy/osu/discussions/17897 (depends on how
adeptly signalr falls back to long polling if/when is fails to websocket
via the proxy, or maybe succeed).

As with the framework side change, I've tested this to not break a
zero-proxy flow. Intending to have the user test this after next
release.

Reference:
https://stackoverflow.com/questions/59343807/get-system-default-web-proxy-in-net-core
/
https://stackoverflow.com/questions/13515058/using-signalr-client-through-a-web-proxy
2022-04-21 15:16:41 +09:00
Dean Herbert
5c0e5eb6f4
Merge pull request #17899 from Joehuu/localise-most-strings
Use existing web localisation for most hardcoded strings
2022-04-21 14:48:12 +09:00
Dean Herbert
848366416e Revert string type changes in MetadataLineInfo 2022-04-21 14:10:58 +09:00
Dean Herbert
9f525ee267 Revert localisation of spectate/watch button 2022-04-21 14:09:51 +09:00
Dean Herbert
56d8de23e2
Replace horse with "more suitable" icon
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-04-21 12:18:54 +09:00
Joseph Madamba
5e5c8e78a6 Use existing web localisation for most hardcoded strings 2022-04-20 16:31:11 -07:00
Jai Sharma
5319bce772 Revert DI usage of ChannelSelectorState in favour of directly binding BindableBool SelectorActive 2022-04-20 21:05:33 +01:00
Jai Sharma
e596c9d171 Use Bindable<ChannelSelectorState> to control selector active visibility 2022-04-20 19:12:43 +01:00
Dean Herbert
4466e15bfc Rename AllowConfiguration to AllowCustomisation and simplify drawable addition 2022-04-20 23:17:29 +09:00
Dean Herbert
b722ff8dc5 Merge branch 'master' into mod-overlay/extension-points 2022-04-20 23:17:04 +09:00
Dean Herbert
8c2d70e93f Disable forward button when already at end 2022-04-20 17:50:31 +09:00
Dean Herbert
65b2db5e71 Move shear constant to overlay (this is going to likely be used everywhere ever) 2022-04-20 16:30:58 +09:00
Dean Herbert
e17f224793 Fix padding mismatches 2022-04-20 16:28:52 +09:00
Dean Herbert
5c7ff363ce Move title/description to correct class 2022-04-20 16:08:00 +09:00
Dean Herbert
2ee37aeceb Reduce nesting and usage of GridContainer 2022-04-20 16:01:15 +09:00
Dean Herbert
1032dc235d Rename PopupScreenTitle to ShearedOverlayHeader 2022-04-20 16:01:15 +09:00
Dean Herbert
8d31b0bc01 Split out the base design of sheared overlay into its own abstract class
This will allow for reuse with the first-run overlay.
2022-04-20 15:50:16 +09:00
Dean Herbert
66373bf038 Move back button enable handling to shared method 2022-04-20 14:50:41 +09:00
Dean Herbert
9797e2d887 Rename showLastStep method to avoid ambiguity 2022-04-20 14:49:17 +09:00
Dean Herbert
488fc9db67 Reverse content colours to match design spec 2022-04-20 14:48:51 +09:00
Dean Herbert
d2f1468b5e
Merge branch 'master' into issue-17877 2022-04-20 12:52:13 +09:00
Dean Herbert
d46329f55a Remove unused dependency 2022-04-20 12:51:55 +09:00
chickensalt
f5863c2030 remove unused import 2022-04-20 13:40:02 +10:00
chickensalt
4f80651606 implement 2a3a0c1 for playlists as well 2022-04-20 10:33:06 +10:00
Bartłomiej Dach
f82d58fa6a
Merge branch 'master' into update-paginated-profile-items-count 2022-04-19 22:17:26 +02:00
Jai Sharma
44c822f34d Use normal OsuScrollContainer for ChannelList 2022-04-19 16:56:55 +01:00
Dean Herbert
e8adbb319b Skip first run setup in OsuGameTestScenes 2022-04-19 22:57:07 +09:00
Dean Herbert
ce70c10afa Tidy up unused dependencies 2022-04-19 18:00:39 +09:00
Dan Balasescu
825368cccd
Merge pull request #17879 from peppy/localisation-debug-store
Add debug language to help with localisation efforts
2022-04-19 17:50:39 +09:00
chickensalt
2a3a0c1cd3 remove notification on trying to multi when logged out
fixes #17877
2022-04-19 18:44:20 +10:00
Dean Herbert
17eaa44af1 Ensure notifications don't interrupt the first run setup process 2022-04-19 17:40:35 +09:00
Dean Herbert
e2da1d76ca Only show first run setup once per install 2022-04-19 16:59:25 +09:00
Dean Herbert
3378c91901 Fix double applied padding 2022-04-19 16:59:04 +09:00
Dean Herbert
1490502d4c Improve overall usability of scale adjust screen 2022-04-19 16:59:04 +09:00
Dean Herbert
a195d4f5aa Use a culture name that doesn't cause everything to fall over 2022-04-19 16:49:41 +09:00
Dean Herbert
c27831145c Add scroll and flow at the FirstRunSetupScreen level 2022-04-19 16:37:29 +09:00
Dean Herbert
c4bade0995 Expose MainMenu buttons 2022-04-19 16:36:39 +09:00
Dean Herbert
6d534046ff Add keyboard traversal support for first run dialog (and tidy up step traversal logic) 2022-04-19 14:57:15 +09:00
Dean Herbert
e67cc293b8 Add localisation support for all new strings 2022-04-19 14:53:01 +09:00
Dean Herbert
5dc3805005 Fix stack nullability 2022-04-19 14:53:01 +09:00
Dean Herbert
02f8367d66 Improve animation when showing/hiding first run overlay 2022-04-19 14:53:01 +09:00
Dean Herbert
2682373bf2 Use existing blocking / exit logic provided by OsuFocusedOverlayContainer 2022-04-19 14:53:01 +09:00
Dean Herbert
9074eb283d Show a notification instead of blocking exit of wizard 2022-04-19 14:53:01 +09:00
Dean Herbert
8bfa59d12f Ensure all other dialogs and overlays are dismissed when the first run wizard is shown 2022-04-19 14:53:01 +09:00
Dean Herbert
3ea4eabdb6 Ensure button text is updated on going backwards 2022-04-19 14:53:01 +09:00
Dean Herbert
fb7dc89503 Ensure wizard returns to initial screen after completion 2022-04-19 14:53:01 +09:00
Dean Herbert
6716621444 Re-fix clicking inside display also dismissing 2022-04-19 14:53:01 +09:00
Dean Herbert
11395c40b7 Add button to access first run setup on demand 2022-04-19 14:53:01 +09:00
Dean Herbert
ea52fab5b1 Tidy up dependencies and test naming 2022-04-19 14:53:01 +09:00
Dean Herbert
56c4283764 Only exit dialog from click if outside the dialog content 2022-04-19 14:53:01 +09:00
Dean Herbert
288f759bb4 Add test coverage of navigation 2022-04-19 14:53:01 +09:00
Dean Herbert
07da1cd731 Move buttons to top level and add backwards navigation 2022-04-19 14:53:01 +09:00
Dean Herbert
3b94e01fe6 Improve layout of ui scale step 2022-04-19 14:53:01 +09:00
Dean Herbert
e064f2f23e Improve general layout and allow overlay to be displayed without dependencies for now 2022-04-19 14:53:01 +09:00
Dean Herbert
c2df3465b2 Add ui scaling setup screen, kind of 2022-04-19 14:53:01 +09:00
Dean Herbert
ae07b2b512 Initial setup 2022-04-19 14:53:01 +09:00
Dean Herbert
feeff16476 Add debug language to help with localisation efforts
The idea is to allow a developer to immediately see which text on a
component or screen has already got localisation support. It can be a
bit of a challenge to see this when creating a new component that
doesn't yet have any translations populated.

Curious to hear thoughts on this. I could see it working very well as a
visual tests checkbox (implemented at o!f side), potentially in addition
to having this at the game level, or replacing this PR.
2022-04-19 14:30:50 +09:00
Salman Ahmed
89912675ab
Merge branch 'master' into i-notification-overlay 2022-04-19 08:22:07 +03:00
Dean Herbert
83e89b3e80 Add unread count to INotificationOverlay and fix toolbar button DI logic 2022-04-19 11:16:45 +09:00
Salman Ahmed
c858ec2483 Pagination -> `PaginationParameters 2022-04-19 02:48:34 +03:00
Salman Ahmed
96d4369cc8 Introduce Pagination and simplify paginated API requests 2022-04-19 02:04:23 +03:00
Salman Ahmed
94335c2938 Update further usages to cache/resolve via interface 2022-04-19 00:18:10 +03:00
Dan Balasescu
bb8b94f8ad
Merge branch 'master' into i-notification-overlay 2022-04-19 06:03:56 +09:00
Dean Herbert
c4d89b8c3c Update framework 2022-04-19 05:57:03 +09:00
Dan Balasescu
94e892df1c
Merge pull request #17862 from peppy/i-dialog-overlay
Split out `IDialogOverlay` to allow for easier testing
2022-04-19 05:24:05 +09:00
Salman Ahmed
f08449e432 Update paginated profile subsections to display items inline with web 2022-04-18 23:04:21 +03:00
Salman Ahmed
9d59cd408f Add concept of "initial items count" in paginated API requests 2022-04-18 22:59:49 +03:00
Salman Ahmed
1fc28552b5 Minor reword inline comment 2022-04-18 21:07:20 +03:00
Salman Ahmed
16a0efc562 Cache IDialogOverlay as its type in interface 2022-04-18 21:06:27 +03:00
Dean Herbert
5d5e46ede7 Fix rider incompetency 2022-04-18 23:10:07 +09:00
Dean Herbert
aaf5577e6a Remove unnecessary canBeNull specification 2022-04-18 21:48:46 +09:00
Dean Herbert
d29312e070 Fix rider incompetency 2022-04-18 21:47:47 +09:00
Dean Herbert
043599081b Split out INotificationOverlay to allow for easier testing 2022-04-18 20:14:01 +09:00
Dean Herbert
fea4632e83 Convert assert to hard throw 2022-04-18 20:04:19 +09:00
Dean Herbert
25f1f772f3 Allow caching via loadComponentSingleFile with interface specification 2022-04-18 18:36:26 +09:00
Dean Herbert
e315313266 Split out IDialogOverlay to allow for easier testing 2022-04-18 18:36:26 +09:00
Dean Herbert
2202863e1a Split out IPerformFromScreenRunner to allow for easier testing 2022-04-18 17:49:28 +09:00
Dean Herbert
90093c1d9d Combine private skin variable into exposed one 2022-04-18 13:32:37 +09:00
Salman Ahmed
2cb217e06c Fix editor legacy beatmap skins not receiving transformer 2022-04-18 06:59:58 +03:00
Salman Ahmed
338d94626e Expose underlying skin of EditorBeatmapSkin 2022-04-18 06:44:39 +03:00
Bartłomiej Dach
0d5ce336f4
Hide mod customisation toggle if customisation not permitted 2022-04-17 23:28:53 +02:00
Bartłomiej Dach
881df7663d
Fix filter not taking effect if applied before panel load completion 2022-04-17 23:28:53 +02:00
Bartłomiej Dach
8af865a1c5
Fix incompatibility panel using reference equality 2022-04-17 23:28:53 +02:00
Bartłomiej Dach
ffb5c1e86c
Tweak colours on incompatibility displaying mod panel 2022-04-17 23:28:52 +02:00
Bartłomiej Dach
20c17b8c98
Make base mod select screen abstract 2022-04-17 23:28:51 +02:00
Bartłomiej Dach
7eebc20124
Add replacements for mod overlays used by game 2022-04-17 23:28:51 +02:00
Bartłomiej Dach
67c44db8d5
Add extension points required for replacing old mod overlay 2022-04-17 23:28:51 +02:00
Dean Herbert
a3cc07ff3f Update resources 2022-04-17 15:08:15 +09:00
Dean Herbert
7781a4250e Merge branch 'master' into zh-hant 2022-04-17 15:08:10 +09:00
Dean Herbert
399d8eac36 Update LocalisationAnalyser with dotnet 6 compatibility changes 2022-04-17 14:44:28 +09:00
Jai Sharma
47c8b8010f Use semibold font weight for ChannelListItemFlow label 2022-04-16 23:03:03 +01:00
Jai Sharma
2f41cddb00 Remove redundant Expire call 2022-04-16 23:03:03 +01:00
Jai Sharma
36aea9009e Move ChannelList scrollbar to the right 2022-04-16 23:03:03 +01:00
Jai Sharma
4a0c5a0781 Remove hover override for ChannelListScrollContainer 2022-04-16 23:02:54 +01:00
Bartłomiej Dach
15c54b38c1
Merge branch 'master' into fix-popup-dialog-handling-exit-sequence 2022-04-16 19:01:18 +02:00
Jai Sharma
b6631fb9f9 Add newline for base class call 2022-04-15 22:22:20 +01:00
Jai Sharma
a0a2f8118e Code quality fixes 2022-04-15 22:05:20 +01:00
Jai Sharma
f1dd319fd9 Implement ChannelList for new chat design
Reference design: https://www.figma.com/file/f8b2dHp9LJCMOqYP4mdrPZ/Client%2FChat?node-id=1%3A297

Adds new component `ChannelList` which makes up the sidebar channel
selector of the new chat design. Contains two separate fill flows for
public and private `ChannelItem` child components.

Exposed bindable `SelectorActive` to indicate current state of the "Add
more channels" button. Requires `Bindable<Channel>` from parent
component.

Renames and updates the `TestSceneChannelListItem` to
`TestSceneChannelList` to make use of new component and having both
tests seemed redundant.
2022-04-15 15:44:38 +01:00
Dean Herbert
fe5e9ba672
Merge branch 'master' into sfx-tweaks 2022-04-15 21:47:48 +09:00
Dean Herbert
ceb5b4f9b4 Update resources 2022-04-15 20:46:49 +09:00
Jamie Taylor
ef5ed262ca
Add pitch randomisation to the OsuLogo hover sample 2022-04-15 20:38:47 +09:00
Jamie Taylor
8e6c015856
Use a fallback sample when a MainMenuButton doesn't provide a click sample 2022-04-15 20:38:30 +09:00
Dean Herbert
a7b04a8c19 Update framework 2022-04-15 19:59:38 +09:00
Dan Balasescu
8a55f9b968
Merge pull request #17302 from peppy/fix-spectator-seeks
Fix spectator not starting from current player position
2022-04-15 13:28:49 +09:00
Dan Balasescu
792ee3d171
Merge pull request #17802 from peppy/match-start-control-test-refactor
Refactor `TestSceneMatchStartControl` to avoid usage of `TestMultiplayerClient`
2022-04-15 13:28:21 +09:00
Dean Herbert
423fae52f7 Add back base.IsPresent call 2022-04-15 10:19:36 +09:00
Dean Herbert
c57a918bbb Mark settings elements as matching filter by default to handle cases where no filtering is provided 2022-04-14 23:02:00 +09:00
Salman Ahmed
da098d071f
Merge branch 'master' into settings-inactive-dim 2022-04-14 15:52:51 +03:00
Salman Ahmed
4b241874c3
Merge branch 'master' into hold-delay-keyword 2022-04-14 15:25:22 +03:00
Dean Herbert
03d0b4d951
Merge branch 'master' into settings-inactive-dim 2022-04-14 21:23:20 +09:00
Dean Herbert
b088959045 Reduce settings fade in duration to higher alpha/colour cross-talk 2022-04-14 21:17:06 +09:00
Dean Herbert
9240148c8e Avoid initial fade of dim layer 2022-04-14 21:16:54 +09:00
Dean Herbert
f19208a245 Move dim layer to top and only apply dimming at one location 2022-04-14 21:04:52 +09:00
Dean Herbert
316c0845ec Fix current section not being correct after early search 2022-04-14 20:36:49 +09:00
Dean Herbert
9c7af98982 Fix alpha cross-talk causing settings to potentially not filter when they should 2022-04-14 20:35:00 +09:00
Dean Herbert
296420ae08 Fix settings textbox focus operation running too late 2022-04-14 20:14:02 +09:00
Salman Ahmed
59bb6b8f7c Add background dim effect to inactive settings sections 2022-04-14 13:43:12 +03:00
Salman Ahmed
566a20a623 Add keyword "delay" to hold-to-confirm activation time setting 2022-04-14 13:27:12 +03:00
Dean Herbert
7582c2a5e8 Remove unnecessary bindable 2022-04-14 19:13:54 +09:00
Dean Herbert
bb4322a4c4 Fix UI scale being applied unevenly, causing elements to move around relative to each other 2022-04-14 19:04:31 +09:00
Dan Balasescu
2abdbe53e7 Cleanup whitespace 2022-04-14 18:55:12 +09:00
Dan Balasescu
9de4d416e2 Merge branch 'master' into fix-spectator-seeks 2022-04-14 18:54:52 +09:00
Dean Herbert
1fdf742d38 Fix potentially incorrect button being pressed during PopupDialog hide due to flag set too late 2022-04-14 17:51:50 +09:00
Dean Herbert
e010dfb150 Handle virtual track string to avoid throwing later in lookup 2022-04-14 17:33:42 +09:00
Dean Herbert
8b901fe60b Fix potential null reference when running recursive findValidTarget 2022-04-14 16:23:55 +09:00
Dean Herbert
2bc4bb9e20 Consider SubScreenStacks when allowing for exit confirmation sequence in PerformFromMenuRunner 2022-04-14 16:19:34 +09:00
Dean Herbert
f9d9e6aa61 Ensure popup dialogs are hidden before running any associated actions 2022-04-14 16:19:34 +09:00
Dan Balasescu
9af81adea7
Merge pull request #17815 from peppy/hold-to-confirm-button-improvement
Adjust hold to confirm animation curve to better show intention
2022-04-14 15:03:08 +09:00
Dean Herbert
7160a48bab Adjust hold to confirm animation curve to better show intention 2022-04-14 14:11:44 +09:00
Dan Balasescu
494955aff1 Resolve inspection issues 2022-04-14 13:11:11 +09:00
Dean Herbert
0a7fbcad1e
Merge branch 'master' into match-start-control-test-refactor 2022-04-13 22:26:10 +09:00
Dean Herbert
9b433280bd Remove countdown implementation from TestMultiplayerClient 2022-04-13 21:24:33 +09:00
Dean Herbert
c0ad91796d Fix gameplay start flow 2022-04-13 20:57:40 +09:00
Dean Herbert
2bb0d9e6d3 Expose required classes/properties for mocking 2022-04-13 17:02:33 +09:00
Dan Balasescu
3d27d3c536
Merge pull request #17786 from peppy/gameplay-leaderboard-update-totals-mode-change
Fix multiple issues with gameplay leaderboard (and tests)
2022-04-13 16:05:35 +09:00
Dan Balasescu
59ff9be316
Merge pull request #17788 from peppy/fix-replay-download-button-tests
Fix multiple issues in `ReplayDownloadButton` test scene
2022-04-13 16:00:45 +09:00
Dean Herbert
56427becbb Move logging and early return into UndeleteForReuse method itself 2022-04-13 14:33:28 +09:00
Dean Herbert
fbf0e5a45c Remove startFromSkipTarget parameter and update usages that required said behaviour 2022-04-13 14:25:43 +09:00
Dean Herbert
a59c6013c7 Rename latestGameplayStartTime to skipTargetTime 2022-04-13 14:03:52 +09:00
Dean Herbert
d4286255a0 Expose and set GameplayStartTime directly, rather than via Reset parameter 2022-04-13 13:58:44 +09:00
Dean Herbert
017f3852c8 Replace incorrectly chosen ??= with ?? 2022-04-13 13:32:36 +09:00
Dean Herbert
9c68b3edc5 Merge branch 'master' into fix-spectator-seeks 2022-04-13 12:33:41 +09:00
Dean Herbert
282fccb4c8
Fix typo in xmldoc
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-04-13 12:24:47 +09:00
Dan Balasescu
567d755794
Merge pull request #17790 from huoyaoyuan/remove-binary-serialization
Remove usages of binary serialization
2022-04-13 11:00:23 +09:00
Huo Yaoyuan
80e312dbbc Remove unused binary serialization related code. 2022-04-12 20:29:13 +08:00
Huo Yaoyuan
bf677ad0ac Remove usages of BinaryFormatter. 2022-04-12 20:28:14 +08:00
Dean Herbert
20eca9bf6a Refactor TestSceneRankRangePill to not depend on TestMultiplayerClient 2022-04-12 19:39:24 +09:00
Dean Herbert
6dbfc26158 Add log output when a model is undeleted 2022-04-12 18:23:38 +09:00
Dean Herbert
b51abfc722 Fix ScoreDownloadTracker matching on empty hash equality 2022-04-12 18:22:23 +09:00
Dean Herbert
e901857610
Merge pull request #17776 from frenzibyte/dangerous-dialog-button-bounds
Fix dialog dangerous button being clickable at edges
2022-04-12 15:40:50 +09:00
Dean Herbert
8b1cee75fa Use BindableLong instead of BindableInt for user score tracking 2022-04-12 14:13:07 +09:00
Dan Balasescu
0e1d17d1d1 Use zh-Hant instead of zh-TW 2022-04-12 13:11:22 +09:00
Dean Herbert
0ba95a4483 Ensure all users are shown on leaderboard (even when API lookup fails) 2022-04-12 11:54:30 +09:00
Dean Herbert
ebee9e6888 Fix MultiplayerGameplayLeaderboard not immediately updating totals on scoring mode change 2022-04-12 11:27:27 +09:00
Dan Balasescu
94e2a90af2
Merge pull request #17767 from peppy/multiplayer-gameplay-leaderboard-test-improvements
Refactor multiplayer gameplay leaderboard tests to remove reliance on `Test` implementations
2022-04-12 11:19:53 +09:00
Salman Ahmed
bad30d9e60 Fix dialog dangerous button being clickable at edges 2022-04-11 21:05:37 +03:00
Dean Herbert
82939b0556 Fix skins getting duplicated when importing after export
Closes #17614.
2022-04-12 00:29:19 +09:00
Dean Herbert
09d560c93e Add test coverage of spectator requests 2022-04-11 19:27:14 +09:00
Dean Herbert
34457b4742 Expose mocked members as virtual on Multiplayer and SpectatorClient 2022-04-11 19:04:15 +09:00
Dean Herbert
abb42a54fd Fix MultiplayerTestScene not actually setting match type correctly 2022-04-11 17:57:05 +09:00
Dan Balasescu
37976c569a
Merge pull request #17762 from peppy/fix-unobserved-exceptions
Avoid throwing unobserved exception when `PerformancePointsCounter` requests timed attributes
2022-04-11 14:50:12 +09:00
Dean Herbert
cb6e557212 Fix MasterGameplayClockContainer having incorrect rate-based offsets immediately after LoadComplete
I've attempted to explain why this is required using inline comments.
There's also further conversation at
https://github.com/ppy/osu/pull/17302#issuecomment-1091850927.
2022-04-11 14:11:26 +09:00
Dean Herbert
808f0ecb74 Ensure running state is updated before performing Seek in GameplayClockContainer.Reset 2022-04-11 14:10:50 +09:00
Dean Herbert
2b74dbca28 Fix potential crash in DrawableRoom due to lack of null check on post-lookup beatmap 2022-04-11 13:44:34 +09:00
Dean Herbert
19b655d75b Avoid throwing unobserved exception when PerformancePointsCounter requests timed attributes 2022-04-11 13:30:21 +09:00
Dan Balasescu
d482ab0287 Fix ParticleSpewer outputting NaN in vertices 2022-04-09 22:29:55 +09:00
Salman Ahmed
134d9b5ddf Perform Show() at the bottom of the method
Probably not affecting behaviour, but makes more sense.
2022-04-08 19:28:04 +03:00
Dean Herbert
57fb8616b8 Fix potential null reference when attempting to highlight a message before overlay has been displayed 2022-04-09 00:31:00 +09:00
Dean Herbert
ae1e126837 Make HighlightMessage implicitly show chat overlay 2022-04-09 00:30:28 +09:00
Dan Balasescu
9ea6f9b1fe Remove some incorrectly-firing asserts 2022-04-08 21:44:44 +09:00
Dan Balasescu
62f5409191
Merge pull request #17725 from peppy/multiplayer-hotifx
Avoid multiplayer crashes when events arrive in unexpected order
2022-04-08 20:23:37 +09:00
Dan Balasescu
1f5e435bb3
Merge pull request #17726 from peppy/update-framework
Update framework
2022-04-08 19:48:24 +09:00
Dean Herbert
ea4ca6d2ad Update framework 2022-04-08 18:09:57 +09:00
Dean Herbert
5c571996d8 Avoid multiplayer crashes when events arrive in unexpected order
Intended to be a temporary fix for
https://github.com/ppy/osu/issues/17713 while a more permanent solution
is established. A proper fix is actually quite simple, but updating the
test to work with it is... *slightly* more complicated.

This hotfix will mean that if a `UserJoined` event arrives during the
unobserved window during room join (of the local user), the local user
still won't see the joining user, but the game won't crash as a result.
2022-04-08 17:55:47 +09:00
Dean Herbert
6bb8243212 Fix potential assert failure due to Room access from disconnection event 2022-04-08 17:41:03 +09:00
Dan Balasescu
975bb8cc2a
Merge pull request #17703 from peppy/fix-storyboard-fallback-animation-frame-count-weirdness
Fix `DrawableStoryboardAnimation` to handle skin fallback frame count similar to stable
2022-04-08 17:01:17 +09:00
Dan Balasescu
c48f8d7b9b
Merge pull request #17714 from bdach/mod-overlay/multimod-incompatibility
Ensure that mods grouped into multi mods are pairwise incompatible
2022-04-08 16:43:06 +09:00
Dean Herbert
933a722cfc Remove secondary null checks which cannot exist (were on wrong thread) 2022-04-08 14:56:04 +09:00
Dean Herbert
24c2d465a9 Move null assert in MultiplayerPlayer on to update thread 2022-04-08 14:53:14 +09:00
Dean Herbert
64c63fe93a Move null check in JoinRoom on to update thread 2022-04-08 14:52:56 +09:00
Dean Herbert
d50f41225f Rename scheduleAsync to runOnUpdateThreadAsync 2022-04-08 14:43:53 +09:00
Dean Herbert
9ba99ed57d Ensure all access to MultiplayerClient.Room is on the update thread
This was an implicit requirement until now, but not well documented
everywhere. Adding this makes it much easier to understand the
requirement (and probably safer).
2022-04-08 14:42:56 +09:00
Bartłomiej Dach
282b220d94
Fix test failure due to checking incompaatibility of flattened multi mods 2022-04-08 00:16:50 +02:00
Bartłomiej Dach
6630b38c08
Make all ModRateAdjust implementations incompatible with each other 2022-04-07 22:38:46 +02:00
Bartłomiej Dach
8175741a6c
Merge branch 'master' into fix-storyboard-fallback-animation-frame-count-weirdness 2022-04-07 21:49:32 +02:00
Bartłomiej Dach
71c0216c55
Add null check guards to unsubscriptions in Dispose() 2022-04-07 21:37:42 +02:00
Bartłomiej Dach
3016ce7817
Merge branch 'master' into bindable-safety-skin-editor 2022-04-07 20:59:44 +02:00
Bartłomiej Dach
e658b63dbc
Merge branch 'master' into clock 2022-04-07 20:27:23 +02:00
Salman Ahmed
a616f5bc2a Fix regressed digital clock width conditional 2022-04-07 19:24:15 +03:00
Dean Herbert
11b4c5ca87 Fix potential null ref if UpdateTargetScreen is called too early 2022-04-07 23:42:42 +09:00
Salman Ahmed
c323020fcf Fix Use24HourDisplay conditional flipped 2022-04-07 15:56:28 +03:00
Salman Ahmed
fb9fe4213d Fix skin texture lookups not handling paths with extensions 2022-04-07 15:07:30 +03:00
Dean Herbert
a4d3afd06d Fix multiple issues with bindable safety in SkinEditor components 2022-04-07 19:12:12 +09:00
Dean Herbert
b2c0eaeab4 Make string read better 2022-04-07 18:20:15 +09:00
Dean Herbert
555aee7b6a Remove incorrect and pointless complexity to width changes 2022-04-07 18:16:14 +09:00
Dean Herbert
7530fe5adf Move default specification to configuration initial value 2022-04-07 18:13:23 +09:00
Dean Herbert
37509e04a9 Rename variable and fix inspections 2022-04-07 18:11:30 +09:00
Dean Herbert
040afff670 Change DrawableStoryboardAnimation to derive from TextureAnimation 2022-04-07 17:35:59 +09:00