post-merge engine fixes

godot/scenes/objects/bottle.gd

@@ -9,27 +9,27 @@ var is_hidding: bool
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-    tim_global_position = get_node("/root/IngameScene/Stage/Tim/ThrowPoint").global_position
+	tim_global_position = get_node("/root/IngameScene/Stage/Tim/ThrowPoint").global_position
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
-    var t = create_tween().set_parallel()
+	var t = create_tween().set_parallel()
-    t.tween_property(self, "global_position", tim_global_position, 3.0)
+	t.tween_property(self, "global_position", tim_global_position, 3.0)
-    t.tween_property(self, "rotation_degrees", rotation_degrees + 270, 3.0)
+	t.tween_property(self, "rotation_degrees", rotation_degrees + 270, 3.0)
-    t.tween_callback(remove_bottle).set_delay(3.05)
+	t.tween_callback(remove_bottle).set_delay(3.05)
 
 func _on_bottle_area_entered(area):
-    is_hidding = true
+	is_hidding = true
 
 func _on_bottle_area_exited(area):
-    is_hidding = false
+	is_hidding = false
 
 func _on_growth_timer_timeout():
-    var t = create_tween()
+	var t = create_tween()
-    t.tween_property(self, "scale", self.scale + Vector2(0.01, 0.01), 0.02)
+	t.tween_property(self, "scale", self.scale + Vector2(0.01, 0.01), 0.02)
 
 func remove_bottle():
-    if is_hidding:
+	if is_hidding:
-        print("Ouch")
+		print("Ouch")
-        Signals.hit_tim.emit()
+		Signals.hit_tim.emit()
-    queue_free()
+	queue_free()

godot/scenes/stage.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=3 uid="uid://cicyfp5xjvvu4"]
+[gd_scene load_steps=18 format=3 uid="uid://cicyfp5xjvvu4"]
 
 [ext_resource type="Texture2D" uid="uid://bg85if5rrrdmm" path="res://sprites/room/buehne.svg" id="1_32lst"]
 [ext_resource type="Script" path="res://scenes/Tim.gd" id="1_g3k2b"]
@@ -7,8 +7,8 @@
 [ext_resource type="PackedScene" uid="uid://r1i7ln2hpwq5" path="res://scenes/joke_button.tscn" id="3_0t41i"]
 [ext_resource type="Texture2D" uid="uid://b8tb4o75kjffn" path="res://sprites/tim_talk.svg" id="3_e1fvx"]
 [ext_resource type="Script" path="res://scenes/DisplayStamina.gd" id="6_88orn"]
-[ext_resource type="Texture2D" uid="uid://d2264dy2o4q6d" path="res://sprites/tim_side.svg" id="6_qpa7m"]
 [ext_resource type="FontFile" uid="uid://le2vdo2626vw" path="res://fonts/Montserrat-Medium.ttf" id="6_pb3a7"]
+[ext_resource type="Texture2D" uid="uid://d2264dy2o4q6d" path="res://sprites/tim_side.svg" id="6_qpa7m"]
 [ext_resource type="Script" path="res://scenes/DisplayMood.gd" id="7_5m0td"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_jfw8v"]

godot/sprites/01_tim_cycle_silent.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://t0sw5uh5rkrl"
+path="res://.godot/imported/01_tim_cycle_silent.svg-7117bb5957b798eacaf94cfa10e93bf8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/01_tim_cycle_silent.svg"
+dest_files=["res://.godot/imported/01_tim_cycle_silent.svg-7117bb5957b798eacaf94cfa10e93bf8.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/sprites/01_tim_cycle_talk.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b8wnknc7uk14n"
+path="res://.godot/imported/01_tim_cycle_talk.svg-c0f0e12eb34c540d294c33e2f2d81966.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/01_tim_cycle_talk.svg"
+dest_files=["res://.godot/imported/01_tim_cycle_talk.svg-c0f0e12eb34c540d294c33e2f2d81966.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/sprites/02_tim_cycle_silent.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cisluge3qb4l7"
+path="res://.godot/imported/02_tim_cycle_silent.svg-77d2d8f5da72bbd6523ff29f84b27dbb.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/02_tim_cycle_silent.svg"
+dest_files=["res://.godot/imported/02_tim_cycle_silent.svg-77d2d8f5da72bbd6523ff29f84b27dbb.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/sprites/02_tim_cycle_talk.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b2pk05j8lamut"
+path="res://.godot/imported/02_tim_cycle_talk.svg-c5b613f3313a2965852984b547906370.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/02_tim_cycle_talk.svg"
+dest_files=["res://.godot/imported/02_tim_cycle_talk.svg-c5b613f3313a2965852984b547906370.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/sprites/03_tim_cycle_silent.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dxngecca0g20b"
+path="res://.godot/imported/03_tim_cycle_silent.svg-0cb2c9133bcf2e80cb154c226596bf2a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/03_tim_cycle_silent.svg"
+dest_files=["res://.godot/imported/03_tim_cycle_silent.svg-0cb2c9133bcf2e80cb154c226596bf2a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/sprites/03_tim_cycle_talk.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://khg4meq7qbcr"
+path="res://.godot/imported/03_tim_cycle_talk.svg-fd4c7147c76b859fe0b52090d4d308c8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/03_tim_cycle_talk.svg"
+dest_files=["res://.godot/imported/03_tim_cycle_talk.svg-fd4c7147c76b859fe0b52090d4d308c8.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/sprites/04_tim_cycle_silent.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dtd74u4eclbfk"
+path="res://.godot/imported/04_tim_cycle_silent.svg-d40597a0261de06774a879bd88019fd4.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/04_tim_cycle_silent.svg"
+dest_files=["res://.godot/imported/04_tim_cycle_silent.svg-d40597a0261de06774a879bd88019fd4.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/sprites/04_tim_cycle_talk.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://rw87w6dw4mqr"
+path="res://.godot/imported/04_tim_cycle_talk.svg-750baee703f3e3d22fe21b88aa767b5e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/04_tim_cycle_talk.svg"
+dest_files=["res://.godot/imported/04_tim_cycle_talk.svg-750baee703f3e3d22fe21b88aa767b5e.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false