feat/tornado #13

Merged

3002102 merged 7 commits from feat/tornado into main 2026-04-24 01:56:22 +02:00

Conversation 0 Commits 7 Files Changed 10

3002102 commented 2026-04-24 01:50:20 +02:00

Owner

There is no content yet.

3002102 added 4 commits 2026-04-24 01:50:21 +02:00

dfcf65ede2 added an actual hp/damage system to the witch and enemies game over screen is still missing the game just restarts

1dc4f16313 added a new perk in form of a spellbook

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>

d4d98bf678 added a brew option for a tornado with three grapes

3002102 added 1 commit 2026-04-24 01:52:20 +02:00

1e619e3273 Ignore macOS metadata files

3002102 added 1 commit 2026-04-24 01:54:03 +02:00

9294bd1388 Remove remaining macOS metadata files

3002102 added 1 commit 2026-04-24 01:56:06 +02:00

8075d56943 Merge remote-tracking branch 'origin/main' into feat/tornado ...

# Conflicts:
#	.DS_Store
#	assets/.DS_Store

3002102 merged commit c7e1afdc37 into main 2026-04-24 01:56:22 +02:00

3002102 referenced this issue from a commit 2026-04-24 01:56:23 +02:00

feat/tornado (#13)

3002102 deleted branch feat/tornado 2026-04-24 01:56:29 +02:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

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#13

There is no content yet.