merge(upstream): sync thesuperhackers/main into GeneralsX - #250
Merged
Conversation
…::update from logic crc (TheSuperHackers#3055)
…te_Add_Ref and add Assign_No_Add_Ref, Assign_Add_Ref (TheSuperHackers#3058)
…ts initial reload time (TheSuperHackers#3054) Add StartsReady=YES to a SpecialAbility Behavior Module to skip the Special Power reload time when first enabled Behavior = SpecialAbility ModuleTag StartsReady = YES End
…field is lost during their return flight (TheSuperHackers#3076)
…e emote text command in LAN chats (TheSuperHackers#1821)
Merge upstream changes from thesuperhackers/main into GeneralsX while preserving cross-platform SDL3/DXVK/OpenAL architecture and platform isolation.
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
9 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.
Description
Sync local repository with upstream
thesuperhackers/mainas of August 11, 2026, preserving GeneralsX modern cross-platform architecture (SDL3 + DXVK + OpenAL + MiniAudio + FFmpeg).Fixes #246
Supersedes #247
Summary of Upstream Changes
Core/directory.GameLogicDispatch.cpp,Recorder.cpp,AI.cpp,Object.cpp,TransportContain.cpp,SpecialPowerModule.cpp, and script engine victory conditions.GUIEdittool updates.Conflict Resolution Highlights
CMakeLists.txt): Preserved GeneralsX cross-platform target configuration, keeping SDL3, DXVK, OpenAL, FFmpeg, andif(WIN32)blocks intact to prevent Windows API leaks on Linux and macOS.GameLogicDispatch.cpp): Reconciled upstream'slogicTimeQueryFlagstiming checks with local performance optimizations, ensuring proper game halting during pauses without logic time drift.InGamePopupMessage.cpp: Ported theshouldPauseHUD behavior fix to the newCore/path.W3DMainMenu.cpp&W3DFunctionLexicon.cpp: Re-applied the GeneralsX watermark rendering and function lexicon setup.W3DGameFont.cpp: Re-applied Cyrillic font encoding support for issue macOS: Cyrillic text labels not rendered (numbers work, English labels work) #144.WWMathdeterministic wrappers andScopedFPUGuardto prevent ARM64 vs x86_64 simulation desyncs.Validation Results
macos-vulkan):z_generals(Base Game) andGeneralsXZH(Zero Hour) compiled and linked cleanly.linux64-deployvia Docker): Clean CMake configuration and build ofGeneralsXZH(280 MB) andGeneralsX(268 MB) binaries.git grep -e '<<<<<<<').