minor changes after merge

Merge remote-tracking branch 'origin/Nao's-Sounds' into farming_mechanic
Merge remote-tracking branch 'origin/Animations' into farming_mechanic
2025-05-17 13:37:56 +02:00 · 2025-05-17 13:31:21 +02:00 · 2025-05-17 13:30:58 +02:00 · 2025-05-16 23:16:27 +02:00 · 2025-05-14 23:12:14 +02:00 · 2025-05-14 12:48:37 +02:00
662 changed files with 198663 additions and 268 deletions
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="RiderAndroidProjectSystem" />
+  </component>
+</project>
@@ -0,0 +1,10 @@
+<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>
@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArea3D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F8a54226fa2e1c9371a8091f24cfd744aef11fe6869527dc23b9b837623a29b9_003FArea3D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArea3D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F8a54226fa2e1c9371a8091f24cfd744aef11fe6869527dc23b9b837623a29b9_003FArea3D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACastHelpers_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd111abf504bf42b5968a609b168fd093b2e200_003Fbb_003F1c116fcd_003FCastHelpers_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
kziolkowski	77c0babdca	minor changes after merge	2025-05-17 13:37:56 +02:00
kziolkowski	aa5a3483bb	Merge remote-tracking branch 'origin/Nao's-Sounds' into farming_mechanic	2025-05-17 13:31:21 +02:00
kziolkowski	68b6031da1	Merge remote-tracking branch 'origin/Animations' into farming_mechanic	2025-05-17 13:30:58 +02:00
kziolkowski	4afb02440c	Reworking 2D interactions	2025-05-16 23:16:27 +02:00
kziolkowski	ff85b67087	Made interaction area 2d work - and farming/growing work again.	2025-05-14 23:12:14 +02:00
Felix Paul	20f8eaaebd	Added Vesna 2D image sequences	2025-05-14 12:48:37 +02:00
Felix Paul	69848e77c9	Added PickUp and Interact (Back) animations	2025-05-12 17:57:12 +02:00
kziolkowski	366923699c	WIP 2D rework	2025-05-12 00:16:13 +02:00
kziolkowski	2a7f39e3fe	Adjusted movement and included collider collisions as a constraint to the player	2025-05-11 23:20:35 +02:00
kziolkowski	296fed6e08	Added fields	2025-05-10 16:33:35 +02:00
kziolkowski	1af04631c5	Added 2d outdoor scene with parallaxe and mockup background	2025-05-10 16:29:23 +02:00
Felix Paul	9ec1bcab97	Added 2 animations Added Fill Watercan and Hold Item animations	2025-05-05 20:24:26 +02:00
kziolkowski	d11fc9f1f2	Cleaned up house mockup outline and removed spammy debug log	2025-04-30 18:49:46 +02:00
kziolkowski	16a65f7155	added flat indoor test and skybox to 3d test	2025-04-30 18:43:18 +02:00
kziolkowski	0fcc425ace	built first 2d indoor scene + added kitchen	2025-04-30 17:36:38 +02:00
Felix Paul	21685d60d5	Added Vesna animations	2025-04-28 20:15:39 +02:00
kziolkowski	752cdb1502	Added new how sprite	2025-04-27 10:09:11 +02:00
kziolkowski	8299998a0f	Added fence to the left part of the farm	2025-04-26 15:15:38 +02:00
kziolkowski	5ea6431216	Added tree prefabs and a forest border around the farm	2025-04-26 14:51:56 +02:00
Felix Paul	7cccd40290	Test Einige animationen in 3D	2025-04-25 21:19:04 +02:00
kziolkowski	762a694be3	Spawning and watering is now bound to the cursor position (kinda)	2025-04-25 00:13:50 +02:00
kziolkowski	339428c312	Basic watering functionality implemented	2025-04-24 23:36:23 +02:00
kziolkowski	7e19268847	Merge remote-tracking branch 'origin/main' into c_sharp_setup # Conflicts: # scripts/CSharp/Common/CharacterControls/VesnaBehaviour.cs.uid # scripts/CSharp/Common/Farming/FieldService.cs.uid	2025-04-24 21:22:56 +02:00
kziolkowski	20b37de108	generated files	2025-04-24 21:22:14 +02:00
kziolkowski	c73d3ff370	Reworked the fieldservice	2025-04-14 18:00:10 +02:00