 Jonathan
|
e1a61fb1e2
|
Merge pull request 'made dead fighters shrink to telegraph to the player that they are dead' (#25) from feature/dead_squash into develop
Reviewed-on: #25
|
2025-11-11 10:20:44 +01:00 |
|
 jonathan
|
edbd4a182b
|
🎨Removed comment
|
2025-11-11 10:19:37 +01:00 |
|
|
Jonathan
|
a9446ec770
|
Merge pull request '🐛 Fixed fighters keep fighting at 0 hp' (#24) from bug/enemy_die into develop
Reviewed-on: #24
|
2025-11-11 10:14:19 +01:00 |
|
 kziolkowski
|
fe1dd2bcc1
|
✨ Added inventorylistener for watering can
|
2025-11-07 20:37:59 +01:00 |
|
|
kziolkowski
|
6e833a0735
|
✨ added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory
|
2025-11-07 20:29:05 +01:00 |
|
|
kziolkowski
|
c52bfc8017
|
🐛 fixed field outline
|
2025-11-07 19:47:23 +01:00 |
|
|
kziolkowski
|
58c2be1db8
|
✨ plants no longer grow when just interacting with them
|
2025-11-07 18:27:21 +01:00 |
|
|
kziolkowski
|
c7c6e184d6
|
🐛 adjusted field positions
|
2025-11-07 18:24:52 +01:00 |
|
|
kziolkowski
|
6a2355cf97
|
🐛 fixed never more than 10 fields bug
|
2025-11-07 18:18:05 +01:00 |
|
|
kziolkowski
|
1d7f656ec4
|
🚧 WIP trying to fix a bug that won't let me have more than 9 fields. Dont ask me why.
|
2025-11-05 19:25:46 +01:00 |
|
|
kziolkowski
|
1c5b585b3d
|
🔥 removed print statements used for debugging
|
2025-11-05 16:50:41 +01:00 |
|
|
kziolkowski
|
f1b980cdb6
|
🐛 field creation at the same spot no longer possible, also watering works now.
|
2025-11-05 16:48:45 +01:00 |
|
|
kziolkowski
|
8b77ca9bc5
|
♻️ migrated the InteractionAreas currently used to the new format and removed the old code
|
2025-11-04 17:20:15 +01:00 |
|
|
jonathan
|
f51275ccc0
|
✨ made dead fighters shrink to telegraph to the player that they are dead
|
2025-11-04 16:42:16 +01:00 |
|
|
kziolkowski
|
8d616735f4
|
🚚 moved Animationfix script
|
2025-11-04 16:40:19 +01:00 |
|
|
jonathan
|
50b2c04cb4
|
🐛 Fixed fighters keep fighting at 0 hp
|
2025-11-04 13:55:37 +01:00 |
|
|
kziolkowski
|
66848af8bf
|
Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
|
2025-11-04 11:24:51 +01:00 |
|
|
Jonathan
|
e864c62a3a
|
Merge pull request 'Fight rework premature merge' (#22) from feature/fight_rework into develop
Reviewed-on: #22
|
2025-11-04 10:25:12 +01:00 |
|
|
jonathan
|
f27f69c15f
|
🐛 Rebase fixing
|
2025-11-04 10:07:29 +01:00 |
|
|
jonathan
|
21b361f9d7
|
🎨 Live review changes
|
2025-11-04 10:07:19 +01:00 |
|
|
jonathan
|
83dc6bfd56
|
♻️ Implemented FightersFormation to keep track of the fight entered state of the fighters
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
0de3bcae22
|
♻️Code cleanup
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
3326bde40c
|
🐛Exiting fight happening when one side wins
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
83c9dfc945
|
✨Added theme-based region colors
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
cd235248c6
|
✨Added minigame label for each region
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
8bb1c22549
|
Added minigame to attack action
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
8624e2aea8
|
Added minigame
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
fef1bcc3b6
|
cap health at minimum 0
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
f4d8ed87e2
|
Added blob attack action
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
1f227f70a7
|
Added basic health bar
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
9bf25640f6
|
Added basic action animation
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
0e315396c9
|
Made fight fightable
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
f27dd199b8
|
Fight happening base setup
|
2025-11-04 05:27:34 +01:00 |
|
|
jonathan
|
fd0e631b1f
|
Bootstrap fight system
- Fight World data structure
- Generating basic fight world
- Opening correct fight room
- Block paths in fight rooms
- Transition between rooms
|
2025-11-04 05:25:22 +01:00 |
|
|
kziolkowski
|
6ba26c360d
|
🚧 reworking Fieldservice
|
2025-10-31 14:08:55 +01:00 |
|
|
kziolkowski
|
63fd81e54d
|
🔥 removed no longer needed scene call group
|
2025-10-31 12:38:48 +01:00 |
|
|
kziolkowski
|
b54f784d51
|
🎨 Replaced pickup animation group call with event
|
2025-10-31 12:36:08 +01:00 |
|
|
kziolkowski
|
6194988bf0
|
🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event.
|
2025-10-31 12:07:05 +01:00 |
|
|
kziolkowski
|
759933c1cd
|
Merge pull request 'feature/detection_cross' (#21) from feature/detection_cross into develop
Reviewed-on: #21
|
2025-10-31 10:47:20 +01:00 |
|
|
kziolkowski
|
af8807610d
|
:bug increased interaction area size for fence gates
|
2025-10-29 16:25:31 +01:00 |
|
|
kziolkowski
|
02b6584e44
|
🐛 fixed ObjectDisposedException from the Inventory when switching scenes.
|
2025-10-29 16:03:36 +01:00 |
|
|
kziolkowski
|
e202534c6b
|
🐛 Vesnas Namensschild sieht nicht richtig aus FIXED
|
2025-10-29 15:00:30 +01:00 |
|
|
kziolkowski
|
1f13f3ea51
|
Merge branch 'develop' into feature/detection_cross
# Conflicts:
# addons/dialogic/vesna_style.tres
# dialog/NPC_narrative.tres
# scenes/Babushka_scene_indoor_vesnas_room.tscn
|
2025-10-29 14:01:55 +01:00 |
|
|
kziolkowski
|
8b7afbcab6
|
Merge remote-tracking branch 'origin/feature/detection_cross' into feature/detection_cross
|
2025-10-29 13:32:57 +01:00 |
|
|
Jonathan
|
afce4ad0b9
|
Merge pull request 'feature/events' (#19) from feature/events into develop
Reviewed-on: #19
|
2025-10-28 21:12:45 +01:00 |
|
|
kziolkowski
|
32ac007256
|
🎨 Exchanged Quest post it with ui sprite
|
2025-10-28 17:32:18 +01:00 |
|
|
kziolkowski
|
d45deeb7ed
|
🔧 adjusted seed pickup positions and indoor collider sizes
|
2025-10-28 17:32:18 +01:00 |
|
|
kziolkowski
|
9e21b07271
|
🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
|
2025-10-28 17:32:18 +01:00 |
|
|
kziolkowski
|
f94c2d0a50
|
:memo::fire:🔨
- removed a lot of unnecessary code
- Made a minimal working version
- Added documentation
|
2025-10-28 17:32:18 +01:00 |
|
|
kziolkowski
|
84b8938d1f
|
🚧 WIP first setup completed (still buggy!)
|
2025-10-28 17:32:18 +01:00 |
|