Commit Graph
358 Commits
Author SHA1 Message Date
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 71cf40219d Merge branch 'main' into feature/ingame-message-parity 2026-07-26 05:38:17 +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 195af5580e Complete dynasty list legacy parity 2026-07-26 05:33:42 +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 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 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 1cba5bdfbf Complete NPC policy API lifecycle parity 2026-07-26 05:17:59 +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 18ebff34aa merge: complete map-to-city page parity 2026-07-26 05:14:10 +00:00
Hide_D 4a3a6abf77 Merge branch 'main' into feature/city-page-parity
# Conflicts:
#	docs/frontend-legacy-parity.md
2026-07-26 05:12:45 +00:00
Hide_D 37048c9be7 feat: complete map-to-city page parity 2026-07-26 05:11:49 +00:00
Hide_D 83e80ee281 Merge branch 'main' into feature/tournament-lifecycle-e2e 2026-07-26 05:10:19 +00:00
Hide_D b92774bc45 fix tournament lifecycle settlement 2026-07-26 05:09:31 +00:00
Hide_D 7d41bfa957 test: verify inheritance parity and permissions 2026-07-26 05:04:51 +00:00
Hide_D 430193ef88 feat: complete inheritance management flow 2026-07-26 05:04:46 +00:00
Hide_D e6a6dbb221 test: resolve nation office assets across worktrees 2026-07-26 04:37:14 +00:00
Hide_D 200d883b5b Merge branch 'main' into feature/nation-personnel-finance-parity
# Conflicts:
#	docs/frontend-legacy-parity.md
2026-07-26 04:35:16 +00:00
Hide_D dc74a9a2be merge: complete tournament betting parity 2026-07-26 04:32:56 +00:00
Hide_D 35c1c138d7 Merge branch 'main' into feature/tournament-betting-parity 2026-07-26 04:32:29 +00:00
Hide_D af00b30bdc merge: add general alternative command parity 2026-07-26 04:32:16 +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 18b380aaa6 fix(turn): preserve legacy alternative command execution 2026-07-26 04:31:48 +00:00
Hide_D f4c09a9b02 feat: complete nation personnel and finance parity 2026-07-26 04:30:12 +00:00
Hide_D 62b7eb6d0c feat: restore tournament and betting hall UI 2026-07-26 04:29:58 +00:00
Hide_D eec2acc08d feat: complete tournament API lifecycle 2026-07-26 04:29:45 +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 dccf1fd356 Merge branch 'main' into feature/survey-unique-parity 2026-07-26 04:18:00 +00:00
Hide_D c2a3b5b797 Implement legacy-compatible survey and unique rewards 2026-07-26 04:17:56 +00:00