Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-07-11 03:13:08 +02:00
parent e38c391e1c c0e002f783
commit 7a3e96d679
42 changed files with 3664 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project.godot
+4 -2
View File
@@ -24,11 +24,12 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk"
[autoload]
SceneTransition="*res://scenes/SceneTransition.tscn"
Dialogic="*res://addons/dialogic/Core/DialogicGameHandler.gd"
InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs"
Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd"
QuestManager="*res://scripts/CSharp/Common/Quest/QuestManager.cs"
FightManagerAutoload="*res://prefabs/fight/fight_manager_autoload.tscn"
Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd"
SceneTransition="*res://scenes/SceneTransition.tscn"
[dialogic]
@@ -233,6 +234,7 @@ locale/translations=PackedStringArray("res://dialog/translations/dialogic_charac
3d_physics/layer_1="General"
2d_physics/layer_2="Background elements"
2d_physics/layer_3="player"
2d_physics/layer_5="fight ui"
3d_physics/layer_5="Player"
[rendering]