summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/menu/arrow_focus.svg1
-rw-r--r--client/menu/arrow_focus.svg.import37
-rw-r--r--client/menu/arrow_hover.svg1
-rw-r--r--client/menu/arrow_hover.svg.import37
-rw-r--r--client/menu/arrow_pressed.svg1
-rw-r--r--client/menu/arrow_pressed.svg.import37
-rw-r--r--client/menu/character_menu.tscn17
-rw-r--r--client/menu/ingame_menu.tscn2
8 files changed, 131 insertions, 2 deletions
diff --git a/client/menu/arrow_focus.svg b/client/menu/arrow_focus.svg
new file mode 100644
index 00000000..456f0261
--- /dev/null
+++ b/client/menu/arrow_focus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70 100"><path stroke="#aaaaff" stroke-width="10" fill="none" d="M20,20 L50,50 L 20,80" /></svg> \ No newline at end of file
diff --git a/client/menu/arrow_focus.svg.import b/client/menu/arrow_focus.svg.import
new file mode 100644
index 00000000..5643398a
--- /dev/null
+++ b/client/menu/arrow_focus.svg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://by3qsrpxnfq4w"
+path="res://.godot/imported/arrow_focus.svg-796c7015ab25a208e0703cc077245567.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://menu/arrow_focus.svg"
+dest_files=["res://.godot/imported/arrow_focus.svg-796c7015ab25a208e0703cc077245567.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
diff --git a/client/menu/arrow_hover.svg b/client/menu/arrow_hover.svg
new file mode 100644
index 00000000..098063ec
--- /dev/null
+++ b/client/menu/arrow_hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70 100"><path stroke="#aaaaaa" stroke-width="10" fill="none" d="M20,20 L50,50 L 20,80" /></svg> \ No newline at end of file
diff --git a/client/menu/arrow_hover.svg.import b/client/menu/arrow_hover.svg.import
new file mode 100644
index 00000000..c8811de2
--- /dev/null
+++ b/client/menu/arrow_hover.svg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b33qmctbpf48g"
+path="res://.godot/imported/arrow_hover.svg-e30a6426cf1ccd3c2d183c20eb7b0d9a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://menu/arrow_hover.svg"
+dest_files=["res://.godot/imported/arrow_hover.svg-e30a6426cf1ccd3c2d183c20eb7b0d9a.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
diff --git a/client/menu/arrow_pressed.svg b/client/menu/arrow_pressed.svg
new file mode 100644
index 00000000..1abd9a8f
--- /dev/null
+++ b/client/menu/arrow_pressed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70 100"><path stroke="gray" stroke-width="10" fill="none" d="M20,20 L50,50 L 20,80" /></svg> \ No newline at end of file
diff --git a/client/menu/arrow_pressed.svg.import b/client/menu/arrow_pressed.svg.import
new file mode 100644
index 00000000..74d1dffe
--- /dev/null
+++ b/client/menu/arrow_pressed.svg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://j75dbytlbju"
+path="res://.godot/imported/arrow_pressed.svg-27eedadced7da045a9df177b0099000b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://menu/arrow_pressed.svg"
+dest_files=["res://.godot/imported/arrow_pressed.svg-27eedadced7da045a9df177b0099000b.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
diff --git a/client/menu/character_menu.tscn b/client/menu/character_menu.tscn
index b958cf9d..5428b2e4 100644
--- a/client/menu/character_menu.tscn
+++ b/client/menu/character_menu.tscn
@@ -1,10 +1,13 @@
-[gd_scene load_steps=7 format=3 uid="uid://1f7xpirm5d28"]
+[gd_scene load_steps=10 format=3 uid="uid://1f7xpirm5d28"]
[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_ak2pw"]
[ext_resource type="Script" path="res://menu/character_menu.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://menu/scene_transition.tscn" id="4_c0ocf"]
[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/arrow.svg" id="5_kvd7k"]
+[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://menu/arrow_pressed.svg" id="5_xpff8"]
+[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/arrow_hover.svg" id="6_soj8g"]
+[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/arrow_focus.svg" id="6_u31hl"]
[sub_resource type="Environment" id="Environment_ex25y"]
background_mode = 1
@@ -80,7 +83,11 @@ alignment = 1
[node name="Back" type="TextureButton" parent="VBoxContainer/Spacer/VBoxContainer/HBoxContainer"]
layout_mode = 2
+focus_neighbor_right = NodePath("../Forward")
texture_normal = ExtResource("5_kvd7k")
+texture_pressed = ExtResource("5_xpff8")
+texture_hover = ExtResource("6_soj8g")
+texture_focused = ExtResource("6_u31hl")
flip_h = true
[node name="Spacer" type="Control" parent="VBoxContainer/Spacer/VBoxContainer/HBoxContainer"]
@@ -89,7 +96,11 @@ size_flags_horizontal = 3
[node name="Forward" type="TextureButton" parent="VBoxContainer/Spacer/VBoxContainer/HBoxContainer"]
layout_mode = 2
+focus_neighbor_left = NodePath("../Back")
texture_normal = ExtResource("5_kvd7k")
+texture_pressed = ExtResource("5_xpff8")
+texture_hover = ExtResource("6_soj8g")
+texture_focused = ExtResource("6_u31hl")
[node name="bottom_panel" type="Panel" parent="VBoxContainer"]
custom_minimum_size = Vector2(0, 75)
@@ -116,6 +127,10 @@ visible = false
layout_mode = 1
[connection signal="text_changed" from="VBoxContainer/top_panel/a/username" to="." method="_on_username_text_changed"]
+[connection signal="focus_entered" from="VBoxContainer/Spacer/VBoxContainer/HBoxContainer/Back" to="." method="_on_back_focus_entered"]
+[connection signal="focus_exited" from="VBoxContainer/Spacer/VBoxContainer/HBoxContainer/Back" to="." method="_on_back_focus_exited"]
[connection signal="pressed" from="VBoxContainer/Spacer/VBoxContainer/HBoxContainer/Back" to="." method="_on_character_back_pressed"]
+[connection signal="focus_entered" from="VBoxContainer/Spacer/VBoxContainer/HBoxContainer/Forward" to="." method="_on_forward_focus_entered"]
+[connection signal="focus_exited" from="VBoxContainer/Spacer/VBoxContainer/HBoxContainer/Forward" to="." method="_on_forward_focus_exited"]
[connection signal="pressed" from="VBoxContainer/Spacer/VBoxContainer/HBoxContainer/Forward" to="." method="_on_character_forward_pressed"]
[connection signal="pressed" from="VBoxContainer/bottom_panel/back" to="." method="_on_back_pressed"]
diff --git a/client/menu/ingame_menu.tscn b/client/menu/ingame_menu.tscn
index 47b7cb54..79b4efb1 100644
--- a/client/menu/ingame_menu.tscn
+++ b/client/menu/ingame_menu.tscn
@@ -72,7 +72,7 @@ anchors_preset = 9
anchor_bottom = 1.0
offset_left = -400.0
offset_right = -90.0
-offset_bottom = 1296.0
+offset_bottom = 2592.0
grow_vertical = 2
[node name="Margin" type="MarginContainer" parent="Side"]