Fixing TheSuperHackers syncing issues#152
Merged
Merged
Conversation
…age on collision with non-buildings (TheSuperHackers#2204)
… black terrain for one frame on far camera jumps (TheSuperHackers#2757)
Merge 4 upstream commits from TheSuperHackers/GeneralsGameCode: - cc4a683 bugfix(water): Fix river visuals in black shroud - d7f7203 fix(metaevent): Ignore modifier key release order - 8a06f35 unify(message): Merge MessageStream, MetaEvent code - ed7e96f unify(shroud): Merge W3DShroud code Resolved 463 add/add conflicts due to unrelated histories. Every conflict was analyzed individually. Key decisions: - Platform layer (SDL3/DXVK/OpenAL/FFmpeg) kept intact (--ours) - Cross-platform fixes (uintptr_t, 1U vs 1UL, platform includes) preserved - Upstream CI pipelines rejected in favor of GeneralsX workflows - Upstream scripts at non-conflicting paths accepted (cpp tools, clang-tidy) - Submodule GeneralsReplays restored to original commit Build verified: macOS GeneralsXZH and GeneralsX both link and compile cleanly.
fbraz3
force-pushed
the
thesuperhackers-sync
branch
from
623d289 to
a59cccb
Compare
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
6 participants
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.
No description provided.