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

..

Animation

♻️ Replaced _ready mit _entertree (while deferring)

2025-12-04 22:22:40 +01:00

Audio

Added Footsteps SFX

2025-08-27 17:12:12 +02:00

Camera

Fight happening base setup

2025-11-04 05:27:34 +01:00

CharacterControls

fixed some layering issues in beetroot scene and added a mock convo with the domovoi

2025-12-17 00:15:42 +01:00

DayAndNight

✨ 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

Farming

WIP

2026-01-29 17:42:32 +01:00

Fight

Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop

2025-12-16 20:44:26 +01:00

FightOld

Fight happening base setup

2025-11-04 05:27:34 +01:00

Interactables

Added trash object savestate

2025-12-16 15:03:27 +01:00

Inventory

First adjustments to the Entity System to make it work with different types

2026-02-03 13:55:13 +01:00

Items

🎨 Replaced pickup animation group call with event

2025-10-31 12:36:08 +01:00

Minigame

✨Added visual feedback when hitting a region in the minigame

2025-12-04 21:18:47 +01:00

NPC

🐛 fixed dialogic bugs and moved trash items out of the way

2025-12-06 21:46:54 +01:00

Quest

♻️ removed Print statements

2025-11-25 17:20:58 +01:00

QuestBehaviour

quest status name refactoring

2025-08-14 21:54:18 +02:00

Savegame

✨ Starting a new game resets the inventory now

2025-12-02 12:08:19 +01:00

SceneManagement

changes after develop merge

2025-08-15 17:03:18 +02:00

Services

Vesna can walk diagonally now

2025-08-02 15:08:38 +02:00

Temp

Added trash object savestate

2025-12-16 15:03:27 +01:00

TestScripts

Added minigame

2025-11-04 05:59:18 +01:00

UI

changed watering can display to slider

2025-08-17 22:42:12 +02:00

Util

:feature: made GetComponent nullable in NodeExtension

2025-11-25 13:34:22 +01:00

AudioPlayer2D.cs

Added Footsteps SFX

2025-08-27 17:12:12 +02:00

AudioPlayer2D.cs.uid

Added Footsteps SFX

2025-08-27 17:12:12 +02:00

CameraController.cs.uid

Translated some scripts from GDscript to C#

2025-03-26 00:26:29 +01:00

CameraPivot.cs.uid

Translated some scripts from GDscript to C#

2025-03-26 00:26:29 +01:00

FieldBehaviour.cs.uid

Farming part I

2025-04-04 00:22:35 +02:00

InteractionArea.cs.uid

Translated some scripts from GDscript to C#

2025-03-26 00:26:29 +01:00

InventoryManager.cs.uid

Added basic inventory system

2025-03-25 19:39:06 +01:00

PlantBehaviour.cs.uid

Farming part I

2025-04-04 00:22:35 +02:00

Player2D.cs.uid

Translated Player Scripts from GDScript to C#

2025-03-27 23:12:16 +01:00

Player3D.cs.uid

Translated Player Scripts from GDScript to C#

2025-03-27 23:12:16 +01:00

SceneTransition.cs

❇️ Added Settings classes to save and load local configurations

2025-11-21 20:33:52 +01:00

SceneTransition.cs.uid

Added StartScreen and Scene Transition script

2025-05-24 23:50:06 +02:00

SpriteSwitcher2D.cs

Fixed output error ERROR: Script class can only be set together with base class name

2025-07-31 21:45:22 +02:00

SpriteSwitcher2D.cs.uid

minor changes after merge

2025-05-17 13:37:56 +02:00

test2.cs.uid

a bit of restructuring, renaming, and c sharp setup

2025-03-24 21:55:34 +01:00

test.cs.uid

a bit of restructuring, renaming, and c sharp setup

2025-03-24 21:55:34 +01:00