devsam/core2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
620 Commits 5 Branches 0 Tags
7c2cf84384ed47b5d507609caff951c8a420755f
Commit Graph
620 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 fe45b9b7a5 fix: restore lint and test baseline 2026-07-26 05:49:52 +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 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 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 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 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