Commit Graph

505 Commits

Author SHA1 Message Date
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 7bb523f9e7 🐛 harvested plants don't come back on scene reload 2025-12-06 20:47:56 +01:00
kziolkowski a3651d6268 deleted unused code 2025-12-06 20:40:47 +01:00
kziolkowski 0892a13e66 🐛 fixed beet harvesting 2025-12-06 20:36:22 +01:00
kziolkowski 61caa6eea6 Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish 2025-12-06 19:59:31 +01:00
kziolkowski 2ec693eed2 Merge pull request 'Added visual feedback when hitting a region in the minigame' (#37) from minigame_hit_feedback into develop
Reviewed-on: #37
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
2025-12-06 19:54:11 +01:00
kziolkowski b7d1f9d8d5 Merge branch 'develop' into minigame_hit_feedback 2025-12-06 19:54:05 +01:00
kziolkowski 12bf632932 Merge pull request 'Added randomnes into attack minigame' (#36) from minigame_variation into develop
Reviewed-on: #36
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
2025-12-06 19:53:49 +01:00
kziolkowski 0d985e5bf6 Merge branch 'develop' into minigame_variation 2025-12-06 19:53:44 +01:00
kziolkowski e86b3e81dd Merge pull request 'fighting minigame has no more Overlap with Vesna' (#38) from fighting_minigame_fix_overlap_with_Vesna into develop
Reviewed-on: #38
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
2025-12-06 19:46:23 +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
kziolkowski 9b8933e698 ♻️ removed no longer used method 2025-12-04 22:33:45 +01:00
kziolkowski 9f4cda0e6d ♻️ Replaced _ready mit _entertree (while deferring) 2025-12-04 22:22:40 +01:00
kziolkowski 1c865730a3 🚚 renamed directory 2025-12-04 22:05:33 +01:00
jonathan aa4f1c55b5 Added visual feedback when hitting a region in the minigame 2025-12-04 21:18:47 +01:00
jonathan aad6c44567 Added randomnes into attack minigame 2025-12-04 18:00:20 +01:00
jlink 8e9359d6f8 Merge pull request 'fight log no longer visible and door interactable' (#35) from remove_fightlog into develop
Reviewed-on: #35
2025-12-04 17:39:10 +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 8407ce4c1f Added Tab button mapping to inventory and fixed label descriptor 2025-12-03 18:18:54 +01:00
kziolkowski b9a52dadcc fields can now seperate "today" from any other day 2025-12-03 17:56:45 +01:00
kziolkowski 0ecae5a4d9 watering can fillstate is saving and loading 2025-12-03 17:04:38 +01:00
kziolkowski c288af296c made plants only grow when watered 2025-12-02 17:44:44 +01:00
kziolkowski e65330786e 🐛 fixed dayplanted confusion on plants 2025-12-02 15:45:44 +01:00
kziolkowski c7a4aea70b Starting a new game resets the inventory now 2025-12-02 12:08:19 +01:00
kziolkowski b6caf4dbed 🐛 Fixed ObjectDisposedException Errors on plant/field and InventorySlot 2025-12-02 11:42:48 +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 a1fb71119f 🚧 WIP binding the plant growth to the day count in the savefile 2025-11-26 20:12:27 +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
kziolkowski 1ad463ccb0 🔥 removed unused code 2025-11-26 14:43:55 +01:00
kziolkowski 451ea82706 Merge pull request 'feature/save_and_loaaaaaad' (#32) from feature/save_and_loaaaaaad into develop
Reviewed-on: #32
2025-11-26 14:41:29 +01:00
jonathan 3f4dfccbc6 🐛Make the FightWorld reset when sleeping in the bed 2025-11-25 18:43:48 +01:00
jonathan 3c370e30a0 Added end of night scene 2025-11-25 18:07:21 +01:00
jonathan 073a74bb22 🚸Rebalanded fight to make it more likely to win 2025-11-25 17:32:27 +01:00
kziolkowski 75e4bdd7fd ♻️ removed Print statements 2025-11-25 17:20:58 +01:00
kziolkowski f37f7c7ceb added saving and loading support to collectable inventory items 2025-11-25 17:14:30 +01:00
kziolkowski 70383fc16e Implemented load check for unique inventory items 2025-11-25 17:00:50 +01:00
kziolkowski 88f3c90eec ♻️ inventory works 2025-11-25 16:13:17 +01:00