Commit Graph

239 Commits (feature/farm_fight_loop)

Author SHA1 Message Date
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
Jonathan b810ea1d9f Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43) from Kampf_Tooltip into develop
4 months ago
Katharina Ziolkowski 7e148cd9fe 🐛 fixed Ysorting issues in fightworld
4 months ago
Katharina Ziolkowski 59489e4a17 Made common room into hub area and ajdusted Yeli dialogue
4 months ago
JoansLink00 fc00559483 Kampf Tooltip wird ausgeblendet
4 months ago
Katharina Ziolkowski 982178d89a 🐛 fixed sunflower parallaxing to *perfection*
4 months ago
Katharina Ziolkowski c89685c936 🐛 fixed colliders in kitchen
4 months ago
Katharina Ziolkowski 79108fbe15 🐛 fixed parallax problems
4 months ago
Katharina Ziolkowski bef54420e4 darkened fightworld room to make it look more like night
4 months ago
Katharina Ziolkowski 9267278ce8 tried and failed at fixing all layering issues in beet scene
4 months ago
Katharina Ziolkowski 9ba83dfddd Made stove interactable
4 months ago
Katharina Ziolkowski 7c5ba2d6bb Added kitchen room
4 months ago
Katharina Ziolkowski 0c5fc26d2f 🍱 changed forest background in first farming scene
4 months ago
Katharina Ziolkowski e51e0a24d2 🐛 fixed dialogic bugs and moved trash items out of the way
4 months ago
Katharina Ziolkowski 61caa6eea6 Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish
4 months ago
JoansLink00 14a73daa75 fighting minigame has no more Overlap with Vesna
4 months ago
Katharina Ziolkowski 996470f5e6 🐛 fixed beets double spawning bug
4 months ago
Katharina Ziolkowski 1dd4a694d0 Merge pull request 'feature/day_and_night' (#34) from feature/day_and_night into develop
4 months ago
JoansLink00 7696271727 fight log no longer visible and door interactable
4 months ago
Katharina Ziolkowski 229dd04bc1 Made bed interaction count up the days and verified that you can now play a full loop
4 months ago
Katharina Ziolkowski c288af296c made plants only grow when watered
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 67d5b67c21 💄 Added new game button that resets the savegame (also did some layouting)
5 months ago
Katharina Ziolkowski 684131f495 Make SaveableVariableNodes and a simple cheat to count up days
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 3f4dfccbc6 🐛Make the FightWorld reset when sleeping in the bed
5 months ago
Katharina Ziolkowski f37f7c7ceb added saving and loading support to collectable 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
Katharina Ziolkowski ce29711614 ❇️ Added Settings classes to save and load local configurations
5 months ago
Katharina Ziolkowski 2947011a1a working intermediate state of the save system
5 months ago
Katharina Ziolkowski c5f8b157ad 🐛 changed savegame location to user-space instead of project-space
5 months ago
Katharina Ziolkowski 093546f3e4 Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
5 months ago
Katharina Ziolkowski 6613e54658 Implemented Loading function on fields and plants
5 months ago
Katharina Ziolkowski 3fcb34c04d 🚧 saving of field parameters as json implemented
5 months ago
Katharina Ziolkowski 5cc65bc3f4 🔧 filled up main outdoor scene with fields
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
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
jonathan 1531ffbf8d Sleeping in bed now loads the new fight world scene
5 months ago
Katharina Ziolkowski 97dcadf07a Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
5 months ago
jonathan c814d7606d 🐛Fixed wrong dependency
5 months ago