Merge branch 'develop' into feature/quest_system

project.godot

@@ -11,9 +11,9 @@ config_version=5
 [application]
 
 config/name="Babushka"
-run/main_scene="uid://dbpsqfedlku4f"
+run/main_scene="uid://bopv10dqm1knc"
 config/features=PackedStringArray("4.4", "C#", "Forward Plus")
-config/icon="res://icon.svg"
+config/icon="uid://b2smanpdo1y5e"
 
 [autoload]
 
@@ -67,10 +67,22 @@ translation/id_counter=22
 translation/locales=["de", "en"]
 text/autopauses={}
 
+[display]
+
+window/size/viewport_width=1920
+window/size/viewport_height=1080
+window/size/always_on_top=true
+window/stretch/mode="viewport"
+window/stretch/aspect="keep_height"
+
 [dotnet]
 
 project/assembly_name="Babushka"
 
+[editor]
+
+movie_writer/movie_file="/home/kaddi/Documents/Repos/Godot/Babushka/clips/clip.avi"
+
 [editor_plugins]
 
 enabled=PackedStringArray("res://addons/anthonyec.camera_preview/plugin.cfg", "res://addons/dialogic/plugin.cfg")
@@ -78,16 +90,23 @@ enabled=PackedStringArray("res://addons/anthonyec.camera_preview/plugin.cfg", "r
 [file_customization]
 
 folder_colors={
+"res://_builds/": "gray",
+"res://_clips/": "gray",
 "res://addons/": "red",
 "res://art/": "orange",
 "res://audio/": "yellow",
 "res://dialog/": "green",
 "res://prefabs/": "teal",
+"res://resources/": "teal",
 "res://scenes/": "blue",
 "res://scripts/": "purple",
 "res://shader/": "pink"
 }
 
+[global_group]
+
+PlantGrowing=""
+
 [input]
 
 move_left={
@@ -144,6 +163,16 @@ ui_inventory_disadvance={
 "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"double_click":false,"script":null)
 ]
 }
+interact2={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":72,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
+item={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
 
 [internationalization]
 
@@ -156,3 +185,7 @@ locale/translations=PackedStringArray("res://dialog/translations/dialogic_charac
 2d_physics/layer_2="Background elements"
 2d_physics/layer_3="player"
 3d_physics/layer_5="Player"
+
+[rendering]
+
+viewport/hdr_2d=true