feature/build_0_7 #49

Merged
kziolkowski merged 34 commits from feature/build_0_7 into develop 2026-01-27 13:04:22 +01:00

34 Commits

Author SHA1 Message Date
kziolkowski 76eb408a40 Merge branch 'develop' into feature/build_0_7 2026-01-27 13:01:34 +01:00
Katharina Ziolkowski ff143f07e7 deleted unused autosave file 2026-01-27 13:00:38 +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 11e24e249e Fixed Field outline not disappearing when switching tools 2025-12-16 23:29:48 +01:00
kziolkowski f3080df4b7 moved fence door collision shape up to reduce unwanted triggering 2025-12-16 23:13:38 +01:00
kziolkowski f6e83e7fef Added event handlers in Fieldbehaviour to react to watering can state changes 2025-12-16 23:13:09 +01:00
kziolkowski 3bdc8cd03f Deactivated harvestable plant on spawn 2025-12-16 23:06:58 +01:00
kziolkowski f862827d98 Removed Print statements 2025-12-16 23:06:41 +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
kziolkowski f1a2e6166b 🐛 fixed field setup in beet scene 2025-12-16 18:09:51 +01:00
kziolkowski c0111e4c17 🐛 fixed rake triggering field interaction + watering can interaction 2025-12-16 16:43:46 +01:00
kziolkowski 4f660c4af8 🐛 fixed rake still activating field outlines bug 2025-12-16 15:11:32 +01:00
kziolkowski 13fcf059e9 Added trash object savestate 2025-12-16 15:03:27 +01:00
kziolkowski 7f58aeae76 removed GD.Prints 2025-12-16 14:33:54 +01:00
kziolkowski 30750d2e3c ♻️ removed planted state from Fieldstate because it didn't make any sense. 2025-12-16 14:27:12 +01:00
kziolkowski 950731b225 🐛 Fixed ObjectNotDisposedException on Well in beetroot scene 2025-12-16 13:46:28 +01:00
kziolkowski feb591f56a ♻️ modified changed path in start scene 2025-12-16 13:46:07 +01:00
kziolkowski aac0992590 ♻️ scene name refactoring part two: fixing scene transition paths in scenes 2025-12-16 13:34:32 +01:00
kziolkowski 21cf2d1a6a ♻️ Renamed scenes 2025-12-16 13:17:39 +01:00
kziolkowski 3f5cfed477 removed test scene 2025-12-16 13:14:46 +01:00
kziolkowski 64c15c2e63 removed print statements 2025-12-16 13:14:25 +01:00
kziolkowski a98c842ee0 🐛 Fixed field interaction bug 2025-12-16 13:04:40 +01:00
kziolkowski abed751d29 🚧 WIP trying to make fields have outlines again 2025-12-15 22:45:02 +01:00
kziolkowski ce113e16da 🐛 planting seeds works again 2025-12-15 21:33:04 +01:00
kziolkowski c55e527bf4 Merge branch 'develop' into feature/bugfixes_polish_II 2025-12-15 20:41:44 +01:00
kziolkowski c509a52001 🚧 Basic interaction works now too 2025-12-12 13:49:16 +01:00
kziolkowski 9e0e87ef17 🚧 WIP detection works now 2025-12-12 13:46:32 +01:00
kziolkowski 7ffbb8e68d pulled ceiling lower in kitchen scene 2025-12-12 10:34:52 +01:00
kziolkowski b232cb31c3 🚧 interaction kinda sorta works now, still needs tweaking 2025-12-10 16:57:39 +01:00
kziolkowski a6260efc07 Merge branch 'develop' into feature/bugfixes_polish_II 2025-12-10 16:24:18 +01:00
kziolkowski 9499c27444 🚧 WIP: trying to rework the detection system (it fails) 2025-12-09 17:51:00 +01:00