chore(sync): merge upstream thesuperhackers into GeneralsX - #257
Open
fbraz3 wants to merge 23 commits into
Open
Conversation
…in PlayingAudio when handing it over to a new AudioRequest after a call to MilesAudioManager::startNextLoop() (TheSuperHackers#2774)
…ed list has no associated m_info (TheSuperHackers#3113)
… dangling linked list pointer (TheSuperHackers#3113)
… the target to enter is invalid or ourselves (TheSuperHackers#3115)
…taViewTeam() (TheSuperHackers#3139) Team 0 is now viewable by key press
…gets when force-evacuated from a vehicle (TheSuperHackers#3098)
- Reconcile AudioRequest refactoring with RefCountPtr<DynamicAudioEventRTS> across Core/GameEngine and maintain OpenAL/MiniAudio parity. - Reconcile networking ConstructBigCommandList chunk splitting. - Preserve platform isolation across CMakeLists and reject upstream CI. - Reconcile unified Core Shell and heightmap/scorch additions. - Verified configure and build on macOS (macos-vulkan preset).
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
Weekly upstream sync merging
thesuperhackers/maininto GeneralsX (main).Changes
AudioRequestreference counting (RefCountPtr<DynamicAudioEventRTS>) and lifecycle acrossCore/GameEngine.MilesAudioManager,OpenALAudioManager, andMiniAudioManagerto maintain strict cross-backend audio feature parity and safe pointer management.ConstructBigCommandListpacket and command chunking withNetCommandDataChunkacrossNetPacket.h,NetPacket.cpp, andConnection.cpp.GeneralsMD/Code/Main/CMakeLists.txtandCore/Libraries/Source/profile/CMakeLists.txt(guardedcore_debugon Windows only).build-toolchain.yml.Core/GameEngine/(Shell,ShellHooks,ShellMenuScheme) andCore/GameEngineDevice/(W3DScorch, heightmaps).docs/WORKLOG/2026-08-DIARY.mdand added planning document indocs/WORKDIR/planning/.Verification
z_generals->GeneralsMD/GeneralsXZH) on macOS (macos-vulkanpreset).g_generals->Generals/GeneralsX) on macOS (macos-vulkanpreset).