Skip to content

merge: sync TheSuperHackers main into GeneralsX (2026-05-28)#148

Merged
fbraz3 merged 5 commits into
mainfrom
thesuperhackers-sync-05-28-2026
May 29, 2026
Merged

merge: sync TheSuperHackers main into GeneralsX (2026-05-28)#148
fbraz3 merged 5 commits into
mainfrom
thesuperhackers-sync-05-28-2026

Conversation

@fbraz3
Copy link
Copy Markdown
Owner

@fbraz3 fbraz3 commented May 29, 2026

Summary

  • Merge thesuperhackers/main into GeneralsX sync branch.
  • Resolve merge conflict in Core/GameEngine/Include/GameClient/ParticleSys.h preserving:
    • upstream RETAIL_COMPATIBLE_CRC behavior
    • GeneralsX headless-safe no-op particle update behavior
  • Keep upstream improvements for replay/audio/water paths while preserving cross-platform architecture.

Conflict Resolution Highlights

  • ParticleSystemManagerDummy composed with both upstream and GeneralsX intents.
  • Accepted upstream replay headless path simplification.
  • Accepted upstream MilesAudio request ownership flow updates.
  • Accepted upstream river/water shader/shroud fixes.

Validation

  • macOS configure: ✅
  • macOS build z_generals: ✅ (warnings only)
  • macOS build g_generals: ✅ (warnings only)
  • Linux configure/build: ⚠️ partially attempted (long-running Docker/vcpkg bootstrap), full run still pending
  • Runtime smoke (GeneralsXZH/GeneralsX main-loop enter/exit): ⚠️ pending

Follow-up Checklist

  • Complete Linux Docker configure/build for both products
  • Run runtime smoke for GeneralsXZH and GeneralsX
  • Verify main menu/skirmish/campaign/audio/video/input/mod-loading paths
  • Focused review on replay-headless, MilesAudio ownership, and water rendering deltas

@fbraz3 fbraz3 merged commit b7a1c62 into main May 29, 2026
8 checks passed
@fbraz3 fbraz3 deleted the thesuperhackers-sync-05-28-2026 branch May 29, 2026 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants