diff --git a/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres b/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres index acd96c5..41c5bcc 100644 --- a/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres +++ b/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres @@ -5,7 +5,7 @@ content_margin_left = 10.0 content_margin_right = 10.0 content_margin_top = 10.0 content_margin_bottom = 10.0 -bg_color = Color( 0.03, 0.21, 0.26, 1 ) +bg_color = Color( 0.2, 0.23, 0.31, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 diff --git a/godot/assets/meat_creek/DialogTriggerObelisk.gd b/godot/assets/meat_creek/DialogTriggerObelisk.gd index 792478c..64a1505 100644 --- a/godot/assets/meat_creek/DialogTriggerObelisk.gd +++ b/godot/assets/meat_creek/DialogTriggerObelisk.gd @@ -13,4 +13,6 @@ func _on_DialogTrigger_body_entered(body): func _on_DialogTrigger_body_exited(body): if dialog != null: + if is_a_parent_of(dialog): + call_deferred("remove_child", dialog) dialog = null diff --git a/godot/assets/meat_creek/side_tunnel_1.tscn b/godot/assets/meat_creek/side_tunnel_1.tscn index 095cb83..1c40872 100644 --- a/godot/assets/meat_creek/side_tunnel_1.tscn +++ b/godot/assets/meat_creek/side_tunnel_1.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=28 format=2] +[gd_scene load_steps=26 format=2] [ext_resource path="res://assets/meat_creek/side_tunnel_1.glb" type="PackedScene" id=1] [ext_resource path="res://player/player.tscn" type="PackedScene" id=2] [ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=3] -[ext_resource path="res://assets/Starbox3.png" type="Texture" id=4] [ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=5] [ext_resource path="res://assets/meat_creek/creek_platform.tscn" type="PackedScene" id=6] [ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=7] @@ -25,12 +24,8 @@ [ext_resource path="res://assets/meat_creek/DialogTriggerObelisk.gd" type="Script" id=23] [ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=400] -[sub_resource type="PanoramaSky" id=4] -panorama = ExtResource( 4 ) - [sub_resource type="Environment" id=3] background_mode = 2 -background_sky = SubResource( 4 ) ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 ) ambient_light_energy = 1.5 ambient_light_sky_contribution = 0.0 diff --git a/godot/assets/models/Material_003.material.tmp b/godot/assets/models/Material_003.material.tmp deleted file mode 100644 index 4a23758..0000000 Binary files a/godot/assets/models/Material_003.material.tmp and /dev/null differ diff --git a/godot/dialogic/themes/theme-1672728448.cfg b/godot/dialogic/themes/theme-1672728448.cfg index 013c75a..3661e54 100644 --- a/godot/dialogic/themes/theme-1672728448.cfg +++ b/godot/dialogic/themes/theme-1672728448.cfg @@ -68,7 +68,7 @@ animation="Up and down" [buttons] -normal=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button03.png", true, Color( 0.262745, 0.0901961, 0.0901961, 1 ) ] +normal=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", true, Color( 1, 1, 1, 1 ) ] layout=1 fixed=true fixed_size=Vector2( 200, 80 ) diff --git a/godot/dialogic/timelines/timeline-1672725696.json b/godot/dialogic/timelines/timeline-1672725696.json index 6a379cc..43efb28 100644 --- a/godot/dialogic/timelines/timeline-1672725696.json +++ b/godot/dialogic/timelines/timeline-1672725696.json @@ -28,6 +28,18 @@ "portrait": "", "text": "(Looks the the only way out is down...)" }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "..." + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "(Why do I feel that light in the distance pushing me away?)" + }, { "event_id": "dialogic_013" },