Skip to content

Multi sync API#6077

Merged
wookieejedi merged 15 commits into
scp-fs2open:masterfrom
MjnMixael:multi_sync
Apr 2, 2024
Merged

Multi sync API#6077
wookieejedi merged 15 commits into
scp-fs2open:masterfrom
MjnMixael:multi_sync

Conversation

@MjnMixael

@MjnMixael MjnMixael commented Apr 1, 2024

Copy link
Copy Markdown
Contributor

Methods for the SCPUI Multi Sync API. Relies on #6073, so probably best to wait until that is merged to review this one.

#6073 is included in this one, so I closed it. Merging this will get both.

(cherry picked from commit fcde973)
@MjnMixael MjnMixael changed the title Multi sync Multi sync API Apr 1, 2024
Comment thread code/scripting/api/objs/multi_objects.cpp Outdated
Comment thread code/scripting/api/objs/multi_objects.cpp
Comment thread code/scripting/api/objs/multi_objects.cpp
Comment thread code/scripting/api/objs/multi_objects.cpp Outdated
(cherry picked from commit ecb33e7)
@wookieejedi wookieejedi added enhancement A new feature or upgrade of an existing feature to add additional functionality. multi A feature or issue related to the multiplayer code. ui A feature or issue specific to the menus portion of the user interface scripting A feature or issue related to LUA scripting labels Apr 2, 2024
# Conflicts:
#	code/scripting/api/libs/ui.cpp
#	code/scripting/api/objs/enums.cpp
#	code/scripting/api/objs/enums.h
#	code/scripting/api/objs/multi_objects.cpp
@wookieejedi wookieejedi enabled auto-merge (squash) April 2, 2024 17:20
@wookieejedi wookieejedi merged commit 052b4b2 into scp-fs2open:master Apr 2, 2024
@MjnMixael MjnMixael deleted the multi_sync branch April 2, 2024 17:34
notimaginative added a commit to notimaginative/fs2open.github.com that referenced this pull request Jul 25, 2025
A minor bug in scp-fs2open#6077 resulted in a crash loading campaigns on the multi ui.
The bug itself was not fatal, however it triggered a cascade of poor error
handling which led to a crash. A lot of these issues date back to retail.
This fixes the minor bug, and hopefully adds enough error handling to
preemptively squash a repeat of the crash problem.
notimaginative added a commit that referenced this pull request Jul 26, 2025
A minor bug in #6077 resulted in a crash loading campaigns on the multi ui.
The bug itself was not fatal, however it triggered a cascade of poor error
handling which led to a crash. A lot of these issues date back to retail.
This fixes the minor bug, and hopefully adds enough error handling to
preemptively squash a repeat of the crash problem.
Kestrellius pushed a commit to Kestrellius/fs2open.github.com that referenced this pull request Jul 26, 2025
A minor bug in scp-fs2open#6077 resulted in a crash loading campaigns on the multi ui.
The bug itself was not fatal, however it triggered a cascade of poor error
handling which led to a crash. A lot of these issues date back to retail.
This fixes the minor bug, and hopefully adds enough error handling to
preemptively squash a repeat of the crash problem.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement A new feature or upgrade of an existing feature to add additional functionality. multi A feature or issue related to the multiplayer code. scripting A feature or issue related to LUA scripting ui A feature or issue specific to the menus portion of the user interface

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants