Skip to content

Integrate reviewed system warp fix into play main - #265

Merged
Guffawaffle merged 2 commits into
mainfrom
integrate/planned-system-warp-20260907
Sep 7, 2026
Merged

Guffawaffle merged 2 commits into
mainfrom
integrate/planned-system-warp-20260907

Conversation

@Guffawaffle

@Guffawaffle Guffawaffle commented Sep 7, 2026 •

Copy link
Copy Markdown
Owner

Integrate the reviewed system-warp fix from STFC-Mod#273 into the full playing stack. Hidden galaxy popup shortcuts recover the selected destination from a matching planned course and use the game's normal movement handler.

Provenance:

  • Previous play main: a56a57405c94e1aed691cdd6ba12026c74da1655.
  • Source PR head: 3efadedda8d731aad0775d98bb1e9102be71c1c7, based on upstream dev 9fd595b782bff41c61fa51cb256597c5232e327d.
  • Integration candidate: a83aae2e97026fde5d93261a54066543c9c94805, a clean merge retaining both parent histories.
  • Only the six source PR files change relative to play main. Source and integration zero-context patch IDs match: 0662abacb9c9f62b62bda1d0b510a3c9958fd4fb.
  • Existing play capabilities and configuration remain present. This integration does not include the separate pending PR269 layout update.

Validation:

  • Local Windows releasedbg AX/XMake build and git diff --check pass.
  • General, hostile, and independent integration review found no confirmed defect.
  • Combined candidate a83aae2e was built and deployed in releasedbg, with matching local/installed SHA256 66D584B25D687BA42A238E44C2396C87EE76A8D96811245D2ABBCDFE9044EADE. AX recorded a healthy boot and updated the sidecar installation provenance. The user confirmed the hidden-popup warp, arrival, and ship usability test worked with the full play stack restored.
  • Source PR release DLL also has manually confirmed restart persistence; that separate result is not claimed as a combined-artifact restart test. All fork platform/config/package CI passed. Merged as fc7223a25330315f14b05fb7fc877d36bfa53521; its complete source tree equals the reviewed candidate. A fresh main releasedbg DLL was subsequently deployed with SHA256 D4AFE55F523CB78C1643DDB29DBE604CE260CB1CBD239DE80F1986D4E6B3F01A and a healthy AX boot. The earlier candidate gameplay test and this final main boot are separate artifact evidence.

@Guffawaffle
Guffawaffle merged commit fc7223a into main Sep 7, 2026
7 checks passed
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.

1 participant