Repository navigation
Reconcile main with upstream dev and the current play stack - #262
Merged
Merged
Conversation
* Revert "Update protobufs due to new versions" This reverts commit 0d76350. * fix: update version to 1.1.5, update embedded image, and clean up whitespace in sync.cc * Update protobuf message definitions
* add mission hud visibility settings * Flatten Mission HUD config keys * Remove Mission HUD legacy config fallback * review: remove remaining DHCM namepace
* Remove defunct hooks * Update protobuf message definitions * Update EntityGroup enum * Refactor `sync.cc`, fix resources and starbase module sync, add support for alliance resources * bump version to 1.1.6 * Update libcurl configuration to use shared=false and enable openssl3 * Revert to older xmake version, enhance CI configuration to upload diagnostics on failure * Temporarily add timeouts to configuration jobs * Remove ParseEntitySlotsData due to changed function signature * Enhance CI configuration for macOS builds and packaging - Update xmake version to latest in CI jobs - Implement matrix strategy for macOS builds to support arm64 and x86_64 architectures - Add steps for packaging intermediate builds and uploading artifacts - Improve diagnostics and validation steps for build artifacts * Update cpr.libcurl configurations for platform-specific settings * Refactor CI configuration for macOS builds to enhance launcher bundle finalization and packaging processes * Update cpr.libcurl configurations for macOS to include Apple-specific flags * Improve caching and packaging processes in CI runs * Refactor release workflow * Add local libcurl recipe * Increase timeout for configure steps in CI * Fix development patch version --------- Co-authored-by: netniV <netniv@hotmail.com>
* Remove defunct hooks * Update protobuf message definitions * Update EntityGroup enum * Refactor `sync.cc`, fix resources and starbase module sync, add support for alliance resources * bump version to 1.1.6 * Update libcurl configuration to use shared=false and enable openssl3 * Revert to older xmake version, enhance CI configuration to upload diagnostics on failure * Temporarily add timeouts to configuration jobs * Remove ParseEntitySlotsData due to changed function signature * Enhance CI configuration for macOS builds and packaging - Update xmake version to latest in CI jobs - Implement matrix strategy for macOS builds to support arm64 and x86_64 architectures - Add steps for packaging intermediate builds and uploading artifacts - Improve diagnostics and validation steps for build artifacts * Update cpr.libcurl configurations for platform-specific settings * Refactor CI configuration for macOS builds to enhance launcher bundle finalization and packaging processes * Update cpr.libcurl configurations for macOS to include Apple-specific flags * Improve caching and packaging processes in CI runs * Refactor release workflow * Add local libcurl recipe * Increase timeout for configure steps in CI * fix: avoid macOS ARM64 liveness hook crash * fix: preserve ARM64 indirect branches in SPUD trampolines * fix: restore macOS object liveness tracking * docs: record macOS loading transition crash analysis --------- Co-authored-by: lightbull <lightbull.stfc@gmail.com> Co-authored-by: netniV <netniv@hotmail.com>
* Enhance CI configuration for XMake caching and dependency management * Improve dependency lock verification in CI configuration, disable slower compiler cache for MSVC * Fix syntax error in dependency lock verification * Optimize macOS DMG packaging - stage only the app bundle to avoid duplicate binaries - reduce installer size and packaging time - disable the obsolete internet-enable probe - shorten the Finder AppleScript startup delay
Co-authored-by: netniV <netniv@hotmail.com>
* feat: restore double-tap Escape exit * Fix held Escape counting as double tap * Clarify double-tap Escape behavior
* Add reusable fleet observation service * Harden fleet observer lifecycle * Expose fleet observer runtime baseline evidence * Use shared update polling for fleet observation * Trim manager-only observer surface * Keep fleet state refresh focused
* Add configurable fleet label detail * Fix fleet label hooks and add type profiles * Rename fleet label zoom settings * Document detour size validation * Fix fleet label bind lifecycle * Avoid unused fleet label zoom sampling
* Add mod shortcut hints to native overlay * Harden shortcut hint state transitions * Refresh shortcut hints when shown * Hook shortcut visibility at safe method boundary * Cache shortcut hint labels during parsing Keep reveal-time widget updates while avoiding repeated formatting, and guard singleton lookup when native shortcut dependencies are unavailable. * Simplify native shortcut hint mapping * Optimize shortcut hint mappings * Skip shortcut hint setup when toggle is unbound
* fix: reopen bulk claim flyout on shop return * fix: fail closed on bulk flyout hook drift * fix: log skipped bulk-claim hooks when dependencies are missing
(cherry picked from commit 5d67a8b)
# Conflicts: # mods/src/config.cc
Preserve the former fork main as a history parent. The resulting tree is the validated current-dev play candidate, including the explicitly selected OPC, diagnostics console/probes, and Action Queue Repair components.
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
8 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.
Reconcile fork main onto upstream dev 12aa331 plus the seven open contribution PRs (#251, #253, #259, #260, #267, #268, #269), restored fleet audio, and the explicitly selected OPC, diagnostics console/probes, and Action Queue Repair components. This becomes the fork play baseline. Upstream-owned shortcut hints, bulk-claim fixes, directional arbitration, observer, navigation and Escape configuration updates are retained.
The former main acec4c9 is preserved as a merge parent; the resulting tree is the reviewed play candidate, not a replay of the legacy release line. Existing tags and branches are retained. Private component deltas were extracted into focused local owners and verified patch-identical to the previous reviewed play stack. This PR intentionally publishes those formerly local-only extras.
Validation: Windows release public subset and releasedbg full play DLL builds pass; keyboard-layout model tests, production bulk-claim failure-path regression, production-linked shortcut hint regression, 11 TOMLs, component provenance/parity checks and git diff --check pass. Three general/hostile/independent review lanes report no new reconciliation defect. The hint regression harness gained a layout input stub to isolate it from Unity runtime linking.
Exact full candidate 5beebf4 has the same tree as d2bb303; local DLL SHA256 3DEBFD8B5D4C1CF46437926841A12FC8629FF726862FF743D208BCA39479EC90. Local AX deployment/hash verification and boot validation passed; STFC remains running with no errors, queue repair hooks installed and a stable fleet-watcher baseline. Interactive gameplay checks remain. Existing macOS hook/ABI evidence gaps remain; OPC is Windows-only. Queue repair low-word ID matching and console failure-path readiness remain inherited follow-ups. This is a play/testing baseline, not a new tagged release.
Fork CI correction 950302c adds the exact required build-mac aggregate check, requiring both upstream architecture jobs. It changes no executable source. Three bounded correction reviews pass.