Commit Graph
384 Commits
Author SHA1 Message Date
Hide_D da836c319d fix: match random capital move semantics 2026-07-26 08:17:13 +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 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 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 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 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 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 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 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 27945fbca9 Add Chromium general icon lifecycle coverage 2026-07-26 05:29:08 +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 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 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