Commit Graph
682 Commits
Author SHA1 Message Date
Hide_D 442cc4cd93 Merge branch 'main' into feature/map-trend-frontend 2026-07-26 08:40:37 +00:00
Hide_D 477862464e feat: complete map and trend frontend flows 2026-07-26 08:39:35 +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