diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-01 17:57:36 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-01 17:57:36 +0200 |
| commit | d88e391561fd0cc8a29558aad35a5160d3f5813e (patch) | |
| tree | 5b2c243694a3ace5584712907c1687944c0d473d | |
| parent | 6c8b1813cb809cdef6bea77d40b4b595a19c8d24 (diff) | |
| parent | 7fd658de1ff95f90ea1b000f7cc84de5ebe096e0 (diff) | |
| download | hurrycurry-d88e391561fd0cc8a29558aad35a5160d3f5813e.tar hurrycurry-d88e391561fd0cc8a29558aad35a5160d3f5813e.tar.bz2 hurrycurry-d88e391561fd0cc8a29558aad35a5160d3f5813e.tar.zst | |
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
| -rw-r--r-- | client/game.gd | 2 | ||||
| -rw-r--r-- | client/menu/error.tscn | 4 | ||||
| -rw-r--r-- | client/player/character/character.tscn | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/client/game.gd b/client/game.gd index fcab85dd..ca25d77a 100644 --- a/client/game.gd +++ b/client/game.gd @@ -42,7 +42,7 @@ func _ready(): mp.connection_closed.connect(func(reason: String): Global.error_message = reason; - get_parent().replace_menu("res://menu/error_menu.tscn") + get_parent().replace_menu("res://menu/error.tscn") ) mp.init.connect(func(player_id_: int): player_id = player_id_) diff --git a/client/menu/error.tscn b/client/menu/error.tscn index d1bf034d..1ceda15a 100644 --- a/client/menu/error.tscn +++ b/client/menu/error.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=5 format=3 uid="uid://cimgn07lbcs4v"] +[gd_scene load_steps=6 format=3 uid="uid://cimgn07lbcs4v"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_cabdu"] [ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="2_5fxol"] [ext_resource type="Script" path="res://menu/error.gd" id="2_dbe41"] [ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_1nbt3"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="4_hxkkd"] [node name="ErrorMenu" type="Control"] layout_mode = 3 @@ -18,6 +19,7 @@ script = ExtResource("2_dbe41") [node name="MenuBackground" parent="." instance=ExtResource("2_5fxol")] [node name="Panel" type="Panel" parent="."] +material = ExtResource("4_hxkkd") layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 diff --git a/client/player/character/character.tscn b/client/player/character/character.tscn index f09ec2cf..33846758 100644 --- a/client/player/character/character.tscn +++ b/client/player/character/character.tscn @@ -663,7 +663,7 @@ scale_amount_curve = SubResource("Curve_7ml8g") [node name="Steps" type="Node3D" parent="."] script = ExtResource("14_3rb6x") -volume_db = -12.0 +volume_db = -30.0 enable_attenuations = false [node name="Step1" type="AudioStreamPlayer3D" parent="Steps"] |