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

..

characters

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

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

day_and_night

🚚 renamed directory

2025-12-04 22:05:33 +01:00

entity_system

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

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

farm

Deactivated harvestable plant on spawn

2025-12-16 23:06:58 +01:00

fight

Merge branch 'develop' into feature/build_0_7

2026-01-27 13:01:34 +01:00

fightOld

Made fight fightable

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

Interactables

Added trash object savestate

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

interactions

🐛 Fixed field interaction bug

2025-12-16 13:04:40 +01:00

minigame

✨Added theme-based region colors

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

Mushrooms

Farming part I

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

quests

Added more quest stuff including dialogic quest condition

2025-08-06 18:20:38 +02:00

SaveSystem

🐛 fixed rake triggering field interaction + watering can interaction

2025-12-16 16:43:46 +01:00

UI

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

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