Commit Graph

531 Commits (tmp/mock_qad_scripts)
 

Author SHA1 Message Date
jonathan bfe1be0145 added quick and dirty mock quest
2 months ago
jonathan 745f54b375 WIP
2 months ago
jonathan 59d313d97d Added basic entity scripts
4 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
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
JoansLink00 2ed9dbbc52 Vesna resets to bed after death
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 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
JoansLink00 09f55d3aa7 BlobFighter TargetSelection ColliderShape2D Transform angepasst
4 months ago
Katharina Ziolkowski c89685c936 🐛 fixed colliders in kitchen
4 months ago
Katharina Ziolkowski 79108fbe15 🐛 fixed parallax problems
4 months ago
Jonathan 0434667c22 Merge pull request 'feature/bugfixes_And_Polish' (#39) from feature/bugfixes_And_Polish into develop
4 months ago
jonathan a736adaafb Randomized who starts the fight
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