devsam/core2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
707 Commits 1 Branch 0 Tags
b66877b9c2da33b565368f74b92c8dcc394f8192
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hide_D b66877b9c2 merge: match scorched-earth command boundaries 2026-07-26 10:43:50 +00:00
Hide_D 88cb2166c1 fix: match scorched-earth command boundaries 2026-07-26 10:40:43 +00:00
Hide_D 6c3a156b84 Merge branch 'main' into feature/main-signup-kakao-gate 
# Conflicts:
#	app/gateway-frontend/src/views/LobbyView.vue
 2026-07-26 10:17:37 +00:00
Hide_D a7bb352ba2 feat: add local signup and Kakao verification gate 2026-07-26 10:17:16 +00:00
Hide_D bcf1faaba7 merge: match deception command boundaries 2026-07-26 10:15:59 +00:00
Hide_D b3fd9fbb42 Merge branch 'main' into feature/nation-deception-boundary-parity 2026-07-26 10:13:52 +00:00
Hide_D e4c71c5aef fix: match deception command boundaries 2026-07-26 10:13:46 +00:00
Hide_D 1151f41a0c Merge branch 'main' into feature/gateway-main-status-parity 2026-07-26 10:02:48 +00:00
Hide_D 465d9f0234 feat: restore gateway logout and main status 2026-07-26 10:01:38 +00:00
Hide_D 400e7433fa merge: verify desperate survival boundaries 2026-07-26 09:58:18 +00:00
Hide_D 27ace41bfe test: cover desperate survival boundaries 2026-07-26 09:58:08 +00:00
Hide_D 507d475912 merge: match surprise attack boundaries 2026-07-26 09:36:54 +00:00
Hide_D d4d373c4bd fix: match surprise attack boundaries 2026-07-26 09:36:44 +00:00
Hide_D c364552960 merge: match degrade relations boundaries 2026-07-26 09:17:46 +00:00
Hide_D e97ac96d3a merge: refresh degrade relations parity branch 2026-07-26 09:16:09 +00:00
Hide_D c2b1088758 fix: match degrade relations boundaries 2026-07-26 09:16:01 +00:00
Hide_D ce0b1e9842 Merge branch 'main' into feature/command-argument-ui 2026-07-26 09:07:46 +00:00
Hide_D 919a2fccda feat: add reserved command argument forms 2026-07-26 09:05:17 +00:00
Hide_D f84efafc9a feat: validate and describe reserved command arguments 2026-07-26 09:04:48 +00:00
Hide_D 7a429a8a84 Merge branch 'main' into feature/main-record-panels 2026-07-26 09:01:39 +00:00
Hide_D c47b2b18f2 merge: match mobilize people boundaries 2026-07-26 09:00:17 +00:00
Hide_D 87db8cff55 Merge branch 'main' into feature/main-record-panels 
# Conflicts:
#	app/game-api/src/router/general/index.ts
#	app/game-frontend/src/stores/mainDashboard.ts
#	app/game-frontend/src/views/MainView.vue
 2026-07-26 08:59:32 +00:00
Hide_D 301f7461f1 merge: refresh mobilize people parity branch 2026-07-26 08:59:18 +00:00
Hide_D 5d07aae5b9 fix: match mobilize people boundaries 2026-07-26 08:59:07 +00:00
Hide_D 918d8f0e4c feat: restore main record panels 2026-07-26 08:55:06 +00:00
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
Hide_D b2c0916695 merge: match nation resource amount boundaries 2026-07-26 05:50:31 +00:00
Hide_D e78a058387 fix(turn): match nation resource boundaries 2026-07-26 05:50:20 +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 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 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 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 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