Merge main into feat/spellbook, keep HP/damage system

Browse Source

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>

pull/12/head

3002102 2026-04-21 17:16:04 +02:00

parent 1dc4f16313 3f6e76c154

commit 45c0c15d79

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available