Commit Graph
100 Commits
Author SHA1 Message Date
Hide_D 918d8f0e4c feat: restore main record panels 2026-07-26 08:55:06 +00:00
Hide_D b9d22c75f5 merge: match research state boundaries 2026-07-26 08:31:04 +00:00
Hide_D bf933ffa8a fix: match legacy research state boundaries 2026-07-26 08:30:44 +00:00
Hide_D 8ac1ad4059 merge: match random capital move semantics 2026-07-26 08:17:24 +00:00
Hide_D da836c319d fix: match random capital move semantics 2026-07-26 08:17:13 +00:00
Hide_D 72e765e693 merge: cover reduce city boundaries 2026-07-26 07:51:19 +00:00
Hide_D aa20c8be63 test: cover nation city reduction parity 2026-07-26 07:51:07 +00:00
Hide_D da552f89d4 merge: cover expand city boundaries 2026-07-26 07:42:49 +00:00
Hide_D d9ed2a0718 test: cover expand city boundaries 2026-07-26 07:42:39 +00:00
Hide_D 7a1deff1d0 merge: match legacy capital move constraints 2026-07-26 07:31:47 +00:00
Hide_D fa79d95e06 fix: match legacy capital move constraints 2026-07-26 07:31:35 +00:00
Hide_D a44e7dcaca merge: match population move city constraints 2026-07-26 07:22:05 +00:00
Hide_D f5ee8f8672 fix: match population move city constraints 2026-07-26 07:21:51 +00:00
Hide_D efebff36f4 merge: match legacy population move boundaries 2026-07-26 07:10:51 +00:00
Hide_D bfc6e76e07 fix: match legacy population move boundaries 2026-07-26 07:10:36 +00:00
Hide_D 666d62282f merge: cover material aid accumulation and officer logs 2026-07-26 06:58:05 +00:00
Hide_D 317f16da9e test: cover material aid accumulation and officer logs 2026-07-26 06:57:51 +00:00
Hide_D 832cd92da9 merge: restore global nation and general directories 2026-07-26 06:43:28 +00:00
Hide_D 7662f69dbf Merge branch 'main' into feature/nation-general-lists 2026-07-26 06:43:24 +00:00
Hide_D 165d92c6fa merge: cover material aid constraints 2026-07-26 06:43:12 +00:00
Hide_D 6d48d63dd3 test(turn): cover material aid constraints 2026-07-26 06:43:04 +00:00
Hide_D 510a206d84 Merge branch 'main' into feature/nation-general-lists 2026-07-26 06:37:11 +00:00
Hide_D b19ad658aa merge: preserve material aid resource boundaries 2026-07-26 06:34:22 +00:00
Hide_D 7ac27fcbcf Merge branch 'main' into feature/nation-material-aid-resource-parity 2026-07-26 06:34:00 +00:00
Hide_D cfdf412cc5 fix(turn): preserve material aid resource boundaries 2026-07-26 06:34:00 +00:00
Hide_D e9ee316198 Merge branch 'main' into feature/nation-general-lists 2026-07-26 06:33:14 +00:00
Hide_D 4d7223b7a4 Merge branch 'main' into feature/nation-general-lists
# Conflicts:
#	app/game-frontend/package.json
#	app/game-frontend/src/router/index.ts
2026-07-26 06:32:54 +00:00
Hide_D fd47da43b9 merge: add conditional integration test runner 2026-07-26 06:28:43 +00:00
Hide_D d34ca67a0f Merge branch 'main' into integration/conditional-env-20260726 2026-07-26 06:25:23 +00:00
Hide_D ff7837f4da Add conditional integration test runner 2026-07-26 06:25:19 +00:00
Hide_D e8db6019e1 merge: cover nation personnel target constraints 2026-07-26 06:24:57 +00:00
Hide_D 03cf0293ab test(turn): cover nation personnel targets 2026-07-26 06:24:52 +00:00
Hide_D 21454fcf59 merge: preserve zero-balance seizure flow 2026-07-26 06:16:52 +00:00
Hide_D efda1c472c fix(turn): preserve zero-balance seizure flow 2026-07-26 06:16:46 +00:00
Hide_D 8617e3fdb9 Merge branch 'main' into feature/general-icon-names 2026-07-26 06:10:55 +00:00
Hide_D 0a64da2742 Merge branch 'main' into feature/dynasty-list-parity 2026-07-26 06:09:17 +00:00
Hide_D 2d6855f7a2 Merge branch 'main' into feature/general-icon-names 2026-07-26 06:07:18 +00:00
Hide_D 1b456458ca merge: preserve seizure NPC public messages 2026-07-26 06:07:09 +00:00
Hide_D 63e5aae9b4 Merge branch 'main' into feature/nation-seizure-npc-message-parity 2026-07-26 06:06:12 +00:00
Hide_D b7b1785b8c fix(turn): preserve seizure NPC public messages 2026-07-26 06:06:07 +00:00
Hide_D 5294efc201 merge: preserve best-general rank data parity 2026-07-26 06:05:19 +00:00
Hide_D f9ab1da3fd Merge branch 'main' into feature/best-general-data-parity 2026-07-26 06:03:32 +00:00
Hide_D 875dc610fb fix: preserve best-general rank data parity 2026-07-26 06:03:21 +00:00
Hide_D 0306877f04 merge: restore lint and test baseline 2026-07-26 06:02:37 +00:00
Hide_D e5615ce93c Merge branch 'main' into feature/general-icon-names
# Conflicts:
#	app/game-frontend/src/views/CurrentCityView.vue
2026-07-26 06:01:04 +00:00
Hide_D 74ce55a5c4 Merge branch 'main' into audit/lint-test-baseline-20260726 2026-07-26 05:57:49 +00:00
Hide_D 7c2cf84384 Merge branch 'main' into audit/lint-test-baseline-20260726
# Conflicts:
#	app/game-api/src/battleSim/worker.ts
#	app/game-api/src/router/general/index.ts
2026-07-26 05:57:45 +00:00
Hide_D e5d012871a Verify initialized icon paths in Chromium 2026-07-26 05:56:00 +00:00
Hide_D 3b2b83addd Merge branch 'main' into feature/general-access-tracking 2026-07-26 05:53:26 +00:00
Hide_D b2c0916695 merge: match nation resource amount boundaries 2026-07-26 05:50:31 +00:00
Hide_D e78a058387 fix(turn): match nation resource boundaries 2026-07-26 05:50:20 +00:00
Hide_D 35f49be0be Merge branch 'main' into feature/general-access-tracking 2026-07-26 05:50:17 +00:00
Hide_D fe45b9b7a5 fix: restore lint and test baseline 2026-07-26 05:49:52 +00:00
Hide_D f017d78e03 Track legacy page refresh activity 2026-07-26 05:49:45 +00:00
Hide_D bf08c5e658 Separate runtime profile identity from scenario 2026-07-26 05:45:45 +00:00
Hide_D 5fb50f3a17 Merge branch 'main' into feature/dynasty-list-parity
# Conflicts:
#	tools/frontend-legacy-parity/playwright.config.mjs
2026-07-26 05:41:13 +00:00
Hide_D 06179cbd4f Merge branch 'main' into feature/auction-menu-parity 2026-07-26 05:39:29 +00:00
Hide_D 3785dd4447 merge: complete in-game message parity 2026-07-26 05:39:17 +00:00
Hide_D a3fc1b5ebd Merge branch 'main' into feature/auction-menu-parity
# Conflicts:
#	app/game-frontend/e2e/playwright.config.mjs
#	app/game-frontend/package.json
#	app/gateway-api/src/adminRouter.ts
#	app/gateway-api/src/lobby/profileStatusService.ts
#	app/gateway-api/src/orchestrator/gatewayOrchestrator.ts
#	app/gateway-api/test/orchestratorOperations.test.ts
#	app/gateway-api/test/orchestratorPlan.test.ts
#	app/gateway-frontend/e2e/server-operations.spec.ts
#	app/gateway-frontend/src/views/AdminView.vue
#	app/gateway-frontend/src/views/ServerOperationsView.vue
2026-07-26 05:38:38 +00:00
Hide_D 71cf40219d Merge branch 'main' into feature/ingame-message-parity 2026-07-26 05:38:17 +00:00
Hide_D 7679e8f5b7 Batch rank persistence for large scenario startup 2026-07-26 05:37:40 +00:00
Hide_D 6d6a08dc2d merge: match general resource amount boundaries 2026-07-26 05:36:55 +00:00
Hide_D 4b393c2ecc fix(turn): match resource amount boundaries 2026-07-26 05:36:46 +00:00
Hide_D 92df234cdd merge: complete nation betting permission parity 2026-07-26 05:36:24 +00:00
Hide_D a0f2f431ec test: stabilize message parity after main integration 2026-07-26 05:35:27 +00:00
Hide_D b5bc1278ce Merge branch 'main' into feature/nation-betting-permission-parity 2026-07-26 05:35:11 +00:00
Hide_D 59f4994ac7 fix(frontend): match nation betting reference layout 2026-07-26 05:35:07 +00:00
Hide_D 8e797707ae test(api): cover nation betting actor permissions 2026-07-26 05:35:02 +00:00
Hide_D c8abd767b0 Merge branch 'main' into feature/auction-menu-parity
# Conflicts:
#	app/game-frontend/e2e/playwright.config.mjs
2026-07-26 05:34:01 +00:00
Hide_D 195af5580e Complete dynasty list legacy parity 2026-07-26 05:33:42 +00:00
Hide_D 5c19d24254 feat: complete auction menu parity 2026-07-26 05:33:33 +00:00
Hide_D 47f03abeb4 feat(frontend): finish battle simulator workflows 2026-07-26 05:31:37 +00:00
Hide_D de7ad570a3 Merge branch 'main' into feature/ingame-message-parity 2026-07-26 05:31:32 +00:00
Hide_D 185057ea43 feat: complete in-game message parity 2026-07-26 05:31:25 +00:00
Hide_D 61b540384c feat(battle-sim): isolate authenticated worker lifecycle 2026-07-26 05:30:48 +00:00
Hide_D b627fdf037 Merge branch 'main' into feature/ingame-info-menus-delivery 2026-07-26 05:30:35 +00:00
Hide_D 27945fbca9 Add Chromium general icon lifecycle coverage 2026-07-26 05:29:08 +00:00
Hide_D a15c723909 merge: stabilize ranking parity image fixtures 2026-07-26 05:28:54 +00:00
Hide_D 49444309f9 Merge branch 'main' into feature/best-general-hall-of-fame-parity 2026-07-26 05:28:29 +00:00
Hide_D 6ee4c4d725 test: resolve parity images from main checkout 2026-07-26 05:28:29 +00:00
Hide_D 9d2b226c18 Merge branch 'main' into feature/ingame-info-menus-delivery 2026-07-26 05:27:45 +00:00
Hide_D 5fb2c109dd Verify traffic geometry in Chromium 2026-07-26 05:27:36 +00:00
Hide_D 4bd44c1641 merge: complete ranking menu parity 2026-07-26 05:27:24 +00:00
Hide_D d15ccb478f Revert "Reapply "Exclude concurrent public traffic work""
This reverts commit 48924428ee.
2026-07-26 05:25:54 +00:00
Hide_D 02bc7f7864 Merge branch 'main' into feature/best-general-hall-of-fame-parity
# Conflicts:
#	docs/frontend-legacy-parity.md
2026-07-26 05:25:03 +00:00
Hide_D 55d60a842c merge: complete in-game information menus 2026-07-26 05:25:01 +00:00
Hide_D 48924428ee Reapply "Exclude concurrent public traffic work"
This reverts commit fa87f5565c.
2026-07-26 05:24:31 +00:00
Hide_D a77957aae3 feat: complete legacy ranking menu parity 2026-07-26 05:24:00 +00:00
Hide_D fa87f5565c Revert "Exclude concurrent public traffic work"
This reverts commit 7fc0850f83.
2026-07-26 05:23:25 +00:00
Hide_D 7fc0850f83 Exclude concurrent public traffic work 2026-07-26 05:22:30 +00:00
Hide_D 827145bd69 Fix current city general icon asset path 2026-07-26 05:22:24 +00:00
Hide_D 55b80dbbc6 Use canonical name-based general icon paths 2026-07-26 05:21:13 +00:00
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 33925acd88 Merge branch 'main' into feature/nation-general-lists
# Conflicts:
#	app/game-frontend/e2e/playwright.config.mjs
2026-07-26 05:18:49 +00:00
Hide_D 52da582b74 feat: restore global nation and general directories 2026-07-26 05:18:30 +00:00
Hide_D b82924b55f Restore legacy NPC policy frontend 2026-07-26 05:18:04 +00:00
Hide_D 1cba5bdfbf Complete NPC policy API lifecycle parity 2026-07-26 05:17:59 +00:00
Hide_D 97f69aba18 merge: add nation general and secret office parity 2026-07-26 05:17:20 +00:00