 jonathan
|
3f4dfccbc6
|
🐛Make the FightWorld reset when sleeping in the bed
|
2025-11-25 18:43:48 +01:00 |
|
|
jonathan
|
3c370e30a0
|
✨Added end of night scene
|
2025-11-25 18:07:21 +01:00 |
|
|
jonathan
|
073a74bb22
|
🚸Rebalanded fight to make it more likely to win
|
2025-11-25 17:32:27 +01:00 |
|
 Jonathan
|
b205e45096
|
Merge pull request 'feature/farming_bugfixes_and_magic_word' (#30) from feature/farming_bugfixes_and_magic_word into develop
Reviewed-on: #30
|
2025-11-18 17:25:59 +01:00 |
|
 kziolkowski
|
d17e58bcd3
|
🐛 removed stub code and unused signal from FarmingControls2D
|
2025-11-18 17:17:42 +01:00 |
|
|
kziolkowski
|
c5f8b157ad
|
🐛 changed savegame location to user-space instead of project-space
|
2025-11-18 15:55:31 +01:00 |
|
|
kziolkowski
|
093546f3e4
|
Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
# Conflicts:
# scenes/Babushka_scene_farm_outside_2d.tscn
# scenes/Babushka_scene_indoor_vesnas_room.tscn
# scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs
|
2025-11-18 15:24:45 +01:00 |
|
|
kziolkowski
|
c9f97c2571
|
📝 added documentation comments
|
2025-11-15 22:27:26 +01:00 |
|
|
kziolkowski
|
6613e54658
|
✨ Implemented Loading function on fields and plants
|
2025-11-15 22:15:10 +01:00 |
|
|
kziolkowski
|
3fcb34c04d
|
🚧 saving of field parameters as json implemented
|
2025-11-12 18:46:30 +01:00 |
|
|
kziolkowski
|
443741f5f1
|
🐛 added preset fields to main outdoor scene and made them farmable
|
2025-11-12 15:14:10 +01:00 |
|
|
kziolkowski
|
554a319428
|
🚧 farming rework part 2: you can now kinda "create" fields
|
2025-11-11 16:39:47 +01:00 |
|
|
jonathan
|
3bb4fcd129
|
✨Added damage fly number
|
2025-11-11 15:55:41 +01:00 |
|
|
kziolkowski
|
4705d1ee2f
|
🐛 can no longer water fields when watering can is empty
|
2025-11-11 15:54:09 +01:00 |
|
|
kziolkowski
|
b00b466045
|
🚧 watering fields kinda works now
|
2025-11-11 15:51:15 +01:00 |
|
|
Jonathan
|
0507f1ee3d
|
Merge pull request 'Sleeping in bed now loads the new fight world scene' (#27) from feature/integrate_new_fight into develop
Reviewed-on: #27
|
2025-11-11 14:49:31 +01:00 |
|
|
kziolkowski
|
d51cc461f7
|
🚧 made preplaced fields show plants
|
2025-11-11 14:27:56 +01:00 |
|
|
jonathan
|
54bfc3c021
|
🐛 Fixed enemy groups show in different spots and even when all enemies are dead
|
2025-11-11 14:06:58 +01:00 |
|
|
kziolkowski
|
55f0d2a77e
|
🚧 reworked farming system to work with indices instead of positions
|
2025-11-11 14:02:03 +01:00 |
|
|
jonathan
|
74096f2c71
|
🐛Fixed sprite outline fallback
|
2025-11-11 12:44:36 +01:00 |
|
|
kziolkowski
|
97dcadf07a
|
✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
|
2025-11-11 12:15:30 +01:00 |
|
|
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 |
|
|
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
|
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
|
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 |
|