Repository navigation
Milestone 1.5: integrate upstream develop with NextPlus compatibility - #2
Merged
Merged
Conversation
Integrate the legacy-format companion files restored by DFHack exportlegends upstream - parse history and site/population companions as UTF-8 - expose civilized, site, outdoor, and underground populations in the overview - show site populations and infer otherwise-empty lairs from living residents - classify civilizations from living populations and exclude animal-person groups - aggregate battle combatants and deaths by attacker/defender race - render terrain, mountains, forests, volcanoes, and roads with installed Premium assets without redistributing proprietary graphics - serve installed site sprites through a traversal-safe API endpoint - retain site markers independently from civilization ownership overlays - stabilize map loading, layer visibility, marker scaling, zooming, and disposal - add parser, battle, and Premium map regression coverage River metadata remains present but was chosen not to be rendered because the regional flags don't provide enough width and detail data for an accurate visual result.
…s, and restructure world overview cards - Add dynamic Steam libraryfolders.vdf parsing in WorldMapImageGenerator for Linux/CachyOS. - Fix BookmarkController route matching and BookmarkService path resolution for deletion. - Fix bookmarkStore loading state when receiving 204 No Content on delete. - Adjust Map.vue height to use full viewport height and set Leaflet tooltip z-index above popups. - Extract generic TableCard component for population and site overview tables. - Position table cards below Chronicles section on World.vue with bold table header styling.
…on-support Restore Steam companion population, battle, and map data
…ight after Location card
Preserve NextPlus bookmark synchronization and atomic persistence while integrating PR Kromtec#73 and population charts. Restore BMP, legacy encoding and missing-graphics fallbacks; validate with portable regression fixtures.
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
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.
Integrates upstream develop through 6b7c1ce, including PR Kromtec#73 Premium world-map rendering from DFHack CSV and locally installed graphics, population and battle data fixes, map navigation improvements, and site/entity population charts. The merge preserves all five upstream commits and their attribution.
Resolves the BookmarkService conflict by retaining NextPlus's AppData namespace, synchronization, defensive copies and atomic persistence, with upstream template-first deletion inside the existing lock. Restores BMP and generated-region fallbacks, visible site markers without game graphics, and legacy CP437 XML / Windows-1252 text alongside Premium UTF-8. No game assets are bundled.
Validation:
Live browser zoom, popups, overlay toggles and chart appearance still need manual visual testing; region3 was not loaded. Vite's >500 kB chunk warning and npm's 19 dependency advisories remain outside this integration scope. Detailed results and compatibility files are documented in docs/integration-upstream-develop.md.
Original checkout, untracked audit documentation and existing tsconfig build-cache modifications were preserved in place. No later milestone work is included. Do not merge automatically.