aboutsummaryrefslogtreecommitdiff
path: root/client/gui
diff options
context:
space:
mode:
Diffstat (limited to 'client/gui')
-rw-r--r--client/gui/menus/main/main.gd4
-rw-r--r--client/gui/menus/transition/scene_transition.gd4
-rw-r--r--client/gui/menus/transition/scene_transition.tscn2
3 files changed, 8 insertions, 2 deletions
diff --git a/client/gui/menus/main/main.gd b/client/gui/menus/main/main.gd
index 4a55b761..0dc6e724 100644
--- a/client/gui/menus/main/main.gd
+++ b/client/gui/menus/main/main.gd
@@ -30,6 +30,10 @@ func _menu_music(): Sound.set_music("reflets-dans-leau", 3, false)
func _menu_cover(state):
$side.visible = not state
+func exit():
+ Sound.set_music(null)
+ super()
+
func _on_quit_pressed():
quit()
diff --git a/client/gui/menus/transition/scene_transition.gd b/client/gui/menus/transition/scene_transition.gd
index 332647b5..92715f2f 100644
--- a/client/gui/menus/transition/scene_transition.gd
+++ b/client/gui/menus/transition/scene_transition.gd
@@ -30,6 +30,10 @@ func _ready():
$black.visible = true
text.visible = true
text.text = ""
+ Settings.hook_changed_init("ui.transition_speed", self, func(v):
+ black_anim.speed_scale = v
+ text_anim.speed_scale = v
+ )
func set_loading_text(s: String):
text.text = s
diff --git a/client/gui/menus/transition/scene_transition.tscn b/client/gui/menus/transition/scene_transition.tscn
index dab16084..0bf91348 100644
--- a/client/gui/menus/transition/scene_transition.tscn
+++ b/client/gui/menus/transition/scene_transition.tscn
@@ -94,7 +94,6 @@ script = ExtResource("1_fpbwj")
libraries = {
&"": SubResource("AnimationLibrary_00tv0")
}
-speed_scale = 4.0
[node name="black" type="ColorRect" parent="."]
visible = false
@@ -111,7 +110,6 @@ color = Color(0, 0, 0, 1)
libraries = {
&"": SubResource("AnimationLibrary_pea72")
}
-speed_scale = 4.0
[node name="text_margin" type="MarginContainer" parent="."]
layout_mode = 1