aboutsummaryrefslogtreecommitdiff
path: root/client/gui
diff options
context:
space:
mode:
Diffstat (limited to 'client/gui')
-rw-r--r--client/gui/menus/character.tscn12
-rw-r--r--client/gui/resources/materials/blur_material.tres2
-rw-r--r--client/gui/resources/materials/dark_blur_material.tres4
3 files changed, 14 insertions, 4 deletions
diff --git a/client/gui/menus/character.tscn b/client/gui/menus/character.tscn
index 0fc53f46..8cf4a1b6 100644
--- a/client/gui/menus/character.tscn
+++ b/client/gui/menus/character.tscn
@@ -1,14 +1,18 @@
-[gd_scene load_steps=10 format=3 uid="uid://1f7xpirm5d28"]
+[gd_scene load_steps=14 format=3 uid="uid://1f7xpirm5d28"]
[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_ak2pw"]
[ext_resource type="Script" uid="uid://bglusga8l5c27" path="res://gui/menus/character.gd" id="1_brhd1"]
[ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="3_odq7n"]
[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://gui/menus/transition/scene_transition.tscn" id="4_c0ocf"]
[ext_resource type="PackedScene" uid="uid://wwu574dq2r8h" path="res://map/kitchen_background.tscn" id="4_oanna"]
+[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://gui/resources/materials/blur_material.tres" id="5_cgkmt"]
[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://gui/resources/icons/arrow.svg" id="5_kvd7k"]
[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://gui/resources/icons/arrow_pressed.svg" id="5_xpff8"]
[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://gui/resources/icons/arrow_hover.svg" id="6_soj8g"]
[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://gui/resources/icons/arrow_focus.svg" id="6_u31hl"]
+[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://gui/resources/style/panel_style_sidebar.tres" id="6_wxiis"]
+[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="7_nj82n"]
+[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="12_mjf6q"]
[node name="CharacterMenu" type="Control"]
layout_mode = 3
@@ -78,8 +82,11 @@ grow_horizontal = 2
grow_vertical = 2
[node name="top_panel" type="Panel" parent="VBoxContainer"]
+material = ExtResource("5_cgkmt")
custom_minimum_size = Vector2(0, 100)
layout_mode = 2
+theme_override_styles/panel = ExtResource("6_wxiis")
+script = ExtResource("7_nj82n")
[node name="a" type="VBoxContainer" parent="VBoxContainer/top_panel"]
layout_mode = 1
@@ -210,8 +217,11 @@ ignore_texture_size = true
stretch_mode = 5
[node name="bottom_panel" type="Panel" parent="VBoxContainer"]
+material = ExtResource("12_mjf6q")
custom_minimum_size = Vector2(0, 75)
layout_mode = 2
+theme_override_styles/panel = ExtResource("6_wxiis")
+script = ExtResource("7_nj82n")
[node name="back" type="Button" parent="VBoxContainer/bottom_panel"]
layout_mode = 1
diff --git a/client/gui/resources/materials/blur_material.tres b/client/gui/resources/materials/blur_material.tres
index a0e9d58c..b6ebf183 100644
--- a/client/gui/resources/materials/blur_material.tres
+++ b/client/gui/resources/materials/blur_material.tres
@@ -7,5 +7,5 @@ shader = ExtResource("1_d16rd")
shader_parameter/blur_amount = 3.5
shader_parameter/mix_amount = 0.3
shader_parameter/mix_amount_no_blur = 0.5
-shader_parameter/color_over = null
+shader_parameter/color_over = Color(0, 0, 0, 1)
shader_parameter/enable_blur = false
diff --git a/client/gui/resources/materials/dark_blur_material.tres b/client/gui/resources/materials/dark_blur_material.tres
index 96cf1d3f..9a59c614 100644
--- a/client/gui/resources/materials/dark_blur_material.tres
+++ b/client/gui/resources/materials/dark_blur_material.tres
@@ -7,5 +7,5 @@ shader = ExtResource("1_cynu0")
shader_parameter/blur_amount = 3.5
shader_parameter/mix_amount = 0.5
shader_parameter/mix_amount_no_blur = 0.7
-shader_parameter/color_over = null
-shader_parameter/enable_blur = null
+shader_parameter/color_over = Color(0, 0, 0, 1)
+shader_parameter/enable_blur = false