Make LobbyMenu resolution independent

Fix MacOS export directory

4 files changed, 33 insertions, 31 deletions

diff --git a/game/export/osx/.gitignore b/game/export/MacOS/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/game/export/osx/.gitignore
+++ b/game/export/MacOS/.gitignore
diff --git a/game/export_presets.cfg b/game/export_presets.cfg
index e4cf3b2..b8be1ac 100644
--- a/game/export_presets.cfg
+++ b/game/export_presets.cfg
@@ -3,6 +3,7 @@
 name="Linux/X11 x86_64"
 platform="Linux/X11"
 runnable=true
+dedicated_server=false
 custom_features=""
 export_filter="all_resources"
 include_filter=""
@@ -12,7 +13,6 @@ encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
 encrypt_directory=false
-script_export_mode=1
 script_encryption_key=""
 
 [preset.0.options]
@@ -25,7 +25,6 @@ texture_format/bptc=false
 texture_format/s3tc=true
 texture_format/etc=false
 texture_format/etc2=false
-texture_format/no_bptc_fallbacks=true
 binary_format/architecture="x86_64"
 ssh_remote_deploy/enabled=false
 ssh_remote_deploy/host="user@host_ip"
@@ -45,6 +44,7 @@ rm -rf \"{temp_dir}\""
 name="Windows Desktop"
 platform="Windows Desktop"
 runnable=true
+dedicated_server=false
 custom_features=""
 export_filter="all_resources"
 include_filter=""
@@ -54,7 +54,6 @@ encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
 encrypt_directory=false
-script_export_mode=1
 script_encryption_key=""
 
 [preset.1.options]
@@ -67,7 +66,6 @@ texture_format/bptc=false
 texture_format/s3tc=true
 texture_format/etc=false
 texture_format/etc2=false
-texture_format/no_bptc_fallbacks=true
 binary_format/architecture="x86_64"
 codesign/enable=false
 codesign/identity_type=0
@@ -197,9 +195,6 @@ privacy/network_volumes_usage_description=""
 privacy/network_volumes_usage_description_localized={}
 privacy/removable_volumes_usage_description=""
 privacy/removable_volumes_usage_description_localized={}
-texture_format/s3tc=true
-texture_format/etc=false
-texture_format/etc2=false
 ssh_remote_deploy/enabled=false
 ssh_remote_deploy/host="user@host_ip"
 ssh_remote_deploy/port="22"
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"]