shader adjustments to account for modulate value

Merge pull request 'feature/build_0_7' (#49 ) from feature/build_0_7 into develop
Reviewed-on: #49 Reviewed-by: Jonathan <cblech@ymail.com>
2026-02-01 14:00:21 +01:00 · 2026-01-27 13:04:21 +01:00 · 2026-01-27 13:01:34 +01:00 · 2026-01-27 13:00:38 +01:00 · 2026-01-13 23:43:46 +01:00 · 2025-12-18 13:06:03 +01:00
1949 changed files with 5052 additions and 3731 deletions
@@ -1,2 +1,8 @@
 # Normalize EOL for all files that Git considers text files.
 * text=auto eol=lf
+*.psd filter=lfs diff=lfs merge=lfs -text
+*.psb filter=lfs diff=lfs merge=lfs -text
+*.wav filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.png~ filter=lfs diff=lfs merge=lfs -text
+*.kra filter=lfs diff=lfs merge=lfs -text
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="GdSdk" type="GdScript">
+    <CLASSES />
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$APPLICATION_PLUGINS_DIR$/GdScript/extracted/Master" />
+    </SOURCES>
+  </library>
+</component>
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="GdSdk Master" type="GdScript">
-    <properties path="$USER_HOME$/.cache/JetBrains/Rider2025.1/projects/.idea.babushka.a4de4632/sdk/GdSdk Master" version="Master" date="2024-06-01T15:14:16.000+02:00" />
-    <CLASSES />
-    <JAVADOC />
-    <SOURCES>
-      <root url="file://$USER_HOME$/.cache/JetBrains/Rider2025.1/projects/.idea.babushka.a4de4632/sdk/GdSdk Master" />
-    </SOURCES>
-  </library>
-</component>
@@ -17,6 +17,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACount_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Ffe5a7cee5a1771b89077bd73292de84439b4f816799e2ad6c2615c6ff5bd748e_003FCount_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003Fhome_003Fjonathan_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe37dc1faf08a4d5ea030ad59bdf77522523400_003Fd4_003Fbd338aeb_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExportToolButtonAttribute_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe37dc1faf08a4d5ea030ad59bdf77522523400_003F31_003F3e05ef15_003FExportToolButtonAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGD_005Fconstants_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fdf61b6148ca71eef8cf4e56545a9319fd2647f05d2f959dad42d9fcbe95192_003FGD_005Fconstants_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMustBeVariantAttribute_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe37dc1faf08a4d5ea030ad59bdf77522523400_003Fda_003Fbb06d681_003FMustBeVariantAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGD_005Fconstants_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F4ef0bac6437b6a9567d44f62ae567d854fa7b8513ef7139ef349b49768bc9df_003FGD_005Fconstants_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANode_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Ff1d69ec2da76ccf9bc8a75c8e0fdca9a7ba1adf8c8c9d5047e2fa5991c02eca_003FNode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Katharina Ziolkowski	1120f17202	shader adjustments to account for modulate value	2026-02-01 14:00:21 +01:00
kziolkowski	2c8a024528	Merge pull request 'feature/build_0_7' (#49 ) from feature/build_0_7 into develop Reviewed-on: #49 Reviewed-by: Jonathan <cblech@ymail.com>	2026-01-27 13:04:21 +01:00
kziolkowski	76eb408a40	Merge branch 'develop' into feature/build_0_7	2026-01-27 13:01:34 +01:00
Katharina Ziolkowski	ff143f07e7	deleted unused autosave file	2026-01-27 13:00:38 +01:00
Jonathan	b50ca5b919	Merge pull request 'einfügen von Gesichtsausdrücken für Vesna' (#46 ) from Vesna_Gesichtsausdrücke_einfügen_ into develop Reviewed-on: #46 Reviewed-by: Jonathan <cblech@ymail.com>	2026-01-13 23:43:46 +01:00
Jonathan	9032272599	Merge pull request 'BlobFighter TargetSelection ColliderShape2D Transform angepasst' (#42 ) from Enemy_selection_overlap into develop Reviewed-on: #42 Reviewed-by: Jonathan <cblech@ymail.com>	2025-12-18 13:06:03 +01:00
jlink	a2ef3bfaf0	Window angepasst	2025-12-18 13:02:32 +01:00
jlink	1ab1071246	HoverIndicator off	2025-12-17 15:29:58 +01:00
kziolkowski	b0ee8c4c58	fixed path strings in scene transitions and added disclaimer and credits back into the flow	2025-12-17 01:07:39 +01:00
kziolkowski	522fdfa365	Added fightworld background and cat dialogue	2025-12-17 00:40:43 +01:00
kziolkowski	4f6c5ab9c1	fixed some layering issues in beetroot scene and added a mock convo with the domovoi	2025-12-17 00:15:42 +01:00
kziolkowski	11e24e249e	Fixed Field outline not disappearing when switching tools	2025-12-16 23:29:48 +01:00
kziolkowski	f3080df4b7	moved fence door collision shape up to reduce unwanted triggering	2025-12-16 23:13:38 +01:00
kziolkowski	f6e83e7fef	Added event handlers in Fieldbehaviour to react to watering can state changes	2025-12-16 23:13:09 +01:00
kziolkowski	3bdc8cd03f	Deactivated harvestable plant on spawn	2025-12-16 23:06:58 +01:00
kziolkowski	f862827d98	Removed Print statements	2025-12-16 23:06:41 +01:00
kziolkowski	a401cbe5b9	🐛 fixed field activator self-deactivating on load bug	2025-12-16 22:53:22 +01:00
kziolkowski	48660b167c	Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7 # Conflicts: # scenes/scene_farm_outside_2d.tscn	2025-12-16 21:59:04 +01:00
Jonathan	e5b2b8b8ab	Merge pull request 'Connect farming and fighting by making them codependent' (#44 ) from feature/farm_fight_loop into develop Reviewed-on: #44	2025-12-16 20:44:26 +01:00
Jonathan	2fa8aa9fbc	Merge pull request 'Vesna resets to bed after death' (#47 ) from Vesna_resets_to_bed_after_dead into develop Reviewed-on: #47 Reviewed-by: Jonathan <cblech@ymail.com>	2025-12-16 19:37:29 +01:00
Jonathan	6deb6e29fd	Merge pull request 'Made attack selection only select alive enemies' (#45 ) from bug/attack_dead_enemy into develop Reviewed-on: #45 Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>	2025-12-16 19:30:33 +01:00
Jonathan	edc133749f	Merge pull request 'Randomized who starts the fight' (#41 ) from randomise_fight_start into develop Reviewed-on: #41 Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>	2025-12-16 19:28:37 +01:00
jonathan	5f75bde317	💄 Made heal button show how many beats are left	2025-12-16 19:24:20 +01:00
jonathan	7310bfbf6e	✨Added flying beet to the ui when used	2025-12-16 19:09:03 +01:00
jonathan	fef8380a57	✨When beetroot is in inventory the player can heal	2025-12-16 19:09:03 +01:00
jonathan	f42c2c86b1	✨ Defeated enemygroups now drop a beet_seed	2025-12-16 19:09:03 +01:00
kziolkowski	f1a2e6166b	🐛 fixed field setup in beet scene	2025-12-16 18:09:51 +01:00
kziolkowski	c0111e4c17	🐛 fixed rake triggering field interaction + watering can interaction	2025-12-16 16:43:46 +01:00
jlink	2ed9dbbc52	Vesna resets to bed after death	2025-12-16 15:34:52 +01:00
kziolkowski	4f660c4af8	🐛 fixed rake still activating field outlines bug	2025-12-16 15:11:32 +01:00
kziolkowski	13fcf059e9	Added trash object savestate	2025-12-16 15:03:27 +01:00
kziolkowski	7f58aeae76	removed GD.Prints	2025-12-16 14:33:54 +01:00
jlink	3456340bb7	einfügen von Gesichtsausdrücken für Vesna	2025-12-16 14:30:23 +01:00
kziolkowski	30750d2e3c	♻️ removed planted state from Fieldstate because it didn't make any sense.	2025-12-16 14:27:12 +01:00
kziolkowski	950731b225	🐛 Fixed ObjectNotDisposedException on Well in beetroot scene	2025-12-16 13:46:28 +01:00
kziolkowski	feb591f56a	♻️ modified changed path in start scene	2025-12-16 13:46:07 +01:00
kziolkowski	aac0992590	♻️ scene name refactoring part two: fixing scene transition paths in scenes	2025-12-16 13:34:32 +01:00
kziolkowski	21cf2d1a6a	♻️ Renamed scenes	2025-12-16 13:17:39 +01:00
kziolkowski	3f5cfed477	removed test scene	2025-12-16 13:14:46 +01:00
kziolkowski	64c15c2e63	removed print statements	2025-12-16 13:14:25 +01:00
kziolkowski	a98c842ee0	🐛 Fixed field interaction bug	2025-12-16 13:04:40 +01:00
kziolkowski	abed751d29	🚧 WIP trying to make fields have outlines again	2025-12-15 22:45:02 +01:00
kziolkowski	ce113e16da	🐛 planting seeds works again	2025-12-15 21:33:04 +01:00
kziolkowski	c55e527bf4	Merge branch 'develop' into feature/bugfixes_polish_II	2025-12-15 20:41:44 +01:00
kziolkowski	c509a52001	🚧 Basic interaction works now too	2025-12-12 13:49:16 +01:00
kziolkowski	9e0e87ef17	🚧 WIP detection works now	2025-12-12 13:46:32 +01:00
kziolkowski	7ffbb8e68d	pulled ceiling lower in kitchen scene	2025-12-12 10:34:52 +01:00
jonathan	6375383373	🐛Made attack selection only select alive enemies	2025-12-11 18:49:51 +01:00
Jonathan	b810ea1d9f	Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43 ) from Kampf_Tooltip into develop Reviewed-on: #43 Reviewed-by: Jonathan <cblech@ymail.com>	2025-12-11 17:29:54 +01:00
kziolkowski	b232cb31c3	🚧 interaction kinda sorta works now, still needs tweaking	2025-12-10 16:57:39 +01:00
kziolkowski	a6260efc07	Merge branch 'develop' into feature/bugfixes_polish_II	2025-12-10 16:24:18 +01:00
kziolkowski	3d19509826	Merge pull request 'feature/art_update' (#40 ) from feature/art_update into develop Reviewed-on: #40 Reviewed-by: Jonathan <cblech@ymail.com>	2025-12-10 16:23:41 +01:00
kziolkowski	113dd0820f	Merge branch 'develop' into feature/art_update	2025-12-10 16:23:04 +01:00
kziolkowski	7e148cd9fe	🐛 fixed Ysorting issues in fightworld	2025-12-10 16:21:48 +01:00
kziolkowski	59489e4a17	Made common room into hub area and ajdusted Yeli dialogue	2025-12-10 16:02:38 +01:00
jlink	fc00559483	Kampf Tooltip wird ausgeblendet	2025-12-10 15:53:55 +01:00
kziolkowski	982178d89a	🐛 fixed sunflower parallaxing to perfection	2025-12-10 15:34:45 +01:00
jlink	09f55d3aa7	BlobFighter TargetSelection ColliderShape2D Transform angepasst	2025-12-10 15:29:56 +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	9499c27444	🚧 WIP: trying to rework the detection system (it fails)	2025-12-09 17:51:00 +01:00
Jonathan	0434667c22	Merge pull request 'feature/bugfixes_And_Polish' (#39 ) from feature/bugfixes_And_Polish into develop Reviewed-on: #39 Reviewed-by: Jonathan <cblech@ymail.com>	2025-12-09 15:20:36 +01:00
jonathan	a736adaafb	Randomized who starts the fight	2025-12-09 15:07:50 +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
kziolkowski	9d818e5079	♻️ refactored field code to work with the new id system	2025-11-25 15:29:36 +01:00
kziolkowski	e9cd4ce276	♻️ reworked and debugged the SaveSystem. Removed unnecessary scene reference.	2025-11-25 14:39:31 +01:00
kziolkowski	638ebaff46	📝 Added documentation	2025-11-25 13:46:46 +01:00
kziolkowski	b4013b1ff2	:feature: made GetComponent nullable in NodeExtension	2025-11-25 13:34:22 +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	fda2b95b38	Savesystem rework	2025-11-23 21:02:40 +01:00
kziolkowski	4bbaab1a2a	Created ISaveable interface and made existing saveable classes inherit from it.	2025-11-23 20:10:42 +01:00
kziolkowski	4ed6f4e7d9	Reworked existing save system for user data: Made path steam-compatible, added Versioning and try/catch to save	2025-11-21 21:04:37 +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	2a4425b9db	✨ Added Save and load support to the inventory	2025-11-19 15:18:33 +01:00
kziolkowski	72079044bd	🚧 WIP implementing save and load for the inventory	2025-11-18 18:30:17 +01:00
Jonathan	b205e45096	Merge pull request 'feature/farming_bugfixes_and_magic_word' (#30 ) from feature/farming_bugfixes_and_magic_word into develop Reviewed-on: #30	2025-11-18 17:25:59 +01:00
kziolkowski	d17e58bcd3	🐛 removed stub code and unused signal from FarmingControls2D	2025-11-18 17:17:42 +01:00
kziolkowski	02cbc761bc	reverted changed start scene in project godot	2025-11-18 16:41:55 +01:00
Jonathan	fb6a42a874	Merge pull request 'Added damage fly number' (#29 ) from feature/damage_feedback into develop Reviewed-on: #29	2025-11-18 16:07:32 +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	c9f97c2571	📝 added documentation comments	2025-11-15 22:27:26 +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
jonathan	3bb4fcd129	✨Added damage fly number	2025-11-11 15:55:41 +01:00
kziolkowski	4705d1ee2f	🐛 can no longer water fields when watering can is empty	2025-11-11 15:54:09 +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
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
kziolkowski	fe1dd2bcc1	✨ Added inventorylistener for watering can	2025-11-07 20:37:59 +01:00
kziolkowski	6e833a0735	✨ added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory	2025-11-07 20:29:05 +01:00
kziolkowski	c52bfc8017	🐛 fixed field outline	2025-11-07 19:47:23 +01:00
kziolkowski	58c2be1db8	✨ plants no longer grow when just interacting with them	2025-11-07 18:27:21 +01:00
kziolkowski	c7c6e184d6	🐛 adjusted field positions	2025-11-07 18:24:52 +01:00
kziolkowski	6a2355cf97	🐛 fixed never more than 10 fields bug	2025-11-07 18:18:05 +01:00
kziolkowski	1d7f656ec4	🚧 WIP trying to fix a bug that won't let me have more than 9 fields. Dont ask me why.	2025-11-05 19:25:46 +01:00
kziolkowski	1c5b585b3d	🔥 removed print statements used for debugging	2025-11-05 16:50:41 +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
kziolkowski	8d616735f4	🚚 moved Animationfix script	2025-11-04 16:40:19 +01:00
kziolkowski	66848af8bf	Merge branch 'develop' into feature/farming_bugfixes_and_magic_word	2025-11-04 11:24:51 +01:00
kziolkowski	6ba26c360d	🚧 reworking Fieldservice	2025-10-31 14:08:55 +01:00
kziolkowski	63fd81e54d	🔥 removed no longer needed scene call group	2025-10-31 12:38:48 +01:00
kziolkowski	b54f784d51	🎨 Replaced pickup animation group call with event	2025-10-31 12:36:08 +01:00
kziolkowski	6194988bf0	🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event.	2025-10-31 12:07:05 +01:00