[sync] TheSuperHackers upstream sync 2026-04-23#101
Merged
Conversation
…d logging in RecorderClass (TheSuperHackers#2543)
…te to engine initialization (TheSuperHackers#2590)
…leSystemManager is xfer-loaded (TheSuperHackers#2333)
…ackers#2514) This increases the overall game performance by 20 to 50%
…ers-sync-04-23-2026 # Conflicts: # Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp # Generals/Code/GameEngine/Include/GameClient/Display.h # Generals/Code/GameEngine/Source/Common/GlobalData.cpp # Generals/Code/GameEngine/Source/GameClient/System/Image.cpp # scripts/tooling/cpp/maintenance/remove_return.py
This was referenced Apr 24, 2026
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
10 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.
Summary
Syncs upstream
TheSuperHackers/GeneralsGameCodeinto GeneralsX — merge commit40aeb17c4on branchthesuperhackers-sync-04-23-2026.This sync brings upstream bug fixes, code unification (
unifycommits that move files fromGenerals/GeneralsMDintoCore), and tool additions.Conflict Resolution
Five conflicts were resolved during the merge:
1.
Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cppUpdate_Current_Bufferfunction definition; GeneralsX already had a cross-platform version with FreeType support (// GeneralsX @build fbraz 11/02/2026).2.
Generals/Code/GameEngine/Source/Common/GlobalData.cpp#ifndef _WIN32 / #include <filesystem> / #endiffor non-Windows user data paths; upstream had#include "ww3d.h"and#include "texturefilter.h".3.
Generals/Code/GameEngine/Include/GameClient/Display.h(unify move)unifycommit moved this file toCore/GameEngine/Include/GameClient/Display.h.git rmthe Generals copy; the Core version is now canonical.4.
Generals/Code/GameEngine/Source/GameClient/System/Image.cpp(unify move)unifycommit moved this file toCore/GameEngine/Source/GameClient/System/Image.cpp.git rmthe Generals copy; the Core version is now canonical.5.
scripts/tooling/cpp/maintenance/remove_return.py(new file)return;statements.Full resolution plan:
docs/WORKDIR/planning/PLAN-20260423_THESUPERHACKERS_SYNC_CONFLICT_RESOLUTION.mdValidation Checklist
macOS (Apple Silicon — ARM64)
cmake --preset macos-vulkan)Linux (Deferred — macOS build machine)
linux64-deploy)Runtime (Manual — Deferred)
Video playback- bug(linux-video): intro broken in Generals/ZH and campaign broken in ZH #103Notes
initSubsystem('TheRadar')— this is a pre-existing issue, not introduced by this sync. Investigation is tracked separately.