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

2272 commits

This branch
This branch
All branches
Author SHA1 Message Date
Natalie
8c4e47d41e docs(@projects/@magic-civilization): 📝 update diplomatic agreement test verification 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 23:49:34 -04:00
Natalie
38d2e5c901 feat(@projects/@magic-civilization): ✨ integrate fauna-product happiness coupling 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 23:18:15 -04:00
Natalie
f9f818b058 fix(@projects/@magic-civilization): 🔴 update progress statuses 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 06:15:43 -07:00
Natalie
76cd3a70de feat(@projects/@magic-civilization): ✨ add move validation logic for courier diplomacy 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 05:59:45 -07:00
Natalie
21c3436251 feat(@projects): ✨ update objective tracking and reporting tool 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 05:49:07 -07:00
Natalie
2618d3d550 feat(audio): 🎵 add fauna sound assets 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 05:32:30 -07:00
Natalie
1a9854eed7 feat(@projects/@magic-civilization): ✨ add new audio assets and objectives 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 05:21:56 -07:00
Natalie
aaf9db24a3 fix(tools): 🐛 handle zip archive paths in batch audio fetch 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 05:11:15 -07:00
Natalie
ae5d21aefe feat(@projects/@magic-civilization): ✨ update building ID reconciliation task 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 04:50:19 -07:00
Natalie
780b027bd1 feat(@projects/@magic-civilization): ✨ add audio preview synth for design page 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 04:39:41 -07:00
Natalie
67df6b07c1 feat(objectives): ✨ update objective tracking and reporting 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 04:29:06 -07:00
Natalie
cd877a4a93 feat(@projects): ✨ reorganize combat and economy systems 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 02:59:49 -07:00
Natalie
067d55e70c feat(objectives): ✨ update objective tracking report 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 02:49:59 -07:00
Natalie
e8eda03c4f feat(@projects): ✨ add fauna resource trading system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 02:39:22 -07:00
Natalie
eaba6b542f feat(@projects/@magic-civilization): ✨ add real audio streaming support 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 02:28:47 -07:00
Natalie
59dea7f358 feat(@projects): ✨ add homogeneous ai snowball test framework 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 01:57:10 -07:00
Natalie
d6f041c171 feat(@projects): ✨ implement per-yield scaling and symmetric difficulty system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 01:46:36 -07:00
Natalie
b1febc5884 feat(audio): ✨ add procedural audio preview synth 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 01:36:01 -07:00
Natalie
b54f320703 feat(@projects/@magic-civilization): ✨ update objectives and data structures 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 01:25:24 -07:00
Natalie
b4c27b5667 feat(@projects): ✨ add audio system integration 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 01:14:50 -07:00
Natalie
2a5649c6d4 feat(@projects): ✨ add combat calculator & unit objectives system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 01:04:12 -07:00
Natalie
6211a4ccd9 feat(@projects/@magic-civilization): ✨ add age-of-dwarves unit and building assets 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-27 00:53:37 -07:00
Natalie
91ee619f25 feat(@projects/@magic-civilization): ✨ add hex terrain palette system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 21:08:49 -07:00
Natalie
3fcc9d2c30 feat(victory): ✨ increase grace turns to 100 for war council 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 20:28:17 -07:00
Natalie
80c8504f7e feat(@projects/@magic-civilization): ✨ update tier-10 research findings and round-2 plan 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 20:23:07 -07:00
Natalie
938f4b3aa7 feat(@projects/@magic-civilization): ✨ add castle defensive upgrade objective 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 20:12:50 -07:00
Natalie
ee5b16c834 feat(@projects/@magic-civilization): ✨ update hex terrain visuals and edge labels 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 20:07:37 -07:00
Natalie
f02d3efecb Merge remote-tracking branch 'origin/main' 2026-04-26 20:05:54 -07:00
Natalie
a908554b8b feat(@projects/@magic-civilization): ✨ add edge terrain blending logic 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:52:21 -07:00
Natalie
3bcd58f024 feat(@projects/@magic-civilization): ✨ add tier 10 units 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:47:08 -07:00
Natalie
0bfc993545 feat(@projects/@magic-civilization): ✨ add age-of-dwarves units & audio system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:42:00 -07:00
Natalie
e8697d4bc8 fix(merge): remove duplicate commit_improvement function 
The git auto-merger created a spurious second copy of commit_improvement
when reconciling the conflict in world_map_city_actions.gd. The first
copy had a stray '_pending_unit = null' injection that neither HEAD nor
origin/main had in their commit_improvement bodies.

Verified: function definitions now match both sides (6 funcs, including
the canonical commit_improvement that's byte-identical to origin/main).
gdformat clean, gdlint clean.

The hand-merged _on_popup_selected body (origin's superset with the
AI_ARENA fallback path) is unchanged — only the duplicate function
definition outside it was removed.
 2026-04-26 19:40:54 -07:00
Natalie
5edfa407d4 feat(@projects/@magic-civilization): ✨ add hex formation duality system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:36:51 -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
2f21485f81 feat(@projects/@magic-civilization): ✨ update courier diplomacy tiers to dwarven theme 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:31:41 -07:00
Natalie
17e69c6c41 feat(@projects/@magic-civilization): ✨ add dwarven courier tech audit blocker 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:56:09 -07:00
Natalie
3f15f8e581 feat(@projects/@magic-civilization): ✨ update diplomacy milestone status 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:45:58 -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
7c123269b3 feat(data): ✨ add domain type for units 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:35:40 -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
eba9b32db8 feat(@projects/@magic-civilization): ✨ add combat calculator and preview pages 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 16:54:08 -07:00
Natalie
01278f29fc feat(combat): ✨ add combat calculator components 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 16:48:59 -07:00
Natalie
2fd9eced63 feat(@projects/@magic-civilization): ✨ add combat system components 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 16:08:21 -07:00
Natalie
8163fb8fcb feat(@projects/@magic-civilization): ✨ add core unit data schema 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 16:03:12 -07:00
Natalie
649178d745 feat(@projects/@magic-civilization): ✨ add combat preview hp tracking visuals 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:58:03 -07:00
Natalie
7644090e9c feat(@projects/@magic-civilization): ✨ update combat preview with real stats display 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:52:35 -07:00
Natalie
5d6239c919 fix(@projects/@magic-civilization): 🐛 update mcts-wiring status to completed 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:32:09 -07:00
autocommit
934d71e81d revert(tactical): ⏪️ Revert capital-assault threshold changes to restore tier-3+ tech chain balance 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:27:44 -07:00