Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

Commit Graph

  • e86b3e81dd Merge pull request 'fighting minigame has no more Overlap with Vesna' (#38) from fighting_minigame_fix_overlap_with_Vesna into develop kziolkowski 2025-12-06 19:46:23 +01:00
  • 14a73daa75 fighting minigame has no more Overlap with Vesna fighting_minigame_fix_overlap_with_Vesna jlink 2025-12-06 12:15:31 +01:00
  • 996470f5e6 🐛 fixed beets double spawning bug kziolkowski 2025-12-04 23:45:35 +01:00
  • 1dd4a694d0 Merge pull request 'feature/day_and_night' (#34) from feature/day_and_night into develop kziolkowski 2025-12-04 22:34:17 +01:00
  • 9b8933e698 ♻️ removed no longer used method kziolkowski 2025-12-04 22:33:45 +01:00
  • 9f4cda0e6d ♻️ Replaced _ready mit _entertree (while deferring) kziolkowski 2025-12-04 22:22:40 +01:00
  • 1c865730a3 🚚 renamed directory kziolkowski 2025-12-04 22:05:33 +01:00
  • aa4f1c55b5 ✨Added visual feedback when hitting a region in the minigame jonathan 2025-12-04 21:18:47 +01:00
  • aad6c44567 Added randomnes into attack minigame jonathan 2025-12-04 18:00:20 +01:00
  • 8e9359d6f8 Merge pull request 'fight log no longer visible and door interactable' (#35) from remove_fightlog into develop jlink 2025-12-04 17:39:10 +01:00
  • 7696271727 fight log no longer visible and door interactable remove_fightlog jlink 2025-12-04 17:31:31 +01:00
  • 229dd04bc1 ✨ Made bed interaction count up the days and verified that you can now play a full loop kziolkowski 2025-12-03 18:55:45 +01:00
  • 8407ce4c1f ✨ Added Tab button mapping to inventory and fixed label descriptor kziolkowski 2025-12-03 18:18:54 +01:00
  • b9a52dadcc ✨ fields can now seperate "today" from any other day kziolkowski 2025-12-03 17:56:45 +01:00
  • 0ecae5a4d9 ✨ watering can fillstate is saving and loading kziolkowski 2025-12-03 17:04:38 +01:00
  • c288af296c ✨ made plants only grow when watered kziolkowski 2025-12-02 17:44:44 +01:00
  • e65330786e 🐛 fixed dayplanted confusion on plants kziolkowski 2025-12-02 15:45:44 +01:00
  • c7a4aea70b ✨ Starting a new game resets the inventory now kziolkowski 2025-12-02 12:08:19 +01:00
  • b6caf4dbed 🐛 Fixed ObjectDisposedException Errors on plant/field and InventorySlot kziolkowski 2025-12-02 11:42:48 +01:00
  • 51a145a994 🚚 renamed player prefab to Vesna kziolkowski 2025-12-02 11:41:20 +01:00
  • 41b30a4274 🚧 days are counted, plants know which day it is, but harvestables are still broken kziolkowski 2025-11-28 20:25:47 +01:00
  • a1fb71119f 🚧 WIP binding the plant growth to the day count in the savefile kziolkowski 2025-11-26 20:12:27 +01:00
  • 67d5b67c21 💄 Added new game button that resets the savegame (also did some layouting) kziolkowski 2025-11-26 18:52:33 +01:00
  • 684131f495 ✨ Make SaveableVariableNodes and a simple cheat to count up days kziolkowski 2025-11-26 18:00:45 +01:00
  • f32033cb5f Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop kziolkowski 2025-11-26 15:11:13 +01:00
  • 1ad463ccb0 🔥 removed unused code kziolkowski 2025-11-26 14:37:42 +01:00
  • 451ea82706 Merge pull request 'feature/save_and_loaaaaaad' (#32) from feature/save_and_loaaaaaad into develop kziolkowski 2025-11-26 14:41:29 +01:00
  • 3f4dfccbc6 🐛Make the FightWorld reset when sleeping in the bed feature/night_to_day jonathan 2025-11-25 18:43:48 +01:00
  • 3c370e30a0 ✨Added end of night scene jonathan 2025-11-25 18:07:21 +01:00
  • 073a74bb22 🚸Rebalanded fight to make it more likely to win jonathan 2025-11-25 17:32:27 +01:00
  • 75e4bdd7fd ♻️ removed Print statements kziolkowski 2025-11-25 17:20:58 +01:00
  • f37f7c7ceb ✨ added saving and loading support to collectable inventory items kziolkowski 2025-11-25 17:14:30 +01:00
  • 70383fc16e ✨ Implemented load check for unique inventory items kziolkowski 2025-11-25 17:00:50 +01:00
  • 88f3c90eec ♻️ inventory works kziolkowski 2025-11-25 16:13:17 +01:00
  • 9d818e5079 ♻️ refactored field code to work with the new id system kziolkowski 2025-11-25 15:29:36 +01:00
  • e9cd4ce276 ♻️ reworked and debugged the SaveSystem. Removed unnecessary scene reference. kziolkowski 2025-11-25 14:39:31 +01:00
  • 638ebaff46 📝 Added documentation kziolkowski 2025-11-25 13:46:46 +01:00
  • b4013b1ff2 :feature: made GetComponent nullable in NodeExtension kziolkowski 2025-11-25 13:34:22 +01:00
  • c695115a4a :feature: implemented saving and loading for ducks, 🔥 removed save implementation from interactionArea kziolkowski 2025-11-25 13:33:53 +01:00
  • c68727aebe 🚧 intermediate state with homework kziolkowski 2025-11-23 22:50:32 +01:00
  • bee6249c6f 🚧 implemented interaction area loading kziolkowski 2025-11-23 22:25:59 +01:00
  • fda2b95b38 Savesystem rework kziolkowski 2025-11-23 21:02:40 +01:00
  • 4bbaab1a2a Created ISaveable interface and made existing saveable classes inherit from it. kziolkowski 2025-11-23 20:10:42 +01:00
  • 4ed6f4e7d9 Reworked existing save system for user data: Made path steam-compatible, added Versioning and try/catch to save kziolkowski 2025-11-21 21:04:37 +01:00
  • ce29711614 ❇️ Added Settings classes to save and load local configurations kziolkowski 2025-11-21 20:33:52 +01:00
  • 2947011a1a working intermediate state of the save system kziolkowski 2025-11-21 17:27:46 +01:00
  • 2a4425b9db ✨ Added Save and load support to the inventory kziolkowski 2025-11-19 15:18:33 +01:00
  • 72079044bd 🚧 WIP implementing save and load for the inventory kziolkowski 2025-11-18 18:30:17 +01:00
  • b205e45096 Merge pull request 'feature/farming_bugfixes_and_magic_word' (#30) from feature/farming_bugfixes_and_magic_word into develop Jonathan 2025-11-18 17:25:59 +01:00
  • d17e58bcd3 🐛 removed stub code and unused signal from FarmingControls2D kziolkowski 2025-11-18 17:17:42 +01:00
  • 02cbc761bc reverted changed start scene in project godot kziolkowski 2025-11-18 16:41:55 +01:00
  • fb6a42a874 Merge pull request 'Added damage fly number' (#29) from feature/damage_feedback into develop Jonathan 2025-11-18 16:07:32 +01:00
  • 4bd433b1b0 Merge pull request 'Import changes lol' (#31) from feature/import_changes into develop Jonathan 2025-11-18 16:07:00 +01:00
  • c02a2d1383 Import changes lol kziolkowski 2025-11-18 15:59:51 +01:00
  • c5f8b157ad 🐛 changed savegame location to user-space instead of project-space kziolkowski 2025-11-18 15:55:31 +01:00
  • 093546f3e4 Merge branch 'develop' into feature/farming_bugfixes_and_magic_word kziolkowski 2025-11-18 15:24:45 +01:00
  • c9f97c2571 📝 added documentation comments kziolkowski 2025-11-15 22:27:26 +01:00
  • 6613e54658 ✨ Implemented Loading function on fields and plants kziolkowski 2025-11-15 22:15:02 +01:00
  • 3fcb34c04d 🚧 saving of field parameters as json implemented kziolkowski 2025-11-12 18:46:30 +01:00
  • 5cc65bc3f4 🔧 filled up main outdoor scene with fields kziolkowski 2025-11-12 15:20:21 +01:00
  • 443741f5f1 🐛 added preset fields to main outdoor scene and made them farmable kziolkowski 2025-11-12 15:14:10 +01:00
  • 554a319428 🚧 farming rework part 2: you can now kinda "create" fields kziolkowski 2025-11-11 16:39:47 +01:00
  • 3bb4fcd129 ✨Added damage fly number feature/damage_feedback jonathan 2025-11-11 15:55:15 +01:00
  • 4705d1ee2f 🐛 can no longer water fields when watering can is empty kziolkowski 2025-11-11 15:54:09 +01:00
  • b00b466045 🚧 watering fields kinda works now kziolkowski 2025-11-11 15:51:15 +01:00
  • 0507f1ee3d Merge pull request 'Sleeping in bed now loads the new fight world scene' (#27) from feature/integrate_new_fight into develop Jonathan 2025-11-11 14:49:31 +01:00
  • 651ec2cc68 Merge pull request 'Fixed enemy groups show in different spots and even when all enemies are dead' (#28) from bug/enemy_group into develop Jonathan 2025-11-11 14:49:24 +01:00
  • d51cc461f7 🚧 made preplaced fields show plants kziolkowski 2025-11-11 14:27:56 +01:00
  • 54bfc3c021 🐛 Fixed enemy groups show in different spots and even when all enemies are dead bug/enemy_group jonathan 2025-11-11 14:06:58 +01:00
  • 55f0d2a77e 🚧 reworked farming system to work with indices instead of positions kziolkowski 2025-11-11 14:02:03 +01:00
  • 1531ffbf8d ✨Sleeping in bed now loads the new fight world scene feature/integrate_new_fight jonathan 2025-11-11 12:49:38 +01:00
  • 74096f2c71 🐛Fixed sprite outline fallback jonathan 2025-11-11 12:44:36 +01:00
  • 97dcadf07a ✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter. kziolkowski 2025-11-11 12:15:30 +01:00
  • 1c5d776a3a Merge pull request 'Fixed wrong dependency' (#26) from bug/scene_dependency into develop Jonathan 2025-11-11 11:19:54 +01:00
  • c814d7606d 🐛Fixed wrong dependency bug/scene_dependency jonathan 2025-11-11 11:12:54 +01:00
  • e1a61fb1e2 Merge pull request 'made dead fighters shrink to telegraph to the player that they are dead' (#25) from feature/dead_squash into develop Jonathan 2025-11-11 10:20:44 +01:00
  • edbd4a182b 🎨Removed comment feature/dead_squash jonathan 2025-11-11 10:19:37 +01:00
  • a9446ec770 Merge pull request '🐛 Fixed fighters keep fighting at 0 hp' (#24) from bug/enemy_die into develop Jonathan 2025-11-11 10:14:19 +01:00
  • be5573af0a Reorganized Sounds for Vesna, Sounds for (getting) hit, defense and defeated Nao 2025-11-09 13:24:42 +01:00
  • fe1dd2bcc1 ✨ Added inventorylistener for watering can kziolkowski 2025-11-07 20:37:59 +01:00
  • 6e833a0735 ✨ added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory kziolkowski 2025-11-07 20:29:05 +01:00
  • c52bfc8017 🐛 fixed field outline kziolkowski 2025-11-07 19:47:23 +01:00
  • 58c2be1db8 ✨ plants no longer grow when just interacting with them kziolkowski 2025-11-07 18:27:21 +01:00
  • c7c6e184d6 🐛 adjusted field positions kziolkowski 2025-11-07 18:24:52 +01:00
  • 6a2355cf97 🐛 fixed never more than 10 fields bug kziolkowski 2025-11-07 18:18:05 +01:00
  • 1d7f656ec4 🚧 WIP trying to fix a bug that won't let me have more than 9 fields. Dont ask me why. kziolkowski 2025-11-05 19:25:46 +01:00
  • 1c5b585b3d 🔥 removed print statements used for debugging kziolkowski 2025-11-05 16:50:41 +01:00
  • f1b980cdb6 🐛 field creation at the same spot no longer possible, also watering works now. kziolkowski 2025-11-05 16:48:45 +01:00
  • 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code kziolkowski 2025-11-04 17:20:15 +01:00
  • f51275ccc0 ✨ made dead fighters shrink to telegraph to the player that they are dead jonathan 2025-11-04 16:42:16 +01:00
  • 8d616735f4 🚚 moved Animationfix script kziolkowski 2025-11-04 16:40:19 +01:00
  • 50b2c04cb4 🐛 Fixed fighters keep fighting at 0 hp bug/enemy_die jonathan 2025-11-04 13:55:37 +01:00
  • 66848af8bf Merge branch 'develop' into feature/farming_bugfixes_and_magic_word kziolkowski 2025-11-04 11:24:51 +01:00
  • e864c62a3a Merge pull request 'Fight rework premature merge' (#22) from feature/fight_rework into develop Anna Jonathan 2025-11-04 10:25:12 +01:00
  • f27f69c15f 🐛 Rebase fixing feature/fight_rework jonathan 2025-11-04 10:06:01 +01:00
  • 21b361f9d7 🎨 Live review changes jonathan 2025-11-03 20:21:30 +01:00
  • 83dc6bfd56 ♻️ Implemented FightersFormation to keep track of the fight entered state of the fighters jonathan 2025-10-07 18:08:53 +02:00
  • 0de3bcae22 ♻️Code cleanup jonathan 2025-10-07 15:29:39 +02:00
  • 3326bde40c 🐛Exiting fight happening when one side wins jonathan 2025-10-05 19:50:05 +02:00
  • 83c9dfc945 ✨Added theme-based region colors jonathan 2025-10-03 20:02:25 +02:00