8075d56943
Merge remote-tracking branch 'origin/main' into feat/tornado
...
# Conflicts:
# .DS_Store
# assets/.DS_Store
2026-04-24 01:55:40 +02:00
9294bd1388
Remove remaining macOS metadata files
2026-04-24 01:53:56 +02:00
1e619e3273
Ignore macOS metadata files
2026-04-24 01:52:05 +02:00
d4d98bf678
added a brew option for a tornado with three grapes
2026-04-24 01:49:30 +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>
2026-04-21 17:16:04 +02:00
1dc4f16313
added a new perk in form of a spellbook
2026-04-21 17:10:41 +02:00
dfcf65ede2
added an actual hp/damage system to the witch and enemies game over screen is still missing the game just restarts
2026-04-21 13:14:10 +02:00
3002102
Jaro