chore: sync with thesuperhackers/main upstream#162
Merged
Conversation
…oManager::killAudioEventImmediately() (TheSuperHackers#2784)
…n Pathfinder::adjustDestination() (TheSuperHackers#2790)
Merge upstream changes including Pathfinder optimizations, Zero Hour message translators merge, and sorting renderer 16-bit index limit fix. Reconcile %I64X vs %llX format specifiers in BitFlags.h to prevent compiler warnings on macOS/Linux under GCC/Clang.
…h Alternate Mouse (TheSuperHackers#2798) Toggle with UseRightMouseScrollWithAlternateMouse=yes/no in Options.ini
Merge upstream changes including CommandXlat and AcademyStats unification into Core, and implementing right mouse scroll toggle for alternate mouse. Wrap Zero Hour-specific CommandXlat cases in base game with RTS_ZEROHOUR checks to prevent compilation errors.
Integrate fog of war, black infantry, and building shadows fixes from commit 91d8e27 into thesuperhackers sync branch. Resolved LookAtXlat.cpp conflict by keeping upstream RMB scroll option (PR TheSuperHackers#2798) over older code without this feature.
…true Default m_useRightMouseScrollWithAlternateMouse to TRUE in both Generals and Zero Hour to allow right-click drag scrolling under alternate controls by default.
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
4 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
This Pull Request performs an upstream sync from
TheSuperHackersintoGeneralsX(mainbranch) to import useful upstream bug fixes, performance improvements, and stability work while retaining the modern cross-platform codebase architecture (SDL3 + DXVK + OpenAL + FFmpeg).Key Merged Changes
checkForAdjust().#ifdef _MSC_VERto support standard%llXon GCC/Clang on macOS/Linux while keeping%I64Xon MSVC.Fixes & Adjustments
MSG_SABOTAGE_HINTfromHintSpy.cppin the base game codebase since it was causing compilation errors due to it being Zero Hour-specific.Verification
z_generals(Zero Hour) andg_generals(base game) targets configured and compiled successfully on macOS with themacos-vulkanpreset.