Repository navigation
Finish play alignment with current dev and chat-focus fix - #263
Merged
Merged
Conversation
Guffawaffle
changed the title
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
2 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.
Bring fork main up to upstream dev 9fd595b and include the chat-focus fix from STFC-Mod#272. This corrects the focus value that can keep ship and other shortcuts blocked after leaving a text field, and adds upstream's construction, shield, and battle-log shortcuts to the full play stack.
The full reconciliation is already merged through #262. This update preserves its stack and history. PR #253's latest head only merges the same upstream dev changes; its audio component is unchanged.
Validation: Windows releasedbg build, production-linked hint-cache regression, all 11 example TOMLs, upstream delta identity, and diff check pass. Three independent review lanes found no actionable defect at a52dd1d. AXF built/deployed the resulting DLL and cycled the game successfully with matching hashes and no boot errors. Required Windows/macOS CI runs here. The original intermittent chat transition and new native shortcuts still need gameplay confirmation.