applications/magicciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2242 commits 15 branches 0 tags 1.1 GiB
Commit graph

196 commits

Author SHA1 Message Date
autocommit
46f2a9e183 feat(age-dwarves): ✨ Add 51 new combat units with detailed JSON configs (e.g., adamantine_sentinel, anti_tank_rifleman) including health, damage, speed, and abilities 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:54:59 -07:00
autocommit
e055027f5c feat(buildings): ✨ Add 20 new building types with configurations like ancestor hall, armour yard, and rifle range with their properties and rules 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:54:59 -07:00
Natalie
3280c93c5d Merge origin/main into main: ACS reconciliation 2026-04-26 
Diverged 2026-04-16 → 2026-04-26: local 27 commits (designs gallery, combat
calculator React app, culture-tree UI, hex-grid formation pages, design
tokens, dashboard status updates, threshold tweak, mc-trade crate scaffold)
vs origin 37 commits (HUD panels, scenes, AI turn-bridge, fog-of-war tests,
diplomacy, culture refinements, tactical tuning, improvement-preview system,
paused-state save/load).

17 files were edited on both sides since merge-base c70b43326. Findings:

  • 15 of 17 files: byte-identical between local and origin — the same
    autonomous agent applied the same edits on both hosts, so the merge
    is a no-op for those.
  • src/game/engine/scenes/world_map/world_map.gd: auto-merged cleanly.
    Local _sync_cities() definition + call kept; origin's improvement-
    preview system (89 lines) layered alongside. Final file has 2 refs
    to _sync_cities and 10 refs to preview symbols (preview_yields,
    building_placement_pick_requested, _confirm_building_placement,
    improvement_preview_requested).
  • src/game/engine/scenes/world_map/world_map_city_actions.gd: hand-
    merged. Origin's _on_popup_selected is a strict superset of local's
    — same preview-emit path PLUS an AI_ARENA fallback that calls
    _improvement_manager.start_improvement directly when no preview
    listener is connected. Took origin's version; tagged the merged
    block with a 'merged from local 9fd0a2ab5 + origin 07ad84d6c' note.

No commits dropped. All 27 local commits preserved in history.
Pure-additive local work (.project/designs/*, scripts/run/dev.sh designs
subcommand, mc-trade crate, combat calculator React app) carried through
the merge unchanged. All 165 origin-only added files (HUD .uid files,
proof-test scenes, integration tests, rendering/.uid files) integrated.

JSON validity verified: vocabulary.json + 6 culture/*.json all parse
cleanly. No conflict markers remain. Validation pending: ./run verify on
EDIT host; cargo check + ./run test:headless on apricot.
 2026-04-26 19:34:51 -07:00
Natalie
1a503ed028 feat(@projects/@magic-civilization): ✨ add hex grid formation interactive page 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:40:48 -07:00
Natalie
3d04d5cb65 docs(@projects/@magic-civilization): 📝 update hex grid and tech tree design docs 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:30:28 -07:00
Natalie
aab69c9dfc feat(@projects): ✨ add permutations combat solver 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:25:19 -07:00
Natalie
dd2385d806 feat(@projects/@magic-civilization): ✨ add combat calculator navigation link 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:20:11 -07:00
Natalie
fe8dad3379 fix(@projects/@magic-civilization): 🐛 update preferred early builds 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 14:15:23 -07:00
Natalie
3742f54903 feat(@projects/@magic-civilization): ✅ mark culture research tree as complete 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 13:55:05 -07:00
Natalie
7a9e89b5c8 feat(@projects/@magic-civilization): ✨ add design tokens and culture system updates 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 08:05:10 -07:00
autocommit
c6c8f6f9fc docs(culture): 📝 Update refined cultural definitions and validation rules in artisanship, legacy, oral-tradition, philosophy, and statecraft JSON files 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 03:25:48 -07:00
autocommit
7c60ea9dfa docs(age-dwarves): 📝 Update game guide documentation with new vocabulary terms and test coverage image for route validation 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 03:19:39 -07:00
Natalie
c70b433266 feat(@projects/@magic-civilization): ✨ add cultural and tech design docs 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 02:27:00 -07:00
Natalie
921bc73e55 feat(@projects/@magic-civilization): ✨ add culture tree research system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 00:52:33 -07:00
Natalie
ae3a3b8d66 feat(world_map): ✨ add tile placement system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-25 23:30:09 -07:00
Natalie
9dd56517c5 feat(@projects): ✨ add clan personalities and tech updates 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-25 22:59:10 -07:00
Natalie
8e3107b92a feat(@projects/@magic-civilization): ✨ update tech-tree and mcts service implementation 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-25 22:48:40 -07:00
Natalie
cd45e8ffe7 fix(@projects/@magic-civilization): 🐛 update objective tracking and rename missing tasks 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-25 15:55:47 -07:00
Natalie
a2a8eea507 feat(@projects/@magic-civilization): ✨ update ai objectives statuses 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-25 15:40:35 -07:00
Natalie
24dd3e3f39 feat(@projects/@magic-civilization): ✨ add new objectives and units data 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-24 16:15:36 -07:00
Natalie
e31075866b fix(@projects): 🐛 resolve determinism gate test blocker 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-19 18:40:09 -07:00
Natalie
fe45592e32 fix(@projects/@magic-civilization): 🐛 update priority counts and stub counts 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-19 18:04:47 -07:00
Natalie
9538e65c19 feat(@projects/@magic-civilization): ✨ update objectives tracking and completion statuses 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-19 17:54:36 -07:00
Natalie
3038fcbd75 feat(@projects/@magic-civilization): ✨ update unit actions and behaviors 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-19 17:39:22 -07:00
Natalie
7b013db455 fix(@projects/@magic-civilization): 🐛 update mcts priors env and gpu parity docs 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-19 16:59:03 -07:00
Natalie
272d00f317 fix(@projects/@magic-civilization): 🐛 update timestamp and missing count 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-19 16:33:51 -07:00
Natalie
d2dd264027 fix(@projects/@magic-civilization): 🐛 update stress-test objective date 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-19 15:53:32 -07:00
Natalie
68c1f22b8a fix(@projects/@magic-civilization): 🐛 update objective priorities and team leads 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 22:36:37 -07:00
Natalie
99b8d6249a feat(@projects/@magic-civilization): ✨ add tiered difficulty knobs to age-of-dwarves 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 22:31:34 -07:00
Natalie
31facca432 fix(@projects/@magic-civilization): 🐛 adjust difficulty loading timing 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 21:56:13 -07:00
Natalie
4c8dbbe29c feat(@projects/@magic-civilization): ✨ update difficulty modifiers and thresholds 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 20:29:35 -07:00
Natalie
88080e597e feat(objectives): ✅ mark p0-39 ai tier progression as complete 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 19:59:16 -07:00
Natalie
7c6d922719 feat(@projects): ✨ add ai tier progression unit selection objective 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 15:40:15 -07:00
Natalie
bda0b24293 fix(@projects/@magic-civilization): 🐛 adjust objectives tracking and clarify tech/data constraints 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 13:59:31 -07:00
Natalie
7804c76a1f feat(@projects/@magic-civilization): ✨ update mcts personality priors priority to partial 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 13:49:24 -07:00
Natalie
57d6cc3f04 feat(objectives): ✅ mark p0-37 as complete 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 13:39:17 -07:00
Natalie
e7b8424504 feat(@projects/@magic-civilization): ✨ update personality threshold priority status 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 11:13:13 -07:00
Natalie
374694f1cb feat(objectives): ✨ update priority counts and add new stub objectives 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 11:03:06 -07:00
Natalie
2c0071e721 feat(objectives): ✨ update clan personalities priority and status 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 10:27:49 -07:00
Natalie
109a5fb692 fix(@projects/@magic-civilization): 🐛 update objective priorities and dates 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 10:12:42 -07:00
Natalie
b338e451c8 feat(@projects/@magic-civilization): ✨ update objectives and deploy workflow 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 08:57:01 -07:00
Natalie
5ba397483c fix(@projects/@magic-civilization): 🐛 update objective pipeline export data 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 07:20:44 -07:00
Natalie
1803e9857b fix(@projects/@magic-civilization): 🐛 update balance tuning objectives and data schemas 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 06:39:59 -07:00
Natalie
1a18b21c8b feat(@projects/@magic-civilization): ✨ update quality scale multipliers 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 06:29:53 -07:00
Natalie
dd5fed3b7d fix(@projects/@magic-civilization): 🐛 resolve simcache bake deployment regression 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 06:04:39 -07:00
Natalie
36b785f048 fix(@projects/@magic-civilization): 🐛 update objective guides and data alignment 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 05:44:30 -07:00
Natalie
bdb8b1cb12 feat(guide): ✨ add styled-components theme augmentation 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 05:39:27 -07:00
Natalie
bdce983786 feat(@projects/@magic-civilization): ✨ update species browser shared component 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 05:34:24 -07:00
Natalie
b5208e9c37 feat(@projects/@magic-civilization): ✨ add welcome modal e2e test 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 05:29:20 -07:00
Natalie
979abea2e0 feat(@projects/@magic-civilization): ✨ add wireguard world map test suite 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-18 04:58:41 -07:00