Commit Graph

214 Commits (develop)

Author SHA1 Message Date
Jonathan 9032272599 Merge pull request 'BlobFighter TargetSelection ColliderShape2D Transform angepasst' (#42) from Enemy_selection_overlap into develop
3 weeks ago
JoansLink00 1ab1071246 HoverIndicator off
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 09f55d3aa7 BlobFighter TargetSelection ColliderShape2D Transform angepasst
1 month ago
kziolkowski 9267278ce8 tried and failed at fixing all layering issues in beet scene
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 0892a13e66 🐛 fixed beet harvesting
1 month ago
kziolkowski 1c865730a3 🚚 renamed directory
1 month ago
kziolkowski 8407ce4c1f Added Tab button mapping to inventory and fixed label descriptor
1 month ago
kziolkowski 0ecae5a4d9 watering can fillstate is saving and loading
1 month ago
kziolkowski b6caf4dbed 🐛 Fixed ObjectDisposedException Errors on plant/field and InventorySlot
1 month ago
kziolkowski 51a145a994 🚚 renamed player prefab to Vesna
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 f32033cb5f Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop
2 months ago
jonathan 3c370e30a0 Added end of night scene
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 9d818e5079 ♻️ refactored field code to work with the new id system
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
Jonathan b205e45096 Merge pull request 'feature/farming_bugfixes_and_magic_word' (#30) from feature/farming_bugfixes_and_magic_word into develop
2 months ago
kziolkowski 3fcb34c04d 🚧 saving of field parameters as json implemented
2 months ago
kziolkowski 443741f5f1 🐛 added preset fields to main outdoor scene and made them farmable
2 months ago
kziolkowski 554a319428 🚧 farming rework part 2: you can now kinda "create" fields
2 months ago
jonathan 3bb4fcd129 Added damage fly number
2 months ago
kziolkowski b00b466045 🚧 watering fields kinda works now
2 months ago
kziolkowski d51cc461f7 🚧 made preplaced fields show plants
2 months ago
kziolkowski 55f0d2a77e 🚧 reworked farming system to work with indices instead of positions
2 months ago
kziolkowski 97dcadf07a Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
2 months ago
kziolkowski fe1dd2bcc1 Added inventorylistener for watering can
2 months ago
kziolkowski 6e833a0735 added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory
2 months ago
kziolkowski c52bfc8017 🐛 fixed field outline
2 months ago
kziolkowski 58c2be1db8 plants no longer grow when just interacting with them
2 months ago
kziolkowski c7c6e184d6 🐛 adjusted field positions
2 months ago
kziolkowski 6a2355cf97 🐛 fixed never more than 10 fields bug
2 months ago
kziolkowski 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code
2 months ago
kziolkowski 66848af8bf Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
2 months ago
jonathan f27f69c15f 🐛 Rebase fixing
2 months ago
jonathan 83dc6bfd56 ♻️ Implemented FightersFormation to keep track of the fight entered state of the fighters
2 months ago
jonathan 0de3bcae22 ♻️Code cleanup
2 months ago
jonathan 83c9dfc945 Added theme-based region colors
2 months ago
jonathan cd235248c6 Added minigame label for each region
2 months ago
jonathan 8624e2aea8 Added minigame
2 months ago
jonathan 1f227f70a7 Added basic health bar
2 months ago
jonathan 0e315396c9 Made fight fightable
2 months ago