Merge branch 'master' of https://codeberg.org/metamuffin/undercooked

5 files changed, 15 insertions, 14 deletions

diff --git a/client/menu/controller_buttons/a.svg b/client/menu/controller_buttons/a.svg
deleted file mode 100644
index 3b660d91..00000000
--- a/client/menu/controller_buttons/a.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="64" height="64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs/>
-  <g>
-    <path stroke="none" fill="#7DB700" d="M56 32 Q56 42 48.95 48.95 42 56 32 56 22.05 56 15 48.95 8 42 8 32 8 22.05 15 15 22.05 8 32 8 42 8 48.95 15 56 22.05 56 32 M38 42 L42 42 34 22 30 22 22 42 26 42 27.6 38 36.4 38 38 42 M32 27 L34.8 34 29.2 34 32 27"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/client/menu/controller_buttons/x.svg b/client/menu/controller_buttons/x.svg
new file mode 100644
index 00000000..9a5df2ea
--- /dev/null
+++ b/client/menu/controller_buttons/x.svg
@@ -0,0 +1,6 @@
+<svg width="64" height="64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs/>
+  <g>
+    <path stroke="none" fill="#009FEB" d="M56 32 Q56 42 48.95 48.95 42 56 32 56 22.05 56 15 48.95 8 42 8 32 8 22.05 15 15 22.05 8 32 8 42 8 48.95 15 56 22.05 56 32 M23 25 L29 32 23 39 23 40 25.25 42 26.4 42 32 35.5 37.65 42 38.75 42 41 40 41 39 35 32 41 25 41 24 38.75 22 37.65 22 32 28.55 26.4 22 25.25 22 23 24 23 25"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/client/menu/controller_buttons/a.svg.import b/client/menu/controller_buttons/x.svg.import
index 236e085f..f9acb5ec 100644
--- a/client/menu/controller_buttons/a.svg.import
+++ b/client/menu/controller_buttons/x.svg.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bgkhnp15u1utp"
-path="res://.godot/imported/a.svg-207eeddefe74f1190424a9aa1808de8f.ctex"
+uid="uid://bsx6fo7mv2u6a"
+path="res://.godot/imported/x.svg-94cb27dd83c134d85e2e1ce8d9481359.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/controller_buttons/a.svg"
-dest_files=["res://.godot/imported/a.svg-207eeddefe74f1190424a9aa1808de8f.ctex"]
+source_file="res://menu/controller_buttons/x.svg"
+dest_files=["res://.godot/imported/x.svg-94cb27dd83c134d85e2e1ce8d9481359.ctex"]
 
 [params]
 
diff --git a/client/menu/ingame.gd b/client/menu/ingame.gd
index e6ec7c54..61984c99 100644
--- a/client/menu/ingame.gd
+++ b/client/menu/ingame.gd
@@ -14,10 +14,12 @@ func _ready():
 func anim_setup(): pass
 func menu_anim_open():
 	print("ingame open")
+	game.player_set_input_enabled.emit(false)
 	anim.play("activate")
 	await anim.animation_finished
 func menu_anim_exit():
 	print("ingame exit")
+	game.player_set_input_enabled.emit(true)
 	anim.play_backwards("activate")
 	await anim.animation_finished
 
diff --git a/client/menu/lobby.tscn b/client/menu/lobby.tscn
index 38b2a5b9..df58915c 100644
--- a/client/menu/lobby.tscn
+++ b/client/menu/lobby.tscn
@@ -8,7 +8,7 @@
 [ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/arrow_hover.svg" id="5_odwav"]
 [ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/arrow_focus.svg" id="6_tulu3"]
 [ext_resource type="PackedScene" uid="uid://b1f7bgn65j7b5" path="res://menu/controller_buttons/controller_button.tscn" id="7_t6mox"]
-[ext_resource type="Texture2D" uid="uid://bgkhnp15u1utp" path="res://menu/controller_buttons/a.svg" id="8_chn2q"]
+[ext_resource type="Texture2D" uid="uid://bsx6fo7mv2u6a" path="res://menu/controller_buttons/x.svg" id="9_q14bw"]
 
 [node name="Lobby" type="Control" groups=["no_auto_focus"]]
 layout_mode = 3
@@ -100,10 +100,9 @@ layout_mode = 2
 custom_minimum_size = Vector2(148, 0)
 layout_mode = 2
 text = "Start Game"
-icon = ExtResource("8_chn2q")
 expand_icon = true
-controller_texture = ExtResource("8_chn2q")
-press_action = "ui_accept"
+controller_texture = ExtResource("9_q14bw")
+press_action = "start_game"
 
 [connection signal="pressed" from="VBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Left" to="." method="_on_left_pressed"]
 [connection signal="pressed" from="VBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Right" to="." method="_on_right_pressed"]