 kziolkowski
|
76eb408a40
|
Merge branch 'develop' into feature/build_0_7
|
2026-01-27 13:01:34 +01:00 |
|
 Jonathan
|
9032272599
|
Merge pull request 'BlobFighter TargetSelection ColliderShape2D Transform angepasst' (#42) from Enemy_selection_overlap into develop
Reviewed-on: #42
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-18 13:06:03 +01:00 |
|
 jlink
|
1ab1071246
|
HoverIndicator off
|
2025-12-17 15:29:58 +01:00 |
|
|
kziolkowski
|
b0ee8c4c58
|
fixed path strings in scene transitions and added disclaimer and credits back into the flow
|
2025-12-17 01:07:39 +01:00 |
|
|
kziolkowski
|
522fdfa365
|
Added fightworld background and cat dialogue
|
2025-12-17 00:40:43 +01:00 |
|
|
kziolkowski
|
4f6c5ab9c1
|
fixed some layering issues in beetroot scene and added a mock convo with the domovoi
|
2025-12-17 00:15:42 +01:00 |
|
|
kziolkowski
|
3bdc8cd03f
|
Deactivated harvestable plant on spawn
|
2025-12-16 23:06:58 +01:00 |
|
|
kziolkowski
|
a401cbe5b9
|
🐛 fixed field activator self-deactivating on load bug
|
2025-12-16 22:53:22 +01:00 |
|
|
kziolkowski
|
48660b167c
|
Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7
# Conflicts:
# scenes/scene_farm_outside_2d.tscn
|
2025-12-16 21:59:04 +01:00 |
|
 jonathan
|
7310bfbf6e
|
✨Added flying beet to the ui when used
|
2025-12-16 19:09:03 +01:00 |
|
|
jonathan
|
fef8380a57
|
✨When beetroot is in inventory the player can heal
|
2025-12-16 19:09:03 +01:00 |
|
|
jonathan
|
f42c2c86b1
|
✨ Defeated enemygroups now drop a beet_seed
|
2025-12-16 19:09:03 +01:00 |
|
|
kziolkowski
|
c0111e4c17
|
🐛 fixed rake triggering field interaction + watering can interaction
|
2025-12-16 16:43:46 +01:00 |
|
|
kziolkowski
|
13fcf059e9
|
Added trash object savestate
|
2025-12-16 15:03:27 +01:00 |
|
|
kziolkowski
|
21cf2d1a6a
|
♻️ Renamed scenes
|
2025-12-16 13:17:39 +01:00 |
|
|
kziolkowski
|
a98c842ee0
|
🐛 Fixed field interaction bug
|
2025-12-16 13:04:40 +01:00 |
|
|
kziolkowski
|
9e0e87ef17
|
🚧 WIP detection works now
|
2025-12-12 13:46:32 +01:00 |
|
|
kziolkowski
|
b232cb31c3
|
🚧 interaction kinda sorta works now, still needs tweaking
|
2025-12-10 16:57:39 +01:00 |
|
|
jlink
|
09f55d3aa7
|
BlobFighter TargetSelection ColliderShape2D Transform angepasst
|
2025-12-10 15:29:56 +01:00 |
|
|
kziolkowski
|
9499c27444
|
🚧 WIP: trying to rework the detection system (it fails)
|
2025-12-09 17:51:00 +01:00 |
|
|
kziolkowski
|
9267278ce8
|
tried and failed at fixing all layering issues in beet scene
|
2025-12-07 10:43:41 +01:00 |
|
|
kziolkowski
|
e51e0a24d2
|
🐛 fixed dialogic bugs and moved trash items out of the way
|
2025-12-06 21:46:54 +01:00 |
|
|
kziolkowski
|
7bb523f9e7
|
🐛 harvested plants don't come back on scene reload
|
2025-12-06 20:47:56 +01:00 |
|
|
kziolkowski
|
0892a13e66
|
🐛 fixed beet harvesting
|
2025-12-06 20:36:22 +01:00 |
|
|
kziolkowski
|
1c865730a3
|
🚚 renamed directory
|
2025-12-04 22:05:33 +01:00 |
|
|
kziolkowski
|
8407ce4c1f
|
✨ Added Tab button mapping to inventory and fixed label descriptor
|
2025-12-03 18:18:54 +01:00 |
|
|
kziolkowski
|
0ecae5a4d9
|
✨ watering can fillstate is saving and loading
|
2025-12-03 17:04:38 +01:00 |
|
|
kziolkowski
|
b6caf4dbed
|
🐛 Fixed ObjectDisposedException Errors on plant/field and InventorySlot
|
2025-12-02 11:42:48 +01:00 |
|
|
kziolkowski
|
51a145a994
|
🚚 renamed player prefab to Vesna
|
2025-12-02 11:41:48 +01:00 |
|
|
kziolkowski
|
41b30a4274
|
🚧 days are counted, plants know which day it is, but harvestables are still broken
|
2025-11-28 20:25:47 +01:00 |
|
|
kziolkowski
|
a1fb71119f
|
🚧 WIP binding the plant growth to the day count in the savefile
|
2025-11-26 20:12:27 +01:00 |
|
|
kziolkowski
|
f32033cb5f
|
Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop
Reviewed-on: #33
|
2025-11-26 15:11:13 +01:00 |
|
|
jonathan
|
3c370e30a0
|
✨Added end of night scene
|
2025-11-25 18:07:21 +01:00 |
|
|
kziolkowski
|
f37f7c7ceb
|
✨ added saving and loading support to collectable inventory items
|
2025-11-25 17:14:30 +01:00 |
|
|
kziolkowski
|
70383fc16e
|
✨ Implemented load check for unique inventory items
|
2025-11-25 17:00:50 +01:00 |
|
|
kziolkowski
|
9d818e5079
|
♻️ refactored field code to work with the new id system
|
2025-11-25 15:29:36 +01:00 |
|
|
kziolkowski
|
c695115a4a
|
:feature: implemented saving and loading for ducks, 🔥 removed save implementation from interactionArea
|
2025-11-25 13:33:53 +01:00 |
|
|
kziolkowski
|
c68727aebe
|
🚧 intermediate state with homework
|
2025-11-23 22:50:32 +01:00 |
|
|
kziolkowski
|
bee6249c6f
|
🚧 implemented interaction area loading
|
2025-11-23 22:25:59 +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
|
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
|
b00b466045
|
🚧 watering fields kinda works now
|
2025-11-11 15:51:15 +01:00 |
|
|
kziolkowski
|
d51cc461f7
|
🚧 made preplaced fields show plants
|
2025-11-11 14:27:56 +01:00 |
|
|
kziolkowski
|
55f0d2a77e
|
🚧 reworked farming system to work with indices instead of positions
|
2025-11-11 14:02:03 +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 |
|
|
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 |
|