feat/spellbook #12

Merged
3002102 merged 3 commits from feat/spellbook into main 2026-04-21 17:17:36 +02:00
There is no content yet.
3002102 added 2 commits 2026-04-21 17:13:03 +02:00
3002102 added 1 commit 2026-04-21 17:16:33 +02:00
45c0c15d79 Merge main into feat/spellbook, keep HP/damage system
Resolved conflicts in enemy_base.gd and slime.gd by keeping the
feat/spellbook HP system (max_hp/hp/take_damage) over main's
hits_remaining approach.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
3002102 merged commit c959b0d3e5 into main 2026-04-21 17:17:36 +02:00
3002102 referenced this issue from a commit 2026-04-21 17:17:36 +02:00
3002102 deleted branch feat/spellbook 2026-04-21 17:17:39 +02:00
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: 3002102/gae_wild_jam#12
There is no content yet.