diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.svg b/source/assets/sprites/GUI/in_game/menu_button.svg similarity index 100% rename from source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.svg rename to source/assets/sprites/GUI/in_game/menu_button.svg diff --git a/source/assets/sprites/GUI/in_game/menu_button_hover.svg b/source/assets/sprites/GUI/in_game/menu_button_hover.svg new file mode 100644 index 0000000..7ec8114 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/menu_button_hover.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/menu_button_pressed.svg b/source/assets/sprites/GUI/in_game/menu_button_pressed.svg new file mode 100644 index 0000000..9129046 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/menu_button_pressed.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + diff --git a/source/levels/trinity_site/trinity_site_level.tscn b/source/levels/trinity_site/trinity_site_level.tscn index 5f8425e..4c1efb2 100644 --- a/source/levels/trinity_site/trinity_site_level.tscn +++ b/source/levels/trinity_site/trinity_site_level.tscn @@ -193,13 +193,8 @@ __meta__ = { } [node name="menu_button" parent="controls" instance=ExtResource( 13 )] -anchor_left = 1.0 -anchor_right = 1.0 -margin_left = -70.0 -margin_top = 20.0 -margin_right = -20.0 -margin_bottom = 70.0 -focus_mode = 0 +margin_right = 50.0 +margin_bottom = 50.0 [node name="Line" type="Button" parent="controls"] anchor_left = 0.018 diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index 3edc7c7..c93cbb5 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -50,8 +50,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "PLAY" align = 1 valign = 1 @@ -75,8 +75,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "LAN Party" align = 1 valign = 1 @@ -107,8 +107,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "EXIT" align = 1 valign = 1 diff --git a/source/scenes/GUI/network_setup.tscn b/source/scenes/GUI/network_setup.tscn index d4c5e61..799ada3 100644 --- a/source/scenes/GUI/network_setup.tscn +++ b/source/scenes/GUI/network_setup.tscn @@ -21,16 +21,16 @@ use_mipmaps = true use_filter = true font_data = ExtResource( 2 ) +[sub_resource type="StyleBoxEmpty" id=2] + +[sub_resource type="StyleBoxEmpty" id=3] + [sub_resource type="DynamicFont" id=4] size = 36 use_mipmaps = true use_filter = true font_data = ExtResource( 2 ) -[sub_resource type="StyleBoxEmpty" id=2] - -[sub_resource type="StyleBoxEmpty" id=3] - [sub_resource type="DynamicFont" id=5] size = 36 use_mipmaps = true @@ -91,8 +91,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "CREATE SERVER" align = 1 valign = 1 @@ -115,8 +115,8 @@ anchor_bottom = 0.5 margin_left = -233.0 margin_top = -36.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "JOIN SERVER" align = 1 valign = 1 @@ -147,8 +147,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "RETURN" align = 1 valign = 1 @@ -178,8 +178,8 @@ margin_left = -225.0 margin_top = -25.0 margin_right = -225.0 margin_bottom = -25.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 1 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "Enter your username" align = 1 valign = 1 @@ -210,10 +210,10 @@ margin_left = -175.0 margin_top = -28.0 margin_right = 175.0 margin_bottom = 28.0 -custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) -custom_fonts/font = SubResource( 4 ) custom_styles/focus = SubResource( 2 ) custom_styles/normal = SubResource( 3 ) +custom_fonts/font = SubResource( 4 ) +custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) align = 1 placeholder_text = "username" __meta__ = { @@ -234,8 +234,8 @@ margin_bottom = 97.0 [node name="Label" type="Label" parent="multiplayer_configure/popup_screen/panel/confirm"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "CONFIRM" align = 1 valign = 1 @@ -288,8 +288,8 @@ margin_left = -74.5 margin_top = -32.0 margin_right = 74.5 margin_bottom = 32.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 10 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "START" align = 1 valign = 1 @@ -307,8 +307,8 @@ margin_left = -319.0 margin_top = -56.0 margin_right = 319.0 margin_bottom = 56.0 -custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) custom_fonts/font = SubResource( 6 ) +custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) align = 1 valign = 1 __meta__ = { @@ -325,8 +325,8 @@ margin_left = -116.5 margin_top = 60.0 margin_right = 116.5 margin_bottom = 89.0 -custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) custom_fonts/font = SubResource( 7 ) +custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) text = "WAITING FOR PLAYERS" align = 1 valign = 1 @@ -335,12 +335,8 @@ __meta__ = { } [node name="menu_button" parent="UI" instance=ExtResource( 4 )] -anchor_left = 1.0 -anchor_right = 1.0 -margin_left = -70.0 -margin_top = 20.0 -margin_right = -20.0 -margin_bottom = 70.0 +margin_right = 50.0 +margin_bottom = 50.0 [node name="spawn_locations" type="Node" parent="."] diff --git a/source/scenes/GUI/singleplayer_setup.tscn b/source/scenes/GUI/singleplayer_setup.tscn index b496ae2..9784d76 100644 --- a/source/scenes/GUI/singleplayer_setup.tscn +++ b/source/scenes/GUI/singleplayer_setup.tscn @@ -12,16 +12,16 @@ use_mipmaps = true use_filter = true font_data = ExtResource( 2 ) +[sub_resource type="StyleBoxEmpty" id=2] + +[sub_resource type="StyleBoxEmpty" id=3] + [sub_resource type="DynamicFont" id=4] size = 36 use_mipmaps = true use_filter = true font_data = ExtResource( 2 ) -[sub_resource type="StyleBoxEmpty" id=2] - -[sub_resource type="StyleBoxEmpty" id=3] - [sub_resource type="DynamicFont" id=5] size = 36 use_mipmaps = true @@ -61,8 +61,8 @@ margin_left = -225.0 margin_top = -25.0 margin_right = -225.0 margin_bottom = -25.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 1 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "Enter your username" align = 1 valign = 1 @@ -93,10 +93,10 @@ margin_left = -175.0 margin_top = -28.0 margin_right = 175.0 margin_bottom = 28.0 -custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) -custom_fonts/font = SubResource( 4 ) custom_styles/focus = SubResource( 2 ) custom_styles/normal = SubResource( 3 ) +custom_fonts/font = SubResource( 4 ) +custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) align = 1 placeholder_text = "username" __meta__ = { @@ -117,8 +117,8 @@ margin_bottom = 97.0 [node name="Label" type="Label" parent="popup_screen/panel/confirm"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "CONFIRM" align = 1 valign = 1 diff --git a/source/scenes/OVERLAY/elements/menu_button.tscn b/source/scenes/OVERLAY/elements/menu_button.tscn index 33e5996..215ee09 100644 --- a/source/scenes/OVERLAY/elements/menu_button.tscn +++ b/source/scenes/OVERLAY/elements/menu_button.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://source/assets/sprites/GUI/menu_button.svg" type="Texture" id=1] -[ext_resource path="res://source/assets/sprites/GUI/menu_button_pressed.svg" type="Texture" id=2] -[ext_resource path="res://source/assets/sprites/GUI/menu_button_hover.svg" type="Texture" id=3] +[ext_resource path="res://source/assets/sprites/GUI/in_game/menu_button_pressed.svg" type="Texture" id=1] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.svg" type="Texture" id=2] +[ext_resource path="res://source/assets/sprites/GUI/in_game/menu_button_hover.svg" type="Texture" id=3] [ext_resource path="res://source/assets/scripts/ui_element_handlers/menu_button.gd" type="Script" id=4] [node name="menu_button" type="TextureButton"] -margin_right = 40.0 -margin_bottom = 40.0 +margin_right = 45.0 +margin_bottom = 45.0 focus_mode = 0 enabled_focus_mode = 0 -texture_normal = ExtResource( 1 ) -texture_pressed = ExtResource( 2 ) -texture_hover = ExtResource( 3 ) +texture_normal = ExtResource( 2 ) +texture_pressed = ExtResource( 3 ) +texture_hover = ExtResource( 1 ) script = ExtResource( 4 ) __meta__ = { "_edit_use_anchors_": false diff --git a/source/scenes/OVERLAY/elements/menu_button_overlay.tscn b/source/scenes/OVERLAY/elements/menu_button_overlay.tscn index 38730ca..e3062e9 100644 --- a/source/scenes/OVERLAY/elements/menu_button_overlay.tscn +++ b/source/scenes/OVERLAY/elements/menu_button_overlay.tscn @@ -64,8 +64,8 @@ enabled_focus_mode = 2 [node name="Label" type="Label" parent="panel/return_to_game"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 2 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "Return to game" align = 1 valign = 1 @@ -85,8 +85,8 @@ enabled_focus_mode = 2 [node name="Label" type="Label" parent="panel/return_to_main_menu"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 3 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "Retrun to main menu" align = 1 valign = 1 @@ -106,8 +106,8 @@ enabled_focus_mode = 2 [node name="Label" type="Label" parent="panel/exit_game"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 4 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "Exit game" align = 1 valign = 1