Commit Graph

206 Commits (c68727aebe201caa490c843f0c02b3dfda3d74eb)

Author SHA1 Message Date
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
Katharina Ziolkowski 6a2355cf97 🐛 fixed never more than 10 fields bug
5 months ago
Katharina Ziolkowski f1b980cdb6 🐛 field creation at the same spot no longer possible, also watering works now.
5 months ago
Katharina Ziolkowski 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code
5 months ago
jonathan 0de3bcae22 ♻️Code cleanup
5 months ago
jonathan 3326bde40c 🐛Exiting fight happening when one side wins
5 months ago
jonathan 8bb1c22549 Added minigame to attack action
5 months ago
jonathan 8624e2aea8 Added minigame
5 months ago
jonathan f4d8ed87e2 Added blob attack action
5 months ago
jonathan 9bf25640f6 Added basic action animation
5 months ago
jonathan 0e315396c9 Made fight fightable
5 months ago
jonathan f27dd199b8 Fight happening base setup
5 months ago
jonathan fd0e631b1f Bootstrap fight system
5 months ago
Katharina Ziolkowski af8807610d :bug increased interaction area size for fence gates
6 months ago
Katharina Ziolkowski 02b6584e44 🐛 fixed ObjectDisposedException from the Inventory when switching scenes.
6 months ago
Katharina Ziolkowski e202534c6b 🐛 Vesnas Namensschild sieht nicht richtig aus FIXED
6 months ago
Katharina Ziolkowski 1f13f3ea51 Merge branch 'develop' into feature/detection_cross
6 months ago
Katharina Ziolkowski 3fe79f2fd8 Added VariableGetter functionality and some Variable setting components. Also added them to test scene.
6 months ago
Katharina Ziolkowski c96e6da78e Separated events from variables and adjusted test scene
6 months ago
Katharina Ziolkowski e1b1a2f447 🔧 adjusted seed pickup positions and indoor collider sizes
6 months ago
Katharina Ziolkowski 2d4e853ec8 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
6 months ago
Katharina Ziolkowski ffebe10593 💄 Added new fonts and increased textbox size. Also added border line.
6 months ago
Katharina Ziolkowski 5bcbee8865 created test scene and removed event test elements from start scene
6 months ago
Katharina Ziolkowski a593be8273 📝 added documentation and improved event scope
6 months ago
Katharina Ziolkowski 1e004b62b8 Implemented first version of EventResources
6 months ago
Katharina Ziolkowski 5fc7b3d563 scene updates after undoing changes to interactionArea
6 months ago
Katharina Ziolkowski 936983e14f 💄 updated dialogic style to make it clearer who is talking and have vesna always on the left side
7 months ago
Katharina Ziolkowski e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources
7 months ago
Katharina Ziolkowski 0713e334b3 Fixed InventoryInstance behaviour
7 months ago
Katharina Ziolkowski c56f654751 Set up second garden with beetroot, built transition from yard and back
7 months ago
Katharina Ziolkowski 1f88f9b4b5 Added beetroot as growable plant
7 months ago
Katharina Ziolkowski 06fd80f762 grass layering fix
7 months ago
Katharina Ziolkowski 2cb605261e Fixed Tomato farming (again)
7 months ago
Katharina Ziolkowski d1a8ff0cbf WIP reworking the item repository
7 months ago