Commit Graph

232 Commits

Author SHA1 Message Date
kziolkowski 59489e4a17 Made common room into hub area and ajdusted Yeli dialogue 2025-12-10 16:02:38 +01:00
kziolkowski 982178d89a 🐛 fixed sunflower parallaxing to *perfection* 2025-12-10 15:34:45 +01:00
kziolkowski c89685c936 🐛 fixed colliders in kitchen 2025-12-10 15:15:01 +01:00
kziolkowski 79108fbe15 🐛 fixed parallax problems 2025-12-10 15:12:43 +01:00
kziolkowski bef54420e4 darkened fightworld room to make it look more like night 2025-12-07 10:54:54 +01:00
kziolkowski 9267278ce8 tried and failed at fixing all layering issues in beet scene 2025-12-07 10:43:41 +01:00
kziolkowski 9ba83dfddd Made stove interactable 2025-12-07 10:26:20 +01:00
kziolkowski 7c5ba2d6bb Added kitchen room 2025-12-07 10:22:02 +01:00
kziolkowski 0c5fc26d2f 🍱 changed forest background in first farming scene 2025-12-07 09:18:55 +01:00
kziolkowski e51e0a24d2 🐛 fixed dialogic bugs and moved trash items out of the way 2025-12-06 21:46:54 +01:00
kziolkowski 61caa6eea6 Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish 2025-12-06 19:59:31 +01:00
jlink 14a73daa75 fighting minigame has no more Overlap with Vesna 2025-12-06 12:15:31 +01:00
kziolkowski 996470f5e6 🐛 fixed beets double spawning bug 2025-12-04 23:45:35 +01:00
kziolkowski 1dd4a694d0 Merge pull request 'feature/day_and_night' (#34) from feature/day_and_night into develop
Reviewed-on: #34
2025-12-04 22:34:17 +01:00
jlink 7696271727 fight log no longer visible and door interactable 2025-12-04 17:31:31 +01:00
kziolkowski 229dd04bc1 Made bed interaction count up the days and verified that you can now play a full loop 2025-12-03 18:55:45 +01:00
kziolkowski c288af296c made plants only grow when watered 2025-12-02 17:44:44 +01:00
kziolkowski 51a145a994 🚚 renamed player prefab to Vesna 2025-12-02 11:41:48 +01:00
kziolkowski 41b30a4274 🚧 days are counted, plants know which day it is, but harvestables are still broken 2025-11-28 20:25:47 +01:00
kziolkowski 67d5b67c21 💄 Added new game button that resets the savegame (also did some layouting) 2025-11-26 18:52:33 +01:00
kziolkowski 684131f495 Make SaveableVariableNodes and a simple cheat to count up days 2025-11-26 18:00:45 +01:00
kziolkowski f32033cb5f Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop
Reviewed-on: #33
2025-11-26 15:11:13 +01:00
jonathan 3f4dfccbc6 🐛Make the FightWorld reset when sleeping in the bed 2025-11-25 18:43:48 +01:00
kziolkowski f37f7c7ceb added saving and loading support to collectable inventory items 2025-11-25 17:14:30 +01:00
kziolkowski 9d818e5079 ♻️ refactored field code to work with the new id system 2025-11-25 15:29:36 +01:00
kziolkowski c695115a4a :feature: implemented saving and loading for ducks, 🔥 removed save implementation from interactionArea 2025-11-25 13:33:53 +01:00
kziolkowski c68727aebe 🚧 intermediate state with homework 2025-11-23 22:50:32 +01:00
kziolkowski bee6249c6f 🚧 implemented interaction area loading 2025-11-23 22:25:59 +01:00
kziolkowski ce29711614 ❇️ Added Settings classes to save and load local configurations 2025-11-21 20:33:52 +01:00
kziolkowski 2947011a1a working intermediate state of the save system 2025-11-21 17:27:46 +01:00
kziolkowski c5f8b157ad 🐛 changed savegame location to user-space instead of project-space 2025-11-18 15:55:31 +01:00
kziolkowski 093546f3e4 Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
# Conflicts:
#	scenes/Babushka_scene_farm_outside_2d.tscn
#	scenes/Babushka_scene_indoor_vesnas_room.tscn
#	scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs
2025-11-18 15:24:45 +01:00
kziolkowski 6613e54658 Implemented Loading function on fields and plants 2025-11-15 22:15:10 +01:00
kziolkowski 3fcb34c04d 🚧 saving of field parameters as json implemented 2025-11-12 18:46:30 +01:00
kziolkowski 5cc65bc3f4 🔧 filled up main outdoor scene with fields 2025-11-12 15:20:21 +01:00
kziolkowski 443741f5f1 🐛 added preset fields to main outdoor scene and made them farmable 2025-11-12 15:14:10 +01:00
kziolkowski 554a319428 🚧 farming rework part 2: you can now kinda "create" fields 2025-11-11 16:39:47 +01:00
kziolkowski b00b466045 🚧 watering fields kinda works now 2025-11-11 15:51:15 +01:00
kziolkowski d51cc461f7 🚧 made preplaced fields show plants 2025-11-11 14:27:56 +01:00
kziolkowski 55f0d2a77e 🚧 reworked farming system to work with indices instead of positions 2025-11-11 14:02:03 +01:00
jonathan 1531ffbf8d Sleeping in bed now loads the new fight world scene 2025-11-11 12:49:38 +01:00
kziolkowski 97dcadf07a Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter. 2025-11-11 12:15:30 +01:00
jonathan c814d7606d 🐛Fixed wrong dependency 2025-11-11 11:12:54 +01:00
kziolkowski 6a2355cf97 🐛 fixed never more than 10 fields bug 2025-11-07 18:18:05 +01:00
kziolkowski f1b980cdb6 🐛 field creation at the same spot no longer possible, also watering works now. 2025-11-05 16:48:45 +01:00
kziolkowski 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code 2025-11-04 17:20:15 +01:00
jonathan 0de3bcae22 ♻️Code cleanup 2025-11-04 05:59:19 +01:00
jonathan 3326bde40c 🐛Exiting fight happening when one side wins 2025-11-04 05:59:19 +01:00
jonathan 8bb1c22549 Added minigame to attack action 2025-11-04 05:59:18 +01:00
jonathan 8624e2aea8 Added minigame 2025-11-04 05:59:18 +01:00