multithreaded: combination and conflict resolution of linked PRs (1->4) - #678
Open
TheLostInPlace wants to merge 45 commits into
Open
TheLostInPlace wants to merge 45 commits into
TheLostInPlace wants to merge 45 commits into
Conversation
…check whether the ui holds the input
…the overload table
spots, pointers, overrides and the screen shader for a device page
underlay, per type height icons and pointer art, and an icon shader
# Conflicts: # src/xrGame/map_location.cpp
# Conflicts: # src/xrGame/player_hud.cpp # src/xrGame/player_hud.h
themrdemonized
marked this pull request as draft
September 18, 2026 04:40
TheLostInPlace
marked this pull request as ready for review
September 18, 2026 04:54
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is the MT side of #674 , #675 , #676 and #677 (small script api, script attachments, map and
ui, player hud). It adds nothing of its own. It is those four
PR's merged in, in that order, the merge conflicts resolved.
render_hud_attachments_alwaystakes the dsgraph manager likerender_hudandscript_attachment::Renderdo on this branchCMapLocation::UpdateSpotkeeps the null check next to the cached path (in the map uimerge)
player_hud.cppandplayer_hud.h, where the hud and attachment PRs touch the same threelines, keep both sides, the same way they would on the non MT branch
Everything else is exactly what the four PRs carry. Built DX11-AVX x64, and this code plus the fix
from #672 would complete the full set of PR's that aims to extend the capabilities of the scripted attachments and to prevent mods from having to do hacky workarounds. Merging this puts nothing on the non MT branch, the four are still
needed there. If the four go in first, this one only brings the conflict resolutions.