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
Jaro Winkelhausen
3f6e76c154
added an actual hp/damage system to the witch and enemies game over screen is still missing the game just restarts ( #11 )
...
Co-authored-by: Jaro <jaro@MacBook.local>
Reviewed-on: #11
2026-04-21 13:16:58 +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
Jaro Winkelhausen
9a82e74e41
add a knive perk where the witch initally throws a knive every 2 seconds with subsequent upgrades until the cooldown is 1s between throws ( #10 )
...
Reviewed-on: #10
Co-authored-by: 3002102 <3002102@stud.hs-mannheim.de>
Co-committed-by: 3002102 <3002102@stud.hs-mannheim.de>
2026-04-15 19:09:21 +02:00
Jaro Winkelhausen
01648c5939
add feature to wave logic for boss wave ( #9 )
...
Reviewed-on: #9
Co-authored-by: 3002102 <3002102@stud.hs-mannheim.de>
Co-committed-by: 3002102 <3002102@stud.hs-mannheim.de>
2026-04-15 18:19:55 +02:00
Jaro Winkelhausen
fc40a5c368
add timer to the ui ( #8 )
...
Reviewed-on: #8
Co-authored-by: 3002102 <3002102@stud.hs-mannheim.de>
Co-committed-by: 3002102 <3002102@stud.hs-mannheim.de>
2026-04-15 18:14:52 +02:00
e46b196f71
translated perks desc and name
2026-04-15 18:03:56 +02:00
671c046c3c
Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/3002102/gae_wild_jam
2026-04-15 18:00:03 +02:00
f5bbfd839a
fxied uid hell
2026-04-15 18:00:02 +02:00
Jaro Winkelhausen
c6277ccf22
fixed issue where the closer the enemies get to the with the slower they become ( #7 )
...
Reviewed-on: #7
Co-authored-by: 3002102 <3002102@stud.hs-mannheim.de>
Co-committed-by: 3002102 <3002102@stud.hs-mannheim.de>
2026-04-15 17:57:41 +02:00
5ee8c97455
Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/3002102/gae_wild_jam
2026-04-15 17:49:11 +02:00
b9f024685b
Merge branch 'better-perk-display'
2026-04-15 17:48:25 +02:00
Jaro Winkelhausen
6a2b122343
fixed error in fireball due to the boom effect from upgrade ( #6 )
...
Reviewed-on: #6
Co-authored-by: 3002102 <3002102@stud.hs-mannheim.de>
Co-committed-by: 3002102 <3002102@stud.hs-mannheim.de>
2026-04-15 17:47:27 +02:00
Jaro Winkelhausen
4a4a664fee
add a new wave spawning logic defined by a spawn_stages.json in the data folder ( #5 )
...
Reviewed-on: #5
Co-authored-by: 3002102 <3002102@stud.hs-mannheim.de>
Co-committed-by: 3002102 <3002102@stud.hs-mannheim.de>
2026-04-15 17:34:40 +02:00
452325a0b4
fixed explosion calculation and finished cards + xp bar
2026-04-15 17:22:15 +02:00
Jaro Winkelhausen
8b76140c2a
add new fire slime with three hp ( #3 )
...
Reviewed-on: #3
Co-authored-by: 3002102 <3002102@stud.hs-mannheim.de>
Co-committed-by: 3002102 <3002102@stud.hs-mannheim.de>
2026-04-15 17:05:54 +02:00
681471259b
improved card size
2026-04-15 16:09:46 +02:00
Meik Schürmann
fa50773a0e
Merge pull request 'implemented pause menu, fixed bug of music not looping' ( #2 ) from menuing_and_audio into main
...
Reviewed-on: #2
2026-04-15 10:49:07 +02:00
Meik Schürmann
fa2e3cfc9a
implemented pause menu, fixed bug of music not looping
2026-04-15 10:46:27 +02:00
c2cbeba20c
created card ui
2026-04-15 07:11:06 +02:00
3459ab5342
Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/3002102/gae_wild_jam
2026-04-14 19:48:21 +02:00
995b0f3035
Merge branch 'leveling-and-perk-system'
2026-04-14 19:45:30 +02:00
ecade1c284
implemented level up and perk system and 3 choosable perks on level up
2026-04-14 19:43:45 +02:00
Jaro Winkelhausen
190d4cf8bf
added a new weapon fireswirl that gets triggered by two apples and a grape
2026-04-14 18:33:40 +02:00
832d2dbd70
added different spells based on cauldron input and moved functions no cauldron
2026-04-14 17:26:05 +02:00
e89b80a825
cauldron change color based on collected fruits
2026-04-14 16:35:50 +02:00
574640e2da
ds store changed? binary blöd lesbar
2026-04-14 16:06:36 +02:00
8c6005596b
added dropsbase to grapes extend
2026-04-14 14:56:21 +02:00
708bb5e763
Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/3002102/gae_wild_jam
2026-04-14 14:54:46 +02:00
99b1e8069d
added grapes
2026-04-14 14:53:58 +02:00
1b3a1500d3
Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/3002102/gae_wild_jam
2026-04-14 14:49:55 +02:00
334a2f7248
fixed shuriken issue where it would bounce between two blue slimes endlessly
2026-04-14 14:49:34 +02:00
515aab1a70
Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/3002102/gae_wild_jam
2026-04-14 14:44:14 +02:00
5fea9d2ccf
added spawn variants
2026-04-14 14:44:12 +02:00
0ac9d0fae8
split hurt and die options on the base enemy
2026-04-14 14:41:51 +02:00
40d3d4c423
Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/3002102/gae_wild_jam
2026-04-14 14:10:03 +02:00
27aa1afce3
Added homing shuriken and fixed Viewport
2026-04-14 14:06:43 +02:00
8f7553125b
added hurt animation to blue slimes and wired them up correctly
2026-04-14 13:52:46 +02:00
09266bd67a
added blue slime and fitting death animation for the directions off travel
2026-04-14 13:22:19 +02:00
b35b69367a
add a world border so the player cant go of screen
2026-04-14 12:42:23 +02:00
d63e997117
Made Viewport scalable
2026-04-14 12:35:27 +02:00
b89d2cc64d
Added Fireball mechanic
2026-04-14 12:00:32 +02:00
abb24b227e
Added Cauldrons and bruning Animation
2026-04-14 09:33:50 +02:00
1b90d6296d
added check if enemy exists before accesing droptable to prevent game crash
2026-04-13 22:52:43 +02:00
1dbe6cc239
Added Cauldron Assets and Witch counting fruits mechanic. Casts Insta Death on 3 Fruits for Debug purposes
2026-04-13 22:49:06 +02:00
3c1dfb3f55
added the ability to collect apples
2026-04-13 22:17:00 +02:00
7851a25a65
added animated apple drop with tween
2026-04-13 18:52:54 +02:00
e65e98754d
Added Apple Drop on dying Slimes
2026-04-13 18:09:20 +02:00
fa4a9582d7
removed enemies collision layer when dying and removed multiple sfx on contact with dying enemies
2026-04-13 17:24:01 +02:00
3002102
Jaro Winkelhausen
Jaro
Artur
Artur David
Meik Schürmann