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

230 Commits (feature/entity_rework)

Author SHA1 Message Date
Katharina Ziolkowski 8a93b00e72 Merge branch 'develop' into feature/entity_rework
2 months ago
Katharina Ziolkowski bcbc074c86 First adjustments to the Entity System to make it work with different types
2 months ago
Katharina Ziolkowski 76eb408a40 Merge branch 'develop' into feature/build_0_7
3 months ago
Jonathan 9032272599 Merge pull request 'BlobFighter TargetSelection ColliderShape2D Transform angepasst' (#42) from Enemy_selection_overlap into develop
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 3bdc8cd03f Deactivated harvestable plant on spawn
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 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
Katharina Ziolkowski 13fcf059e9 Added trash object savestate
4 months ago
Katharina Ziolkowski 21cf2d1a6a ♻️ Renamed scenes
4 months ago
Katharina Ziolkowski a98c842ee0 🐛 Fixed field interaction bug
4 months ago
Katharina Ziolkowski 9e0e87ef17 🚧 WIP detection works now
4 months ago
Katharina Ziolkowski b232cb31c3 🚧 interaction kinda sorta works now, still needs tweaking
4 months ago
JoansLink00 09f55d3aa7 BlobFighter TargetSelection ColliderShape2D Transform angepasst
4 months ago
Katharina Ziolkowski 9499c27444 🚧 WIP: trying to rework the detection system (it fails)
4 months ago
Katharina Ziolkowski 9267278ce8 tried and failed at fixing all layering issues in beet scene
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 0892a13e66 🐛 fixed beet harvesting
4 months ago
Katharina Ziolkowski 1c865730a3 🚚 renamed directory
4 months ago
Katharina Ziolkowski 8407ce4c1f ✨ Added Tab button mapping to inventory and fixed label descriptor
4 months ago
Katharina Ziolkowski 0ecae5a4d9 ✨ watering can fillstate is saving and loading
4 months ago
Katharina Ziolkowski b6caf4dbed 🐛 Fixed ObjectDisposedException Errors on plant/field and InventorySlot
4 months ago
Katharina Ziolkowski 51a145a994 🚚 renamed player prefab to Vesna
4 months ago
Katharina Ziolkowski 41b30a4274 🚧 days are counted, plants know which day it is, but harvestables are still broken
4 months ago
Katharina Ziolkowski a1fb71119f 🚧 WIP binding the plant growth to the day count in the savefile
5 months ago
Katharina Ziolkowski f32033cb5f Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop
5 months ago
jonathan 3c370e30a0 ✨Added end of night scene
5 months ago
Katharina Ziolkowski f37f7c7ceb ✨ added saving and loading support to collectable inventory items
5 months ago
Katharina Ziolkowski 70383fc16e ✨ Implemented load check for unique inventory items
5 months ago
Katharina Ziolkowski 9d818e5079 ♻️ refactored field code to work with the new id system
5 months ago
Katharina Ziolkowski c695115a4a :feature: implemented saving and loading for ducks, 🔥 removed save implementation from interactionArea
5 months ago
Katharina Ziolkowski c68727aebe 🚧 intermediate state with homework
5 months ago
Katharina Ziolkowski bee6249c6f 🚧 implemented interaction area loading
5 months ago
Jonathan b205e45096 Merge pull request 'feature/farming_bugfixes_and_magic_word' (#30) from feature/farming_bugfixes_and_magic_word into develop
5 months ago
Katharina Ziolkowski 3fcb34c04d 🚧 saving of field parameters as json implemented
5 months ago
Katharina Ziolkowski 443741f5f1 🐛 added preset fields to main outdoor scene and made them farmable
5 months ago
Katharina Ziolkowski 554a319428 🚧 farming rework part 2: you can now kinda "create" fields
5 months ago
jonathan 3bb4fcd129 ✨Added damage fly number
5 months ago
Katharina Ziolkowski b00b466045 🚧 watering fields kinda works now
5 months ago
Katharina Ziolkowski d51cc461f7 🚧 made preplaced fields show plants
5 months ago
Katharina Ziolkowski 55f0d2a77e 🚧 reworked farming system to work with indices instead of positions
5 months ago
Katharina Ziolkowski 97dcadf07a ✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
5 months ago