Jonathan
/
Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity
565 Commits
46 Branches
0 Tags
5.7 GiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2c8a024528'
${ noResults }
Commit Graph

565 Commits (2c8a024528633a1eda5d0acc0aabd203dff95e8d)
 

Author SHA1 Message Date
Katharina Ziolkowski 2c8a024528 Merge pull request 'feature/build_0_7' (#49) from feature/build_0_7 into develop
3 months ago
Katharina Ziolkowski 76eb408a40 Merge branch 'develop' into feature/build_0_7
3 months ago
Katharina Ziolkowski ff143f07e7 deleted unused autosave file
3 months ago
Jonathan b50ca5b919 Merge pull request 'einfügen von Gesichtsausdrücken für Vesna' (#46) from Vesna_Gesichtsausdrücke_einfügen_ into develop
3 months ago
Jonathan 9032272599 Merge pull request 'BlobFighter TargetSelection ColliderShape2D Transform angepasst' (#42) from Enemy_selection_overlap into develop
4 months ago
JoansLink00 a2ef3bfaf0 Window angepasst
4 months ago
JoansLink00 1ab1071246 HoverIndicator off
4 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
Jonathan e5b2b8b8ab Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop
4 months ago
Jonathan 2fa8aa9fbc Merge pull request 'Vesna resets to bed after death' (#47) from Vesna_resets_to_bed_after_dead into develop
4 months ago
Jonathan 6deb6e29fd Merge pull request 'Made attack selection only select alive enemies' (#45) from bug/attack_dead_enemy into develop
4 months ago
Jonathan edc133749f Merge pull request 'Randomized who starts the fight' (#41) from randomise_fight_start into develop
4 months ago
jonathan 5f75bde317 💄 Made heal button show how many beats are left
4 months ago
jonathan 7310bfbf6e ✨Added flying beet to the ui when used
4 months ago
jonathan fef8380a57 ✨When beetroot is in inventory the player can heal
4 months ago
jonathan f42c2c86b1 ✨ Defeated enemygroups now drop a beet_seed
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
JoansLink00 2ed9dbbc52 Vesna resets to bed after death
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
JoansLink00 3456340bb7 einfügen von Gesichtsausdrücken für Vesna
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
jonathan 6375383373 🐛Made attack selection only select alive enemies
4 months ago
Jonathan b810ea1d9f Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43) from Kampf_Tooltip into develop
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