sowelilekusi/mtd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some ui improvements

Browse Source
This commit is contained in:
Lexi Quinn
2023-12-09 01:09:12 +11:00
parent e97bf84612
commit 7dd8f88ca7
35 changed files with 408 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Scenes/Menus/alert_popup.tscn
View File

@ -19,13 +19,9 @@ layout_mode = 2
layout_mode = 2
text = "Unable to connect to server"
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
layout_mode = 2
theme_override_constants/margin_right = 28
[node name="Button" type="Button" parent="VBoxContainer/MarginContainer"]
[node name="Button" type="Button" parent="VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 8
text = "OK"
[connection signal="pressed" from="VBoxContainer/MarginContainer/Button" to="." method="_on_button_pressed"]
[connection signal="pressed" from="VBoxContainer/Button" to="." method="_on_button_pressed"]

18
Scenes/Menus/confirmation_popup.tscn
View File

@ -26,23 +26,13 @@ text = "Some Text?"
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
layout_mode = 2
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 30
theme_override_constants/margin_right = 30
[node name="Confirm" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer"]
[node name="Confirm" type="Button" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
text = "Confirm"
[node name="MarginContainer2" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 30
theme_override_constants/margin_right = 30
[node name="Cancel" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer2"]
[node name="Cancel" type="Button" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
text = "Cancel"
[connection signal="pressed" from="VBoxContainer/HBoxContainer/MarginContainer/Confirm" to="." method="_on_confirm_pressed"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/MarginContainer2/Cancel" to="." method="_on_cancel_pressed"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_confirm_pressed"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="_on_cancel_pressed"]

34
Scenes/Menus/lost_game_screen.tscn
View File

@ -32,29 +32,27 @@ offset_bottom = 26.0
grow_horizontal = 2
text = "You Lost"
[node name="RestartButton" type="Button" parent="."]
[node name="HBoxContainer" type="HBoxContainer" parent="."]
layout_mode = 1
anchors_preset = -1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
offset_left = -44.0
offset_top = 270.0
offset_right = -161.0
offset_bottom = 31.0
anchor_bottom = 0.5
offset_left = -274.0
offset_top = -20.0
offset_right = 274.0
offset_bottom = 20.0
grow_horizontal = 2
grow_vertical = 2
[node name="RestartButton" type="Button" parent="HBoxContainer"]
layout_mode = 2
text = "Play Again"
[node name="QuitButton" type="Button" parent="."]
layout_mode = 1
anchors_preset = -1
anchor_left = 0.5
anchor_right = 0.5
offset_left = 264.0
offset_top = 270.0
offset_right = 21.0
offset_bottom = 31.0
grow_horizontal = 2
[node name="QuitButton" type="Button" parent="HBoxContainer"]
layout_mode = 2
text = "Quit to main menu"
[connection signal="pressed" from="RestartButton" to="." method="_on_restart_button_pressed"]
[connection signal="pressed" from="QuitButton" to="." method="_on_quit_button_pressed"]
[connection signal="pressed" from="HBoxContainer/RestartButton" to="." method="_on_restart_button_pressed"]
[connection signal="pressed" from="HBoxContainer/QuitButton" to="." method="_on_quit_button_pressed"]

44
Scenes/Menus/main_menu.tscn
View File

@ -53,48 +53,20 @@ offset_right = 143.0
offset_bottom = -80.0
grow_vertical = 0
[node name="MarginContainer" type="MarginContainer" parent="MainControls"]
layout_mode = 2
theme_override_constants/margin_left = 0
theme_override_constants/margin_top = 3
theme_override_constants/margin_right = 0
theme_override_constants/margin_bottom = 3
[node name="PlayButton" type="Button" parent="MainControls/MarginContainer"]
[node name="PlayButton" type="Button" parent="MainControls"]
layout_mode = 2
text = "Play"
[node name="MarginContainer2" type="MarginContainer" parent="MainControls"]
layout_mode = 2
theme_override_constants/margin_left = 0
theme_override_constants/margin_top = 3
theme_override_constants/margin_right = 0
theme_override_constants/margin_bottom = 3
[node name="MultiplayerButton" type="Button" parent="MainControls/MarginContainer2"]
[node name="MultiplayerButton" type="Button" parent="MainControls"]
layout_mode = 2
text = "Multiplayer"
[node name="MarginContainer3" type="MarginContainer" parent="MainControls"]
layout_mode = 2
theme_override_constants/margin_left = 0
theme_override_constants/margin_top = 3
theme_override_constants/margin_right = 0
theme_override_constants/margin_bottom = 3
[node name="OptionsButton" type="Button" parent="MainControls/MarginContainer3"]
[node name="OptionsButton" type="Button" parent="MainControls"]
layout_mode = 2
text = "Options
"
[node name="MarginContainer4" type="MarginContainer" parent="MainControls"]
layout_mode = 2
theme_override_constants/margin_left = 0
theme_override_constants/margin_top = 3
theme_override_constants/margin_right = 0
theme_override_constants/margin_bottom = 3
[node name="QuitButton" type="Button" parent="MainControls/MarginContainer4"]
[node name="QuitButton" type="Button" parent="MainControls"]
layout_mode = 2
text = "Quit
"
@ -146,8 +118,8 @@ size = Vector2i(1920, 1080)
[node name="GridMap" parent="SubViewport" instance=ExtResource("3_l8r4a")]
[connection signal="pressed" from="MainControls/MarginContainer/PlayButton" to="." method="_on_play_button_pressed"]
[connection signal="pressed" from="MainControls/MarginContainer2/MultiplayerButton" to="." method="_on_multiplayer_button_pressed"]
[connection signal="pressed" from="MainControls/MarginContainer3/OptionsButton" to="." method="_on_options_button_pressed"]
[connection signal="pressed" from="MainControls/MarginContainer4/QuitButton" to="." method="_on_quit_button_pressed"]
[connection signal="pressed" from="MainControls/PlayButton" to="." method="_on_play_button_pressed"]
[connection signal="pressed" from="MainControls/MultiplayerButton" to="." method="_on_multiplayer_button_pressed"]
[connection signal="pressed" from="MainControls/OptionsButton" to="." method="_on_options_button_pressed"]
[connection signal="pressed" from="MainControls/QuitButton" to="." method="_on_quit_button_pressed"]
[connection signal="pressed" from="ProfileEditor/VBoxContainer/HBoxContainer/MarginContainer/DisplayNameEdit" to="." method="_on_display_name_edit_pressed"]

9
Scenes/Menus/multiplayer_lobby.tscn
View File

@ -3,8 +3,8 @@
[ext_resource type="Theme" uid="uid://b6a0ip4p72tgx" path="res://new_theme.tres" id="1_l1spu"]
[ext_resource type="Script" path="res://Scripts/multiplayer_lobby.gd" id="2_nb860"]
[ext_resource type="PackedScene" uid="uid://dpt3kpixawyby" path="res://Scenes/UI/scoreboard.tscn" id="3_f6bia"]
[ext_resource type="PackedScene" uid="uid://3kcl30sump8c" path="res://Scenes/Menus/LoadoutEditor.tscn" id="4_bmg55"]
[ext_resource type="PackedScene" uid="uid://bvfit0sy2tnw4" path="res://Scenes/Menus/server_form.tscn" id="5_bqbwv"]
[ext_resource type="PackedScene" uid="uid://dqqitmhu66a7d" path="res://charselect.tscn" id="5_lvoo2"]
[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://Scenes/UI/chatbox.tscn" id="6_wtqwd"]
[node name="multiplayer_lobby" type="Control" node_paths=PackedStringArray("server_form", "scoreboard", "loadout_editor", "chatbox")]
@ -19,7 +19,7 @@ theme = ExtResource("1_l1spu")
script = ExtResource("2_nb860")
server_form = NodePath("ServerForm")
scoreboard = NodePath("Scoreboard")
loadout_editor = NodePath("Panel")
loadout_editor = NodePath("Control")
chatbox = NodePath("Chatbox")
[node name="ServerForm" parent="." instance=ExtResource("5_bqbwv")]
@ -39,12 +39,9 @@ offset_left = -472.0
offset_right = -50.0
grow_horizontal = 0
[node name="Panel" parent="." instance=ExtResource("4_bmg55")]
[node name="Control" parent="." instance=ExtResource("5_lvoo2")]
visible = false
layout_mode = 1
anchors_preset = -1
offset_left = 50.0
offset_right = 455.0
[node name="ReadyButton" type="Button" parent="."]
visible = false

22
Scenes/Menus/options_menu.tscn
View File

@ -46,27 +46,13 @@ layout_mode = 2
layout_mode = 2
alignment = 2
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 30
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 30
theme_override_constants/margin_bottom = 5
[node name="Cancel" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer"]
[node name="Cancel" type="Button" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
text = "Discard"
[node name="MarginContainer2" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 30
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 30
theme_override_constants/margin_bottom = 5
[node name="Confirm" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer2"]
[node name="Confirm" type="Button" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
text = "Confirm"
[connection signal="pressed" from="VBoxContainer/HBoxContainer/MarginContainer/Cancel" to="." method="_on_cancel_pressed"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/MarginContainer2/Confirm" to="." method="_on_confirm_pressed"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="_on_cancel_pressed"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_confirm_pressed"]

44
Scenes/Menus/pause_menu.tscn
View File

@ -39,51 +39,23 @@ grow_vertical = 2
[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
layout_mode = 2
[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 24
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 24
theme_override_constants/margin_bottom = 5
[node name="Resume" type="Button" parent="PanelContainer/VBoxContainer/MarginContainer"]
[node name="Resume" type="Button" parent="PanelContainer/VBoxContainer"]
layout_mode = 2
text = "Resume"
[node name="MarginContainer2" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 24
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 24
theme_override_constants/margin_bottom = 5
[node name="Options" type="Button" parent="PanelContainer/VBoxContainer/MarginContainer2"]
[node name="Options" type="Button" parent="PanelContainer/VBoxContainer"]
layout_mode = 2
text = "Options"
[node name="MarginContainer3" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 24
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 24
theme_override_constants/margin_bottom = 5
[node name="QuitToMainMenu" type="Button" parent="PanelContainer/VBoxContainer/MarginContainer3"]
[node name="QuitToMainMenu" type="Button" parent="PanelContainer/VBoxContainer"]
layout_mode = 2
text = "Quit to main menu"
[node name="MarginContainer4" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 24
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 24
theme_override_constants/margin_bottom = 5
[node name="QuitToDesktop" type="Button" parent="PanelContainer/VBoxContainer/MarginContainer4"]
[node name="QuitToDesktop" type="Button" parent="PanelContainer/VBoxContainer"]
layout_mode = 2
text = "Quit to desktop"
[connection signal="pressed" from="PanelContainer/VBoxContainer/MarginContainer/Resume" to="." method="_on_resume_pressed"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/MarginContainer2/Options" to="." method="_on_options_pressed"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/MarginContainer3/QuitToMainMenu" to="." method="_on_quit_to_main_menu_pressed"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/MarginContainer4/QuitToDesktop" to="." method="_on_quit_to_desktop_pressed"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/Resume" to="." method="_on_resume_pressed"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/Options" to="." method="_on_options_pressed"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/QuitToMainMenu" to="." method="_on_quit_to_main_menu_pressed"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/QuitToDesktop" to="." method="_on_quit_to_desktop_pressed"]

15
Scenes/Menus/singleplayer_lobby.tscn
View File

@ -3,8 +3,8 @@
[ext_resource type="Theme" uid="uid://b6a0ip4p72tgx" path="res://new_theme.tres" id="1_2aur6"]
[ext_resource type="PackedScene" uid="uid://dpt3kpixawyby" path="res://Scenes/UI/scoreboard.tscn" id="1_423py"]
[ext_resource type="Script" path="res://Scripts/singleplayer_lobby.gd" id="1_nd17k"]
[ext_resource type="PackedScene" uid="uid://3kcl30sump8c" path="res://Scenes/Menus/LoadoutEditor.tscn" id="2_wpyw5"]
[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://Scenes/UI/chatbox.tscn" id="3_l8xy3"]
[ext_resource type="PackedScene" uid="uid://dqqitmhu66a7d" path="res://charselect.tscn" id="5_vg5y0"]
[node name="singleplayer_lobby" type="Control" node_paths=PackedStringArray("scoreboard", "loadout_editor", "chatbox")]
layout_mode = 3
@ -17,7 +17,7 @@ mouse_filter = 2
theme = ExtResource("1_2aur6")
script = ExtResource("1_nd17k")
scoreboard = NodePath("Scoreboard")
loadout_editor = NodePath("Panel")
loadout_editor = NodePath("Control")
chatbox = NodePath("Chatbox")
[node name="Scoreboard" parent="." instance=ExtResource("1_423py")]
@ -30,13 +30,6 @@ offset_left = -472.0
offset_right = -50.0
grow_horizontal = 0
[node name="Panel" parent="." instance=ExtResource("2_wpyw5")]
visible = false
layout_mode = 1
anchors_preset = -1
offset_left = 50.0
offset_right = 455.0
[node name="ReadyButton" type="Button" parent="."]
visible = false
layout_mode = 1
@ -56,5 +49,9 @@ text = "Ready"
[node name="Chatbox" parent="." instance=ExtResource("3_l8xy3")]
layout_mode = 1
[node name="Control" parent="." instance=ExtResource("5_vg5y0")]
visible = false
layout_mode = 1
[connection signal="pressed" from="ReadyButton" to="Scoreboard" method="set_player_ready_state" binds= [1, true]]
[connection signal="pressed" from="ReadyButton" to="ReadyButton" method="set_visible" binds= [false]]

9
Scenes/Menus/text_input_popup.tscn
View File

@ -23,14 +23,9 @@ layout_mode = 2
layout_mode = 2
placeholder_text = "Dummy Text"
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 30
theme_override_constants/margin_right = 30
[node name="Button" type="Button" parent="VBoxContainer/MarginContainer"]
[node name="Button" type="Button" parent="VBoxContainer"]
layout_mode = 2
text = "Confirm
"
[connection signal="pressed" from="VBoxContainer/MarginContainer/Button" to="." method="_on_button_pressed"]
[connection signal="pressed" from="VBoxContainer/Button" to="." method="_on_button_pressed"]

34
Scenes/Menus/won_game_screen.tscn
View File

@ -32,29 +32,27 @@ offset_bottom = 23.0
grow_horizontal = 2
text = "You WIN :3"
[node name="PlayButton" type="Button" parent="."]
[node name="HBoxContainer" type="HBoxContainer" parent="."]
layout_mode = 1
anchors_preset = -1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
offset_left = -312.0
offset_top = 331.0
offset_right = -157.0
offset_bottom = 369.0
anchor_bottom = 0.5
offset_left = -298.0
offset_top = -20.0
offset_right = 298.0
offset_bottom = 20.0
grow_horizontal = 2
grow_vertical = 2
[node name="PlayButton" type="Button" parent="HBoxContainer"]
layout_mode = 2
text = "play again :3"
[node name="QuitButton" type="Button" parent="."]
layout_mode = 1
anchors_preset = -1
anchor_left = 0.5
anchor_right = 0.5
offset_left = 11.0
offset_top = 331.0
offset_right = 262.0
offset_bottom = 369.0
grow_horizontal = 2
[node name="QuitButton" type="Button" parent="HBoxContainer"]
layout_mode = 2
text = "quit to main menu :<"
[connection signal="pressed" from="PlayButton" to="." method="_on_play_button_pressed"]
[connection signal="pressed" from="QuitButton" to="." method="_on_quit_button_pressed"]
[connection signal="pressed" from="HBoxContainer/PlayButton" to="." method="_on_play_button_pressed"]
[connection signal="pressed" from="HBoxContainer/QuitButton" to="." method="_on_quit_button_pressed"]