Merge remote-tracking branch 'origin/develop' into quest_system

project.godot

@@ -84,7 +84,8 @@ folder_colors={
 "res://dialog/": "green",
 "res://prefabs/": "teal",
 "res://scenes/": "blue",
-"res://scripts/": "purple"
+"res://scripts/": "purple",
+"res://shader/": "pink"
 }
 
 [input]
@@ -150,5 +151,8 @@ locale/translations=PackedStringArray("res://dialog/translations/dialogic_charac
 
 [layer_names]
 
+2d_physics/layer_1="interaction items"
 3d_physics/layer_1="General"
+2d_physics/layer_2="Background elements"
+2d_physics/layer_3="player"
 3d_physics/layer_5="Player"