chore(sync): sync upstream TheSuperHackers/main#179
Merged
Conversation
…ine assembly blocks in curly braces (TheSuperHackers#2811)
…asuresBehavior::calculateCountermeasureToDivertTo (TheSuperHackers#2808)
…::list in SortingNodeStruct (TheSuperHackers#2810)
…ers-sync-06-27-2026 # Conflicts: # Generals/Code/GameEngine/Include/GameClient/MetaEvent.h # Generals/Code/GameEngine/Source/GameClient/MessageStream/HintSpy.cpp # Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp # Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
Wrapped Zero Hour specific messages with RTS_ZEROHOUR macros in Core files. Added missing dummy implementations to MiniAudioManager to match upstream GameAudio additions.
- OpenAL and MiniAudio managers now return accurate available 2D/3D sample counts, preventing the engine from culling voicelines. - Flatpak manifests no longer force DXVK_HUD=fps when SagePatch is active, relying on the native FPS counter instead. - Added DEV_BLOG entry for 2026-06-27.
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
7 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
TheSuperHackersupstream branchmainintoGeneralsX.Fixes the Modify/Delete conflicts introduced by moving
Generals/code intoCore/by removing the local copies of the old files, since our platform changes are already correctly synced in the newCore/files.Changes
HintSpy.cpp,MetaEvent.cpp, etc.).MiniAudioManagerto compile with the newGameAudioupstream changes (added dummygetNumAvailable2DSamplesandgetNumAvailable3DSamples, removed tracking functions).#ifdef RTS_ZEROHOURto Zero Hour specific enums inHintSpy.cppandMetaEvent.cppto prevent compile errors for the base game.