Skip to content

merge: sync thesuperhackers upstream (06-19-2026)#170

Merged
fbraz3 merged 12 commits into
mainfrom
thesuperhackers-sync-06-19-2026
Jun 19, 2026
Merged

merge: sync thesuperhackers upstream (06-19-2026)#170
fbraz3 merged 12 commits into
mainfrom
thesuperhackers-sync-06-19-2026

Conversation

@fbraz3

@fbraz3 fbraz3 commented Jun 19, 2026

Copy link
Copy Markdown
Owner

Description

Sync from TheSuperHackers upstream (10 commits from main branch)

Merged Changes

Conflict Resolution

Only 1 file had conflicts: Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

Resolution strategy:

  • Preserved GeneralsX headless null checks (Texture, DX8 caps, D3DTexture)
  • Adopted upstream variable renames for consistency
  • Dropped redundant MipLevelCount assignment (made obsolete by upstream refactor)

Validation

Platform Configure Build
macOS (arm64) ✅ OK ✅ OK (GeneralsXZH + GeneralsX)
Linux (x86_64) ✅ OK ⚠️ Pre-existing DXVK header issue (not caused by merge)

Testing Checklist

  • Game launch (ZH and Generals)
  • Main menu navigation
  • Skirmish gameplay (especially single-unit movement)
  • Campaign flow
  • Audio/video playback
  • Renderer stability (texture loader changes)
  • Multiplayer: long sessions and player disconnect scenarios
  • AI guard behavior under attack
  • Mod loading

Risky Areas

  • textureloader.cpp — upstream refactor was extensive
  • AIPathfind.cpp — new RETAIL_COMPATIBLE_PATHFINDING guard
  • GameLogic.cpp — CRC validation now skips disconnected players
  • NetCommandList.cpp — command ID overflow handling changed

xezon and others added 12 commits June 18, 2026 19:02
Merge 10 commits from TheSuperHackers/main:
- AI guard mode behavior fix (TheSuperHackers#2197)
- CRC mismatch fix for disconnected players (TheSuperHackers#2796)
- Network command ID overflow ordering fix (TheSuperHackers#2736)
- Pathfinder single-unit movement destination fix (TheSuperHackers#2296)
- Texture loader refactor and fixes (TheSuperHackers#2788, TheSuperHackers#2789)
- Waypoint/PolygonTrigger label lookup perf improvement (TheSuperHackers#2761)
- SelectionXlat unification (TheSuperHackers#2792)

Conflict resolution in textureloader.cpp:
- Preserved GeneralsX headless null checks (Texture, DX8 caps, D3DTexture)
- Adopted upstream variable renames (orig_w->orig_width, etc.)
- Dropped redundant MipLevelCount assignment (upstream refactor)

Validation:
- macOS: configure + build OK (GeneralsXZH and GeneralsX)
- Linux: configure OK, build has pre-existing DXVK header path issue
  (windows_base.h not in include path - not caused by this merge)
@fbraz3 fbraz3 merged commit 613a7af into main Jun 19, 2026
8 checks passed
@fbraz3 fbraz3 deleted the thesuperhackers-sync-06-19-2026 branch June 19, 2026 20:25
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.

6 participants