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

236 commits

Author SHA1 Message Date
Natalie
e02cb440fc feat(@projects/@magic-civilization): ✨ add game-pack subscription manifest task 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 23:37:52 -04:00
Natalie
bdc82daeb8 feat(@projects/@magic-civilization): ✨ implement hex edge system with identity, terrain, and movement rules 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 21:26:57 -04:00
Natalie
433634ac8d feat(@projects/@magic-civilization): ✨ update defeat_domination audio details 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 17:59:37 -04:00
Natalie
9c42109dd6 feat(@projects/@magic-civilization): ✨ update objectives dashboard documentation 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 16:10:03 -04:00
Natalie
11b4477283 fix(@projects/@magic-civilization): 🗑️ consolidate building data 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 16:04:27 -04:00
Natalie
526dd29775 fix(@projects): 🐛 remove unused audio files and update paths 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 15:58:29 -04:00
Natalie
cd5b75b871 🗑️ remove unused audio files 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 15:52:36 -04:00
Natalie
feefd64301 fix(@projects/@magic-civilization): 🐛 update turn audio descriptions 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 15:47:02 -04:00
Natalie
a8936e448c feat(@projects): ✨ add biome economy coupling system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 13:10:45 -04:00
Natalie
dc67b0036e feat(@projects): ✨ add clan affinity routing tests 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 12:51:27 -04:00
Natalie
bfd71c4009 feat(@projects/@magic-civilization): ✨ add credits page navigation 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 12:40:19 -04:00
Natalie
59a5e7f67d fix(@projects/@magic-civilization): 🐛 update audio descriptions and stream paths 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 04:38:52 -04:00
Natalie
fd74a859d7 fix(@projects/@magic-civilization): 🐛 optimize audio file sizes 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 04:33:20 -04:00
Natalie
a8a47e534e feat(@projects/@magic-civilization): ✨ add new building completion audio events 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 02:10:21 -04:00
Natalie
4fb2460c93 feat(@projects/@magic-civilization): ✨ add new audio assets and manager 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-29 01:59:56 -04:00
Natalie
8ff01b67e0 feat(@projects/@magic-civilization): ✨ update audio fallback resolution logic 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-28 19:03:48 -04:00
Natalie
f13c1bd430 feat(@projects/@magic-civilization): ✨ add defeated/victorious unit sound effects 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-28 18:53:13 -04:00
Natalie
6ff1d157f1 feat(@projects/@magic-civilization): ✨ add per-hex improvement layer 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-28 18:32:16 -04:00
Natalie
95795ad3fe fix(@projects/@magic-civilization): 🐛 mark p2-39 as complete 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-28 18:21:40 -04:00
Natalie
fd9640ade7 feat(@projects/audio): ✨ add victory audio tracks 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-28 17:50:20 -04:00
Natalie
f3db6674ad feat(@projects/@magic-civilization): ✨ add audio option system and alternative ogg support 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-28 17:29:11 -04:00
Natalie
0d26c271b3 feat(@projects): ✨ add audio system integration 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-28 16:57:48 -04: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
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
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
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
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
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
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
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