Commit Graph
16 Commits
Author SHA1 Message Date
Hide_D 1727b250bf Merge main into feature/ingame-info-menus 2026-07-26 05:21:11 +00:00
Hide_D 0127fd501a Complete legacy-compatible in-game information menus 2026-07-26 05:20:32 +00:00
Hide_D d03227656b Merge branch 'main' into feature/npc-policy-parity
# Conflicts:
#	app/game-frontend/e2e/playwright.config.mjs
#	docs/frontend-legacy-parity.md
2026-07-26 05:18:57 +00:00
Hide_D b82924b55f Restore legacy NPC policy frontend 2026-07-26 05:18:04 +00:00
Hide_D 2d38354212 Merge branch 'main' into feature/nation-general-secret-parity 2026-07-26 05:16:26 +00:00
Hide_D 8771840c1c Add nation general and secret office parity 2026-07-26 05:16:07 +00:00
Hide_D 37048c9be7 feat: complete map-to-city page parity 2026-07-26 05:11:49 +00:00
Hide_D e6a6dbb221 test: resolve nation office assets across worktrees 2026-07-26 04:37:14 +00:00
Hide_D 625476c86e Merge branch 'main' into feature/nation-personnel-finance-parity
# Conflicts:
#	app/game-frontend/e2e/playwright.config.mjs
#	app/game-frontend/package.json
#	docs/frontend-legacy-parity.md
2026-07-26 04:31:54 +00:00
Hide_D f4c09a9b02 feat: complete nation personnel and finance parity 2026-07-26 04:30:12 +00:00
Hide_D 3c1402da63 Merge branch 'main' into feature/board-rooms-parity
# Conflicts:
#	app/game-frontend/e2e/playwright.config.mjs
#	app/game-frontend/src/views/MainView.vue
2026-07-26 04:19:46 +00:00
Hide_D 45f512b691 Complete legacy-compatible board rooms 2026-07-26 04:19:20 +00:00
Hide_D 63c80fb49e Stabilize in-game information E2E navigation 2026-07-26 04:06:39 +00:00
Hide_D 2017da001b Add legacy-compatible in-game information pages 2026-07-26 04:04:01 +00:00
Hide_D ee6fd00f7d merge: add secure troop management
# Conflicts:
#	app/game-engine/src/turn/types.ts
#	app/game-engine/src/turn/worldLoader.ts
2026-07-25 08:50:01 +00:00
Hide_D ae4cc31a16 feat: add secure troop management 2026-07-25 08:44:44 +00:00