Commit Graph
597 Commits
Author SHA1 Message Date
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 4bd44c1641 merge: complete ranking menu parity 2026-07-26 05:27:24 +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 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 97f69aba18 merge: add nation general and secret office parity 2026-07-26 05:17:20 +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 ecb07e8f8e merge: cover general missing target boundaries 2026-07-26 05:12:39 +00:00
Hide_D 5104049580 merge: complete tournament lifecycle settlement 2026-07-26 05:12:25 +00:00
Hide_D 267d21f1a9 test(turn): cover missing target boundaries 2026-07-26 05:12:20 +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 2030c1240b merge: complete inheritance management parity 2026-07-26 05:06:59 +00:00
Hide_D 75b40f30bf test: honor inheritance parity ports 2026-07-26 05:06:27 +00:00
Hide_D 082164a901 Merge branch 'main' into feature/inheritance-management 2026-07-26 05:05:25 +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 b02ab9fe99 merge: add general cooldown boundary parity 2026-07-26 04:56:16 +00:00
Hide_D 0e344e4db1 test(turn): cover general cooldown boundaries 2026-07-26 04:56:00 +00:00
Hide_D 8fac491c9d merge: add general pre-required turn parity 2026-07-26 04:41:25 +00:00
Hide_D 5c76a20bc9 test(turn): cover general pre-required turn boundaries 2026-07-26 04:41:15 +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 78aae176fe merge: complete board room parity 2026-07-26 04:20:35 +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 d7ad1f598d merge: implement survey and unique reward parity 2026-07-26 04:18:48 +00:00
Hide_D dccf1fd356 Merge branch 'main' into feature/survey-unique-parity 2026-07-26 04:18:00 +00:00