aboutsummaryrefslogtreecommitdiff
path: root/game/src
diff options
context:
space:
mode:
author George L. Albany <Megacake1234@gmail.com>2023-03-03 15:19:25 +0100
committer GitHub <noreply@github.com>2023-03-03 15:19:25 +0100
commit3a46095b678d75292090802280ce9dbd3f2d24dc (patch)
treeb8cd5d8c7ff12bafc261d644d33fe1fe77dc107e /game/src
parent3f7c0bfd062bb676d8941c60187af743d8de6f8b (diff)
parent2af7f0da8b6a80e8c1ab17edf095bde41caec738 (diff)
Merge pull request #52 from Spartan322/enhance/lobby-and-macos
Diffstat (limited to 'game/src')
-rw-r--r--game/src/LobbyMenu/LobbyMenu.gd2
-rw-r--r--game/src/LobbyMenu/LobbyMenu.tscn53
2 files changed, 31 insertions, 24 deletions
diff --git a/game/src/LobbyMenu/LobbyMenu.gd b/game/src/LobbyMenu/LobbyMenu.gd
index bf20ce0..cc4bb05 100644
--- a/game/src/LobbyMenu/LobbyMenu.gd
+++ b/game/src/LobbyMenu/LobbyMenu.gd
@@ -1,4 +1,4 @@
-extends Control
+extends HBoxContainer
# REQUIREMENTS:
# * 1.4 Game Lobby Menu
diff --git a/game/src/LobbyMenu/LobbyMenu.tscn b/game/src/LobbyMenu/LobbyMenu.tscn
index 5dad422..340d47d 100644
--- a/game/src/LobbyMenu/LobbyMenu.tscn
+++ b/game/src/LobbyMenu/LobbyMenu.tscn
@@ -2,8 +2,7 @@
[ext_resource type="Script" path="res://src/LobbyMenu/LobbyMenu.gd" id="1_cvwum"]
-[node name="LobbyMenu" type="Control" node_paths=PackedStringArray("start_button")]
-layout_mode = 3
+[node name="LobbyMenu" type="HBoxContainer" node_paths=PackedStringArray("start_button")]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
@@ -12,61 +11,69 @@ grow_vertical = 2
script = ExtResource("1_cvwum")
start_button = NodePath("GameStartPanel/VBoxContainer/StartButton")
-[node name="GameSelectPanel" type="Panel" parent="."]
-layout_mode = 0
-offset_right = 270.0
-offset_bottom = 718.0
+[node name="GameSelectPanel" type="PanelContainer" parent="."]
+layout_mode = 2
+size_flags_horizontal = 3
[node name="VBoxContainer" type="VBoxContainer" parent="GameSelectPanel"]
-layout_mode = 0
-offset_right = 268.0
-offset_bottom = 717.0
+layout_mode = 2
[node name="GameSelectList" type="ItemList" parent="GameSelectPanel/VBoxContainer"]
-custom_minimum_size = Vector2(268, 500)
layout_mode = 2
+size_flags_vertical = 3
item_count = 2
item_0/text = "1836"
item_1/text = "1863"
-[node name="MarginContainer" type="MarginContainer" parent="GameSelectPanel/VBoxContainer"]
+[node name="Spacer" type="Control" parent="GameSelectPanel/VBoxContainer"]
custom_minimum_size = Vector2(0, 150)
layout_mode = 2
+size_flags_vertical = 3
[node name="BackButton" type="Button" parent="GameSelectPanel/VBoxContainer"]
layout_mode = 2
text = "Back"
-[node name="GameStartPanel" type="Panel" parent="."]
-layout_mode = 0
-offset_left = 1010.0
-offset_right = 1280.0
-offset_bottom = 718.0
+[node name="Spacer2" type="Control" parent="GameSelectPanel/VBoxContainer"]
+custom_minimum_size = Vector2(0, 33)
+layout_mode = 2
+
+[node name="Spacer" type="Control" parent="."]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 2.75
+mouse_filter = 2
+
+[node name="GameStartPanel" type="PanelContainer" parent="."]
+layout_mode = 2
+size_flags_horizontal = 3
[node name="VBoxContainer" type="VBoxContainer" parent="GameStartPanel"]
-layout_mode = 0
-offset_right = 268.0
-offset_bottom = 718.0
+layout_mode = 2
-[node name="TopMarginContainer" type="MarginContainer" parent="GameStartPanel/VBoxContainer"]
+[node name="Spacer" type="Control" parent="GameStartPanel/VBoxContainer"]
custom_minimum_size = Vector2(0, 50)
layout_mode = 2
[node name="SelectedCountryNameLabel" type="Label" parent="GameStartPanel/VBoxContainer"]
-custom_minimum_size = Vector2(0, 50)
layout_mode = 2
text = "France"
horizontal_alignment = 1
-[node name="MarginContainer" type="MarginContainer" parent="GameStartPanel/VBoxContainer"]
-custom_minimum_size = Vector2(0, 550)
+[node name="Spacer2" type="Control" parent="GameStartPanel/VBoxContainer"]
+custom_minimum_size = Vector2(0, 150)
layout_mode = 2
+size_flags_vertical = 3
[node name="StartButton" type="Button" parent="GameStartPanel/VBoxContainer"]
layout_mode = 2
disabled = true
text = "Start Game"
+[node name="Spacer3" type="Control" parent="GameStartPanel/VBoxContainer"]
+custom_minimum_size = Vector2(0, 33)
+layout_mode = 2
+
[connection signal="save_game_selected" from="." to="." method="_on_save_game_selected"]
[connection signal="item_selected" from="GameSelectPanel/VBoxContainer/GameSelectList" to="." method="_on_game_select_list_item_selected"]
[connection signal="button_down" from="GameSelectPanel/VBoxContainer/BackButton" to="." method="_on_back_button_button_down"]