Merge pull request 'feature/entity_rework' (#52 ) from feature/entity_rework into develop

Reviewed-on: #52 Reviewed-by: Jonathan <cblech@ymail.com>
Reverted ItemOnGround to make everything compile again
2026-02-03 18:44:13 +01:00 · 2026-02-03 17:59:38 +01:00 · 2026-02-03 17:53:28 +01:00 · 2026-02-03 17:30:35 +01:00 · 2026-02-03 15:36:59 +01:00 · 2026-02-03 13:55:13 +01:00
1798 changed files with 8074 additions and 10 deletions
@@ -1,8 +1,2 @@
 # 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
@@ -8,4 +8,7 @@
    <Folder Include="prefabs\UI\Inventory\" />
    <Folder Include="scripts\CSharp\Low Code\Randomizer\" />
  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+  </ItemGroup>
 </Project>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan	628da80ed3	Merge pull request 'feature/entity_rework' (#52 ) from feature/entity_rework into develop Reviewed-on: #52 Reviewed-by: Jonathan <cblech@ymail.com>	2026-02-03 18:44:13 +01:00
Katharina Ziolkowski	0dfbd73978	Reverted ItemOnGround to make everything compile again	2026-02-03 17:59:38 +01:00
Katharina Ziolkowski	8a93b00e72	Merge branch 'develop' into feature/entity_rework # Conflicts: # scenes/scene_credits.tscn # scenes/scene_farm_outside_2d.tscn # scenes/scene_fight_world_room.tscn # scenes/scene_indoor_vesnas_room.tscn # scenes/scene_outside_beets.tscn # scripts/CSharp/Common/Farming/PlantBehaviour2D.cs	2026-02-03 17:53:28 +01:00
Katharina Ziolkowski	ba7d550c3f	Implemented Save and Load functionality	2026-02-03 17:30:35 +01:00
Katharina Ziolkowski	b65a3bbd6d	Managed the freeing of entityplacers. Also cleaned up EntityManager	2026-02-03 15:36:59 +01:00
Katharina Ziolkowski	bcbc074c86	First adjustments to the Entity System to make it work with different types	2026-02-03 13:55:13 +01:00
jonathan	745f54b375	WIP	2026-01-29 17:42:32 +01:00
jonathan	59d313d97d	Added basic entity scripts	2025-12-18 14:27:27 +01:00