feature/build_0_7 #49

Merged
kziolkowski merged 34 commits from feature/build_0_7 into develop 3 months ago

34 Commits (develop)

Author SHA1 Message Date
Katharina Ziolkowski 76eb408a40 Merge branch 'develop' into feature/build_0_7
3 months ago
Katharina Ziolkowski ff143f07e7 deleted unused autosave file
3 months ago
Katharina Ziolkowski b0ee8c4c58 fixed path strings in scene transitions and added disclaimer and credits back into the flow
4 months ago
Katharina Ziolkowski 522fdfa365 Added fightworld background and cat dialogue
4 months ago
Katharina Ziolkowski 4f6c5ab9c1 fixed some layering issues in beetroot scene and added a mock convo with the domovoi
4 months ago
Katharina Ziolkowski 11e24e249e Fixed Field outline not disappearing when switching tools
4 months ago
Katharina Ziolkowski f3080df4b7 moved fence door collision shape up to reduce unwanted triggering
4 months ago
Katharina Ziolkowski f6e83e7fef Added event handlers in Fieldbehaviour to react to watering can state changes
4 months ago
Katharina Ziolkowski 3bdc8cd03f Deactivated harvestable plant on spawn
4 months ago
Katharina Ziolkowski f862827d98 Removed Print statements
4 months ago
Katharina Ziolkowski a401cbe5b9 🐛 fixed field activator self-deactivating on load bug
4 months ago
Katharina Ziolkowski 48660b167c Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7
4 months ago
Katharina Ziolkowski f1a2e6166b 🐛 fixed field setup in beet scene
4 months ago
Katharina Ziolkowski c0111e4c17 🐛 fixed rake triggering field interaction + watering can interaction
4 months ago
Katharina Ziolkowski 4f660c4af8 🐛 fixed rake still activating field outlines bug
4 months ago
Katharina Ziolkowski 13fcf059e9 Added trash object savestate
4 months ago
Katharina Ziolkowski 7f58aeae76 removed GD.Prints
4 months ago
Katharina Ziolkowski 30750d2e3c ♻️ removed planted state from Fieldstate because it didn't make any sense.
4 months ago
Katharina Ziolkowski 950731b225 🐛 Fixed ObjectNotDisposedException on Well in beetroot scene
4 months ago
Katharina Ziolkowski feb591f56a ♻️ modified changed path in start scene
4 months ago
Katharina Ziolkowski aac0992590 ♻️ scene name refactoring part two: fixing scene transition paths in scenes
4 months ago
Katharina Ziolkowski 21cf2d1a6a ♻️ Renamed scenes
4 months ago
Katharina Ziolkowski 3f5cfed477 removed test scene
4 months ago
Katharina Ziolkowski 64c15c2e63 removed print statements
4 months ago
Katharina Ziolkowski a98c842ee0 🐛 Fixed field interaction bug
4 months ago
Katharina Ziolkowski abed751d29 🚧 WIP trying to make fields have outlines again
4 months ago
Katharina Ziolkowski ce113e16da 🐛 planting seeds works again
4 months ago
Katharina Ziolkowski c55e527bf4 Merge branch 'develop' into feature/bugfixes_polish_II
4 months ago
Katharina Ziolkowski c509a52001 🚧 Basic interaction works now too
4 months ago
Katharina Ziolkowski 9e0e87ef17 🚧 WIP detection works now
4 months ago
Katharina Ziolkowski 7ffbb8e68d pulled ceiling lower in kitchen scene
4 months ago
Katharina Ziolkowski b232cb31c3 🚧 interaction kinda sorta works now, still needs tweaking
4 months ago
Katharina Ziolkowski a6260efc07 Merge branch 'develop' into feature/bugfixes_polish_II
4 months ago
Katharina Ziolkowski 9499c27444 🚧 WIP: trying to rework the detection system (it fails)
4 months ago