Commit Graph

275 Commits (develop)

Author SHA1 Message Date
Jonathan e5b2b8b8ab Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop
4 weeks ago
Jonathan 2fa8aa9fbc Merge pull request 'Vesna resets to bed after death' (#47) from Vesna_resets_to_bed_after_dead into develop
4 weeks ago
Jonathan 6deb6e29fd Merge pull request 'Made attack selection only select alive enemies' (#45) from bug/attack_dead_enemy into develop
4 weeks ago
Jonathan edc133749f Merge pull request 'Randomized who starts the fight' (#41) from randomise_fight_start into develop
4 weeks ago
jonathan 5f75bde317 💄 Made heal button show how many beats are left
4 weeks ago
jonathan 7310bfbf6e Added flying beet to the ui when used
4 weeks ago
jonathan fef8380a57 When beetroot is in inventory the player can heal
4 weeks ago
jonathan f42c2c86b1 Defeated enemygroups now drop a beet_seed
4 weeks ago
JoansLink00 2ed9dbbc52 Vesna resets to bed after death
4 weeks ago
jonathan 6375383373 🐛Made attack selection only select alive enemies
1 month ago
jonathan a736adaafb Randomized who starts the fight
1 month ago
kziolkowski e51e0a24d2 🐛 fixed dialogic bugs and moved trash items out of the way
1 month ago
kziolkowski 7bb523f9e7 🐛 harvested plants don't come back on scene reload
1 month ago
kziolkowski a3651d6268 deleted unused code
1 month ago
kziolkowski 0892a13e66 🐛 fixed beet harvesting
1 month ago
kziolkowski 61caa6eea6 Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish
1 month ago
kziolkowski b7d1f9d8d5 Merge branch 'develop' into minigame_hit_feedback
1 month ago
kziolkowski 0d985e5bf6 Merge branch 'develop' into minigame_variation
1 month ago
kziolkowski 996470f5e6 🐛 fixed beets double spawning bug
1 month ago
kziolkowski 9b8933e698 ♻️ removed no longer used method
1 month ago
kziolkowski 9f4cda0e6d ♻️ Replaced _ready mit _entertree (while deferring)
1 month ago
jonathan aa4f1c55b5 Added visual feedback when hitting a region in the minigame
1 month ago
jonathan aad6c44567 Added randomnes into attack minigame
1 month ago
kziolkowski 229dd04bc1 Made bed interaction count up the days and verified that you can now play a full loop
1 month ago
kziolkowski b9a52dadcc fields can now seperate "today" from any other day
1 month ago
kziolkowski 0ecae5a4d9 watering can fillstate is saving and loading
1 month ago
kziolkowski c288af296c made plants only grow when watered
1 month ago
kziolkowski e65330786e 🐛 fixed dayplanted confusion on plants
1 month ago
kziolkowski c7a4aea70b Starting a new game resets the inventory now
1 month ago
kziolkowski b6caf4dbed 🐛 Fixed ObjectDisposedException Errors on plant/field and InventorySlot
1 month ago
kziolkowski 41b30a4274 🚧 days are counted, plants know which day it is, but harvestables are still broken
1 month ago
kziolkowski a1fb71119f 🚧 WIP binding the plant growth to the day count in the savefile
2 months ago
kziolkowski 684131f495 Make SaveableVariableNodes and a simple cheat to count up days
2 months ago
kziolkowski f32033cb5f Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop
2 months ago
kziolkowski 1ad463ccb0 🔥 removed unused code
2 months ago
jonathan 3f4dfccbc6 🐛Make the FightWorld reset when sleeping in the bed
2 months ago
jonathan 3c370e30a0 Added end of night scene
2 months ago
jonathan 073a74bb22 🚸Rebalanded fight to make it more likely to win
2 months ago
kziolkowski 75e4bdd7fd ♻️ removed Print statements
2 months ago
kziolkowski f37f7c7ceb added saving and loading support to collectable inventory items
2 months ago
kziolkowski 70383fc16e Implemented load check for unique inventory items
2 months ago
kziolkowski 88f3c90eec ♻️ inventory works
2 months ago
kziolkowski 9d818e5079 ♻️ refactored field code to work with the new id system
2 months ago
kziolkowski e9cd4ce276 ♻️ reworked and debugged the SaveSystem. Removed unnecessary scene reference.
2 months ago
kziolkowski 638ebaff46 📝 Added documentation
2 months ago
kziolkowski b4013b1ff2 :feature: made GetComponent nullable in NodeExtension
2 months ago
kziolkowski c695115a4a :feature: implemented saving and loading for ducks, 🔥 removed save implementation from interactionArea
2 months ago
kziolkowski c68727aebe 🚧 intermediate state with homework
2 months ago
kziolkowski bee6249c6f 🚧 implemented interaction area loading
2 months ago
kziolkowski fda2b95b38 Savesystem rework
2 months ago