Commit Graph

523 Commits (a98c842ee0ffdea771de8aefb0d7645b7ef7dd60)
 

Author SHA1 Message Date
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 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
Katharina Ziolkowski 3d19509826 Merge pull request 'feature/art_update' (#40) from feature/art_update into develop
4 months ago
Katharina Ziolkowski 113dd0820f Merge branch 'develop' into feature/art_update
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 9499c27444 🚧 WIP: trying to rework the detection system (it fails)
4 months ago
Jonathan 0434667c22 Merge pull request 'feature/bugfixes_And_Polish' (#39) from feature/bugfixes_And_Polish into develop
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 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 2ec693eed2 Merge pull request 'Added visual feedback when hitting a region in the minigame' (#37) from minigame_hit_feedback into develop
4 months ago
Katharina Ziolkowski b7d1f9d8d5 Merge branch 'develop' into minigame_hit_feedback
4 months ago
Katharina Ziolkowski 12bf632932 Merge pull request 'Added randomnes into attack minigame' (#36) from minigame_variation into develop
4 months ago
Katharina Ziolkowski 0d985e5bf6 Merge branch 'develop' into minigame_variation
4 months ago
Katharina Ziolkowski e86b3e81dd Merge pull request 'fighting minigame has no more Overlap with Vesna' (#38) from fighting_minigame_fix_overlap_with_Vesna into develop
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
Katharina Ziolkowski 9b8933e698 ♻️ removed no longer used method
4 months ago
Katharina Ziolkowski 9f4cda0e6d ♻️ Replaced _ready mit _entertree (while deferring)
4 months ago
Katharina Ziolkowski 1c865730a3 🚚 renamed directory
4 months ago
jonathan aa4f1c55b5 Added visual feedback when hitting a region in the minigame
4 months ago
jonathan aad6c44567 Added randomnes into attack minigame
4 months ago
jlink 8e9359d6f8 Merge pull request 'fight log no longer visible and door interactable' (#35) from remove_fightlog 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 8407ce4c1f Added Tab button mapping to inventory and fixed label descriptor
4 months ago
Katharina Ziolkowski b9a52dadcc fields can now seperate "today" from any other day
4 months ago
Katharina Ziolkowski 0ecae5a4d9 watering can fillstate is saving and loading
4 months ago
Katharina Ziolkowski c288af296c made plants only grow when watered
4 months ago