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

303 Commits (develop)

Author SHA1 Message Date
Katharina Ziolkowski 0dfbd73978 Reverted ItemOnGround to make everything compile again
2 months ago
Katharina Ziolkowski 8a93b00e72 Merge branch 'develop' into feature/entity_rework
2 months ago
Katharina Ziolkowski ba7d550c3f Implemented Save and Load functionality
2 months ago
Katharina Ziolkowski b65a3bbd6d Managed the freeing of entityplacers. Also cleaned up EntityManager
2 months ago
Katharina Ziolkowski bcbc074c86 First adjustments to the Entity System to make it work with different types
2 months ago
jonathan 745f54b375 WIP
2 months ago
jonathan 59d313d97d Added basic entity scripts
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 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 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
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 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 c509a52001 🚧 Basic interaction works now too
4 months ago
Katharina Ziolkowski 9e0e87ef17 🚧 WIP detection works now
4 months ago
jonathan 6375383373 🐛Made attack selection only select alive enemies
4 months ago
Katharina Ziolkowski b232cb31c3 🚧 interaction kinda sorta works now, still needs tweaking
4 months ago
Katharina Ziolkowski 9499c27444 🚧 WIP: trying to rework the detection system (it fails)
4 months ago
jonathan a736adaafb Randomized who starts the fight
4 months ago
Katharina Ziolkowski e51e0a24d2 🐛 fixed dialogic bugs and moved trash items out of the way
4 months ago
Katharina Ziolkowski 7bb523f9e7 🐛 harvested plants don't come back on scene reload
4 months ago
Katharina Ziolkowski a3651d6268 deleted unused code
4 months ago
Katharina Ziolkowski 0892a13e66 🐛 fixed beet harvesting
4 months ago
Katharina Ziolkowski 61caa6eea6 Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish
4 months ago
Katharina Ziolkowski b7d1f9d8d5 Merge branch 'develop' into minigame_hit_feedback
4 months ago
Katharina Ziolkowski 0d985e5bf6 Merge branch 'develop' into minigame_variation
4 months ago
Katharina Ziolkowski 996470f5e6 🐛 fixed beets double spawning bug
4 months ago
Katharina Ziolkowski 9b8933e698 ♻️ removed no longer used method
4 months ago
Katharina Ziolkowski 9f4cda0e6d ♻️ Replaced _ready mit _entertree (while deferring)
4 months ago
jonathan aa4f1c55b5 ✨Added visual feedback when hitting a region in the minigame
4 months ago