Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

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
Conversation 1 Commits 34 Files Changed 63
+1171 -693
kziolkowski commented 2025-12-18 14:17:34 +01:00
Owner
Copy Link
Copy Source

This PR contains PR 48 as well and can be used to close both.

Changes:

  • some more fixes to the farming / savesystem issues: Made FieldActivator update correctly on second load, deactivated harvestable plant on spawn, made fields react to watering can state changes (filled / empty)
  • some minor adjustments to colliders
  • Added domovoi and cat placeholder dialogues
  • Updated scene path references in fightworld
  • Re-added disclaimer scene and credit scene into the flow
  • Added background to fightworld
  • fixed some layering issues in beetroot scene
This PR contains [PR 48](https://gitea.sneaky-elephants.com/Jonathan/Babushka/pulls/48) as well and can be used to close both. Changes: * some more fixes to the farming / savesystem issues: Made FieldActivator update correctly on second load, deactivated harvestable plant on spawn, made fields react to watering can state changes (filled / empty) * some minor adjustments to colliders * Added domovoi and cat placeholder dialogues * Updated scene path references in fightworld * Re-added disclaimer scene and credit scene into the flow * Added background to fightworld * fixed some layering issues in beetroot scene
kziolkowski added 32 commits 2025-12-18 14:17:34 +01:00
🚧 WIP: trying to rework the detection system (it fails) 9499c27444
Merge branch 'develop' into feature/bugfixes_polish_II a6260efc07
🚧 interaction kinda sorta works now, still needs tweaking b232cb31c3
pulled ceiling lower in kitchen scene 7ffbb8e68d
🚧 WIP detection works now 9e0e87ef17
🚧 Basic interaction works now too c509a52001
Merge branch 'develop' into feature/bugfixes_polish_II c55e527bf4
🐛 planting seeds works again ce113e16da
🚧 WIP trying to make fields have outlines again abed751d29
🐛 Fixed field interaction bug a98c842ee0
removed print statements 64c15c2e63
removed test scene 3f5cfed477
♻️ Renamed scenes 21cf2d1a6a
♻️ scene name refactoring part two: fixing scene transition paths in scenes aac0992590
♻️ modified changed path in start scene feb591f56a
🐛 Fixed ObjectNotDisposedException on Well in beetroot scene 950731b225
♻️ removed planted state from Fieldstate because it didn't make any sense. 30750d2e3c
removed GD.Prints 7f58aeae76
Added trash object savestate 13fcf059e9
🐛 fixed rake still activating field outlines bug 4f660c4af8
🐛 fixed rake triggering field interaction + watering can interaction c0111e4c17
🐛 fixed field setup in beet scene f1a2e6166b
Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7 48660b167c 
# Conflicts:
#	scenes/scene_farm_outside_2d.tscn
🐛 fixed field activator self-deactivating on load bug a401cbe5b9
Removed Print statements f862827d98
Deactivated harvestable plant on spawn 3bdc8cd03f
Added event handlers in Fieldbehaviour to react to watering can state changes f6e83e7fef
moved fence door collision shape up to reduce unwanted triggering f3080df4b7
Fixed Field outline not disappearing when switching tools 11e24e249e
fixed some layering issues in beetroot scene and added a mock convo with the domovoi 4f6c5ab9c1
Added fightworld background and cat dialogue 522fdfa365
fixed path strings in scene transitions and added disclaimer and credits back into the flow b0ee8c4c58
kziolkowski requested review from Jonathan 2025-12-18 14:17:41 +01:00
Jonathan approved these changes 2026-01-13 23:42:46 +01:00
Jonathan left a comment
Owner
Copy Link
Copy Source

Is the file .Babushka_bg_01.png-autosave.kra supposed to be in the PR?

Otherwise, looks good

Is the file `.Babushka_bg_01.png-autosave.kra` supposed to be in the PR? Otherwise, looks good
kziolkowski added 1 commit 2026-01-27 13:01:08 +01:00
deleted unused autosave file ff143f07e7
kziolkowski added 1 commit 2026-01-27 13:01:35 +01:00
Merge branch 'develop' into feature/build_0_7 76eb408a40
kziolkowski merged commit 2c8a024528 into develop 2026-01-27 13:04:22 +01:00
kziolkowski deleted branch feature/build_0_7 2026-01-27 13:04:27 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
Jonathan
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
ascheck (Anna Scheck) jlink kziolkowski (Katharina Ziolkowski) lkrause Nao Palurdas saderako Sanelschnitte Jonathan
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Jonathan/Babushka#49
Delete Branch "feature/build_0_7"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?