From 8ddb76b4c990967ea65b0b4eec51415c21e72b17 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 16 Jul 2020 15:11:15 +0200 Subject: [PATCH] Removed multiplayer related things from the menu. Also other smaller ui cleanups. --- game/scenes/ConnectButton.gd | 35 ----- game/scenes/ConnectServerButton.gd | 73 --------- game/scenes/DisconnectButton.gd | 35 ----- game/scenes/HostButton.gd | 30 ---- game/scenes/HostGameButton.gd | 71 --------- game/scenes/Menu.tscn | 237 +---------------------------- game/ui/login/Login.tscn | 88 ----------- game/ui/player_ui/player_ui.tscn | 1 + game/ui/register/Register.tscn | 114 -------------- game/ui/starmap/StarMap.tscn | 72 --------- 10 files changed, 4 insertions(+), 752 deletions(-) delete mode 100644 game/scenes/ConnectButton.gd delete mode 100644 game/scenes/ConnectServerButton.gd delete mode 100644 game/scenes/DisconnectButton.gd delete mode 100644 game/scenes/HostButton.gd delete mode 100644 game/scenes/HostGameButton.gd delete mode 100644 game/ui/login/Login.tscn delete mode 100644 game/ui/register/Register.tscn delete mode 100644 game/ui/starmap/StarMap.tscn diff --git a/game/scenes/ConnectButton.gd b/game/scenes/ConnectButton.gd deleted file mode 100644 index f44a661..0000000 --- a/game/scenes/ConnectButton.gd +++ /dev/null @@ -1,35 +0,0 @@ -extends Button - -# Copyright (c) 2019-2020 Péter Magyar -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -func _ready(): - get_tree().connect("connected_to_server", self, "connected_to_server") - get_tree().connect("server_disconnected", self, "server_disconnected") - -func _exit_tree(): - get_tree().disconnect("connected_to_server", self, "connected_to_server") - get_tree().disconnect("server_disconnected", self, "server_disconnected") - -func connected_to_server(): - hide() - -func server_disconnected(): - show() diff --git a/game/scenes/ConnectServerButton.gd b/game/scenes/ConnectServerButton.gd deleted file mode 100644 index de4b73e..0000000 --- a/game/scenes/ConnectServerButton.gd +++ /dev/null @@ -1,73 +0,0 @@ -extends Button - -# Copyright (c) 2019-2020 Péter Magyar -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -export(NodePath) var container_path : NodePath -export(NodePath) var status_label_path : NodePath - -export(NodePath) var use_websockets_checkbox_path : NodePath - -export(NodePath) var ip_line_edit_path : NodePath -export(NodePath) var port_line_edit_path : NodePath - -var _container : Control -var _status : Label - -var _use_websockets_checkbox : CheckBox - -var _ip_line_edit : LineEdit -var _port_line_edit : LineEdit - -func _ready(): - _container = get_node(container_path) as Control - get_tree().connect("connected_to_server", self, "connected_to_server") - - _status = get_node(status_label_path) as Label - _status.text = "" - - _use_websockets_checkbox = get_node(use_websockets_checkbox_path) as CheckBox - - _ip_line_edit = get_node(ip_line_edit_path) as LineEdit - _port_line_edit = get_node(port_line_edit_path) as LineEdit - -func _exit_tree(): - get_tree().disconnect("connected_to_server", self, "connected_to_server") - -func _pressed(): - var ip : String = _ip_line_edit.text - var port : String = _port_line_edit.text - - var portint : int = int(port) - - _status.text = "Connecting..." - var err : int = 0 - - if _use_websockets_checkbox.pressed: - err = Server.connect_to_server_websocket(ip, portint) - else: - err = Server.connect_to_server(ip, portint) - - if err != OK: - _status.text = "Error: " + str(err) - - -func connected_to_server(): - _container.hide() diff --git a/game/scenes/DisconnectButton.gd b/game/scenes/DisconnectButton.gd deleted file mode 100644 index 431ce17..0000000 --- a/game/scenes/DisconnectButton.gd +++ /dev/null @@ -1,35 +0,0 @@ -extends Button - -# Copyright (c) 2019-2020 Péter Magyar -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -func _ready(): - get_tree().connect("connected_to_server", self, "connected_to_server") - get_tree().connect("server_disconnected", self, "server_disconnected") - -func _exit_tree(): - get_tree().disconnect("connected_to_server", self, "connected_to_server") - get_tree().disconnect("server_disconnected", self, "server_disconnected") - -func connected_to_server(): - show() - -func server_disconnected(): - hide() diff --git a/game/scenes/HostButton.gd b/game/scenes/HostButton.gd deleted file mode 100644 index 6def017..0000000 --- a/game/scenes/HostButton.gd +++ /dev/null @@ -1,30 +0,0 @@ -extends Button - -# Copyright (c) 2019-2020 Péter Magyar -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - -# Called when the node enters the scene tree for the first time. - -#func _pressed(): -# Server.start_hosting() diff --git a/game/scenes/HostGameButton.gd b/game/scenes/HostGameButton.gd deleted file mode 100644 index 81ea165..0000000 --- a/game/scenes/HostGameButton.gd +++ /dev/null @@ -1,71 +0,0 @@ -extends Button - -# Copyright (c) 2019-2020 Péter Magyar -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -export(NodePath) var container_path : NodePath -export(NodePath) var status_label_path : NodePath - -export(NodePath) var use_websockets_checkbox_path : NodePath - -export(NodePath) var port_line_edit_path : NodePath - -var _container : Control -var _status : Label - -var _use_websockets_checkbox : CheckBox - -var _port_line_edit : LineEdit - -func _ready(): - _container = get_node(container_path) as Control -# get_tree().connect("connected_to_server", self, "connected_to_server") - - _status = get_node(status_label_path) as Label - _status.text = "" - - _use_websockets_checkbox = get_node(use_websockets_checkbox_path) as CheckBox - - _port_line_edit = get_node(port_line_edit_path) as LineEdit - -#func _exit_tree(): -# get_tree().disconnect("connected_to_server", self, "connected_to_server") - -func _pressed(): - var port : String = _port_line_edit.text - - var portint : int = int(port) - - _status.text = "Connecting..." - var err : int = 0 - - if _use_websockets_checkbox.pressed: - err = Server.start_hosting_websocket(portint) - else: - err = Server.start_hosting(portint) - - if err != OK: - _status.text = "Error: " + str(err) - else: - _container.hide() - - -#func connected_to_server(): -# _container.hide() diff --git a/game/scenes/Menu.tscn b/game/scenes/Menu.tscn index 537857a..7260f19 100644 --- a/game/scenes/Menu.tscn +++ b/game/scenes/Menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1] [ext_resource path="res://ui/menu/CharacterEntry.tscn" type="PackedScene" id=2] @@ -8,13 +8,6 @@ [ext_resource path="res://scenes/CharacterCreationMenu.gd" type="Script" id=6] [ext_resource path="res://ui/menu/character_creation_button_group.tres" type="ButtonGroup" id=7] [ext_resource path="res://ui/options/Options.tscn" type="PackedScene" id=8] -[ext_resource path="res://ui/register/Register.tscn" type="PackedScene" id=9] -[ext_resource path="res://ui/login/Login.tscn" type="PackedScene" id=10] -[ext_resource path="res://scenes/ConnectButton.gd" type="Script" id=11] -[ext_resource path="res://scenes/HostButton.gd" type="Script" id=12] -[ext_resource path="res://scenes/DisconnectButton.gd" type="Script" id=13] -[ext_resource path="res://scenes/ConnectServerButton.gd" type="Script" id=14] -[ext_resource path="res://scenes/HostGameButton.gd" type="Script" id=15] [ext_resource path="res://ui/about/About.tscn" type="PackedScene" id=20] [node name="Menu" type="Control"] @@ -58,7 +51,7 @@ __meta__ = { } menu_path = NodePath("..") container_path = NodePath("CharacterSelector/VBoxContainer/CharacterSelector/VBoxContainer/ScrollContainer/Container") -player_display_container_path = NodePath("../Char/CharacterDisplay") +player_display_container_path = NodePath("../Node2D") character_button_group = ExtResource( 4 ) character_entry = ExtResource( 2 ) character_folder = "characters" @@ -222,173 +215,6 @@ margin_right = 253.0 margin_bottom = 115.57 text = "Back" -[node name="ConnectMenu" type="Control" parent="."] -visible = false -anchor_right = 1.0 -anchor_bottom = 1.0 -mouse_filter = 2 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="PanelContainer" type="PanelContainer" parent="ConnectMenu"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -126.0 -margin_top = -89.0 -margin_right = 126.0 -margin_bottom = 89.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="VBoxContainer" type="VBoxContainer" parent="ConnectMenu/PanelContainer"] -margin_left = 4.0 -margin_top = 4.0 -margin_right = 248.0 -margin_bottom = 254.0 - -[node name="Label3" type="Label" parent="ConnectMenu/PanelContainer/VBoxContainer"] -margin_right = 244.0 -margin_bottom = 15.0 -text = "Connect" -align = 1 -valign = 1 - -[node name="Label" type="Label" parent="ConnectMenu/PanelContainer/VBoxContainer"] -margin_top = 23.0 -margin_right = 244.0 -margin_bottom = 38.0 -text = "Hostname / IP" - -[node name="LineEdit" type="LineEdit" parent="ConnectMenu/PanelContainer/VBoxContainer"] -margin_top = 46.0 -margin_right = 244.0 -margin_bottom = 70.3413 -text = "127.0.0.1" - -[node name="Label2" type="Label" parent="ConnectMenu/PanelContainer/VBoxContainer"] -margin_top = 78.0 -margin_right = 244.0 -margin_bottom = 93.0 -text = "Port" - -[node name="LineEdit2" type="LineEdit" parent="ConnectMenu/PanelContainer/VBoxContainer"] -margin_top = 101.0 -margin_right = 244.0 -margin_bottom = 125.341 -text = "23223" - -[node name="CheckBox" type="CheckBox" parent="ConnectMenu/PanelContainer/VBoxContainer"] -margin_top = 133.0 -margin_right = 244.0 -margin_bottom = 159.57 -text = "Use WebSockets" - -[node name="Status" type="Label" parent="ConnectMenu/PanelContainer/VBoxContainer"] -margin_top = 167.0 -margin_right = 244.0 -margin_bottom = 182.0 -align = 1 -valign = 1 - -[node name="ConnectButton" type="Button" parent="ConnectMenu/PanelContainer/VBoxContainer"] -margin_top = 190.0 -margin_right = 244.0 -margin_bottom = 216.57 -text = "Connect" -script = ExtResource( 14 ) -container_path = NodePath("../../..") -status_label_path = NodePath("../Status") -use_websockets_checkbox_path = NodePath("../CheckBox") -ip_line_edit_path = NodePath("../LineEdit") -port_line_edit_path = NodePath("../LineEdit2") - -[node name="Button2" type="Button" parent="ConnectMenu/PanelContainer/VBoxContainer"] -margin_top = 224.0 -margin_right = 244.0 -margin_bottom = 250.57 -text = "Cancel" - -[node name="HostMenu" type="Control" parent="."] -visible = false -anchor_right = 1.0 -anchor_bottom = 1.0 -mouse_filter = 2 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="PanelContainer" type="PanelContainer" parent="HostMenu"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -126.0 -margin_top = -101.5 -margin_right = 126.0 -margin_bottom = 101.5 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="VBoxContainer" type="VBoxContainer" parent="HostMenu/PanelContainer"] -margin_left = 4.0 -margin_top = 4.0 -margin_right = 248.0 -margin_bottom = 199.0 - -[node name="Label3" type="Label" parent="HostMenu/PanelContainer/VBoxContainer"] -margin_right = 244.0 -margin_bottom = 15.0 -text = "Host" -align = 1 -valign = 1 - -[node name="Label2" type="Label" parent="HostMenu/PanelContainer/VBoxContainer"] -margin_top = 23.0 -margin_right = 244.0 -margin_bottom = 38.0 -text = "Port" - -[node name="LineEdit2" type="LineEdit" parent="HostMenu/PanelContainer/VBoxContainer"] -margin_top = 46.0 -margin_right = 244.0 -margin_bottom = 70.3413 -text = "23223" - -[node name="CheckBox" type="CheckBox" parent="HostMenu/PanelContainer/VBoxContainer"] -margin_top = 78.0 -margin_right = 244.0 -margin_bottom = 104.57 -text = "Use WebSockets" - -[node name="Status" type="Label" parent="HostMenu/PanelContainer/VBoxContainer"] -margin_top = 112.0 -margin_right = 244.0 -margin_bottom = 127.0 -align = 1 -valign = 1 - -[node name="HostButton" type="Button" parent="HostMenu/PanelContainer/VBoxContainer"] -margin_top = 135.0 -margin_right = 244.0 -margin_bottom = 161.57 -text = "Host" -script = ExtResource( 15 ) -container_path = NodePath("../../..") -status_label_path = NodePath("../Status") -use_websockets_checkbox_path = NodePath("../CheckBox") -port_line_edit_path = NodePath("../LineEdit2") - -[node name="Button2" type="Button" parent="HostMenu/PanelContainer/VBoxContainer"] -margin_top = 169.0 -margin_right = 244.0 -margin_bottom = 195.57 -text = "Cancel" - [node name="OptionsButton" type="MarginContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 @@ -423,39 +249,6 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Disconnect" type="Button" parent="OptionsButton/Control/VBoxContainer"] -visible = false -margin_right = 120.0 -margin_bottom = 26.269 -rect_min_size = Vector2( 120, 0 ) -text = "Disconnect" -script = ExtResource( 13 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Connect" type="Button" parent="OptionsButton/Control/VBoxContainer"] -margin_top = 47.0 -margin_right = 120.0 -margin_bottom = 73.5702 -rect_min_size = Vector2( 120, 0 ) -text = "Connect" -script = ExtResource( 11 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Host" type="Button" parent="OptionsButton/Control/VBoxContainer"] -margin_top = 81.0 -margin_right = 120.0 -margin_bottom = 107.57 -rect_min_size = Vector2( 120, 0 ) -text = "Host" -script = ExtResource( 12 ) -__meta__ = { -"_edit_use_anchors_": false -} - [node name="Button2" type="Button" parent="OptionsButton/Control/VBoxContainer"] visible = false margin_top = 115.0 @@ -504,35 +297,11 @@ visible = false [node name="About" parent="." instance=ExtResource( 20 )] visible = false -[node name="Login" parent="." instance=ExtResource( 10 )] -visible = false -margin_left = -107.5 -margin_top = -127.5 -margin_right = 107.5 -margin_bottom = 127.5 - -[node name="Register" parent="." instance=ExtResource( 9 )] -visible = false - -[node name="Char" type="Spatial" parent="."] -transform = Transform( 0.359313, 0, 0.933217, 0, 1, 0, -0.933217, 0, 0.359313, -2.44425, 0.926699, 0 ) - -[node name="CharacterDisplay" type="Spatial" parent="Char"] -transform = Transform( 1, 1.49012e-08, 0, 0, 0.990268, -0.139173, -2.98023e-08, 0.139173, 0.990268, -5.96046e-08, 0.578123, 0.08125 ) - -[node name="Camera" type="Camera" parent="Char"] -transform = Transform( 0.907555, -0.0761572, 0.41297, 0.0262364, 0.99178, 0.12524, -0.419113, -0.102827, 0.902093, 0.752064, 1.69463, 3.15021 ) -current = true +[node name="Node2D" type="Node2D" parent="."] [connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/VBoxContainer/CharacterSelector/VBoxContainer/Load" to="CharacterSelectorMenu" method="load_character"] [connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/VBoxContainer/CharacterSelector/VBoxContainer/New" to="." method="switch_to_menu" binds= [ 1 ]] [connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/VBoxContainer/CharacterSelector/VBoxContainer/Delete" to="CharacterSelectorMenu" method="renounce_character"] [connection signal="pressed" from="CharacterCreationMenu/CharacterSelector2/CharacterSelector/VBoxContainer/PanelContainer/VBoxContainer/Create" to="CharacterCreationMenu" method="create"] [connection signal="pressed" from="CharacterCreationMenu/CharacterSelector2/CharacterSelector/VBoxContainer/PanelContainer/VBoxContainer/Back" to="." method="switch_to_menu" binds= [ 0 ]] -[connection signal="pressed" from="ConnectMenu/PanelContainer/VBoxContainer/Button2" to="ConnectMenu" method="hide"] -[connection signal="pressed" from="HostMenu/PanelContainer/VBoxContainer/Button2" to="HostMenu" method="hide"] -[connection signal="pressed" from="OptionsButton/Control/VBoxContainer/Connect" to="ConnectMenu" method="show"] -[connection signal="pressed" from="OptionsButton/Control/VBoxContainer/Host" to="HostMenu" method="show"] -[connection signal="pressed" from="OptionsButton/Control/VBoxContainer/Button2" to="Login" method="show"] -[connection signal="pressed" from="OptionsButton/Control/VBoxContainer/Button3" to="Register" method="show"] [connection signal="pressed" from="OptionsButton/Control/VBoxContainer/About" to="About" method="show"] [connection signal="pressed" from="OptionsButton/Control/VBoxContainer/Button" to="Options" method="show"] diff --git a/game/ui/login/Login.tscn b/game/ui/login/Login.tscn deleted file mode 100644 index 5e0270f..0000000 --- a/game/ui/login/Login.tscn +++ /dev/null @@ -1,88 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1] - -[node name="Login" type="PanelContainer"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -145.0 -margin_top = -157.0 -margin_right = 110.0 -margin_bottom = 86.0 -theme = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="VBoxContainer" type="VBoxContainer" parent="."] -margin_left = 4.0 -margin_top = 4.0 -margin_right = 251.0 -margin_bottom = 242.0 -custom_constants/separation = 10 -alignment = 1 - -[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] -margin_right = 247.0 -margin_bottom = 30.0 -size_flags_horizontal = 3 - -[node name="Label3" type="Label" parent="VBoxContainer/HBoxContainer"] -margin_top = 7.0 -margin_right = 199.0 -margin_bottom = 22.0 -size_flags_horizontal = 3 -text = "Login" - -[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer"] -margin_left = 207.0 -margin_right = 247.0 -margin_bottom = 30.0 -rect_min_size = Vector2( 40, 30 ) -text = "X" - -[node name="HSeparator" type="HSeparator" parent="VBoxContainer"] -margin_top = 40.0 -margin_right = 247.0 -margin_bottom = 48.0 - -[node name="Label" type="Label" parent="VBoxContainer"] -margin_top = 58.0 -margin_right = 247.0 -margin_bottom = 73.0 -text = "Username" - -[node name="LineEdit" type="LineEdit" parent="VBoxContainer"] -margin_top = 83.0 -margin_right = 247.0 -margin_bottom = 107.341 - -[node name="Label2" type="Label" parent="VBoxContainer"] -margin_top = 117.0 -margin_right = 247.0 -margin_bottom = 132.0 -text = "Password" - -[node name="LineEdit2" type="LineEdit" parent="VBoxContainer"] -margin_top = 142.0 -margin_right = 247.0 -margin_bottom = 166.341 -secret = true -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="CheckBox" type="CheckBox" parent="VBoxContainer"] -margin_top = 176.0 -margin_right = 247.0 -margin_bottom = 202.269 -text = "Remember me" - -[node name="Button" type="Button" parent="VBoxContainer"] -margin_top = 212.0 -margin_right = 247.0 -margin_bottom = 238.269 -text = "Login" -[connection signal="pressed" from="VBoxContainer/HBoxContainer/Button" to="." method="hide"] diff --git a/game/ui/player_ui/player_ui.tscn b/game/ui/player_ui/player_ui.tscn index 546e4e6..268b485 100644 --- a/game/ui/player_ui/player_ui.tscn +++ b/game/ui/player_ui/player_ui.tscn @@ -295,6 +295,7 @@ margin_right = 151.0 visible = false [node name="MiniMap" parent="GUI" instance=ExtResource( 18 )] +visible = false [node name="AuraFrame" parent="GUI" instance=ExtResource( 5 )] margin_left = -331.0 diff --git a/game/ui/register/Register.tscn b/game/ui/register/Register.tscn deleted file mode 100644 index 2f36a84..0000000 --- a/game/ui/register/Register.tscn +++ /dev/null @@ -1,114 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1] - -[node name="Register" type="PanelContainer"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -107.5 -margin_top = -182.0 -margin_right = 107.5 -margin_bottom = 182.0 -theme = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="VBoxContainer" type="VBoxContainer" parent="."] -margin_left = 4.0 -margin_top = 4.0 -margin_right = 211.0 -margin_bottom = 360.0 -custom_constants/separation = 10 -alignment = 1 - -[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] -margin_right = 207.0 -margin_bottom = 30.0 -size_flags_horizontal = 3 - -[node name="Label3" type="Label" parent="VBoxContainer/HBoxContainer"] -margin_top = 7.0 -margin_right = 159.0 -margin_bottom = 22.0 -size_flags_horizontal = 3 -text = "Register" - -[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer"] -margin_left = 167.0 -margin_right = 207.0 -margin_bottom = 30.0 -rect_min_size = Vector2( 40, 30 ) -text = "X" - -[node name="HSeparator" type="HSeparator" parent="VBoxContainer"] -margin_top = 40.0 -margin_right = 207.0 -margin_bottom = 48.0 - -[node name="Label" type="Label" parent="VBoxContainer"] -margin_top = 58.0 -margin_right = 207.0 -margin_bottom = 73.0 -text = "Username" - -[node name="LineEdit" type="LineEdit" parent="VBoxContainer"] -margin_top = 83.0 -margin_right = 207.0 -margin_bottom = 107.341 - -[node name="Label4" type="Label" parent="VBoxContainer"] -margin_top = 117.0 -margin_right = 207.0 -margin_bottom = 132.0 -text = "Email" - -[node name="LineEdit4" type="LineEdit" parent="VBoxContainer"] -margin_top = 142.0 -margin_right = 207.0 -margin_bottom = 166.341 - -[node name="Label2" type="Label" parent="VBoxContainer"] -margin_top = 176.0 -margin_right = 207.0 -margin_bottom = 191.0 -text = "Password" - -[node name="LineEdit2" type="LineEdit" parent="VBoxContainer"] -margin_top = 201.0 -margin_right = 207.0 -margin_bottom = 225.341 -secret = true -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Label3" type="Label" parent="VBoxContainer"] -margin_top = 235.0 -margin_right = 207.0 -margin_bottom = 250.0 -text = "Password Again" - -[node name="LineEdit3" type="LineEdit" parent="VBoxContainer"] -margin_top = 260.0 -margin_right = 207.0 -margin_bottom = 284.341 -secret = true -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="CheckBox" type="CheckBox" parent="VBoxContainer"] -margin_top = 294.0 -margin_right = 207.0 -margin_bottom = 320.269 -text = "I Accept the EULA" - -[node name="Button" type="Button" parent="VBoxContainer"] -margin_top = 330.0 -margin_right = 207.0 -margin_bottom = 356.269 -text = "Register" -[connection signal="pressed" from="VBoxContainer/HBoxContainer/Button" to="." method="hide"] diff --git a/game/ui/starmap/StarMap.tscn b/game/ui/starmap/StarMap.tscn deleted file mode 100644 index b2a6bfb..0000000 --- a/game/ui/starmap/StarMap.tscn +++ /dev/null @@ -1,72 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1] - -[node name="StarMap" type="PanelContainer"] -margin_right = 531.0 -margin_bottom = 442.0 -theme = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="VBoxContainer" type="VBoxContainer" parent="."] -margin_left = 4.0 -margin_top = 4.0 -margin_right = 527.0 -margin_bottom = 438.0 - -[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] -margin_right = 523.0 -margin_bottom = 40.0 - -[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer"] -margin_top = 12.0 -margin_right = 475.0 -margin_bottom = 27.0 -size_flags_horizontal = 3 -text = "Starmap" - -[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer"] -margin_left = 483.0 -margin_right = 523.0 -margin_bottom = 40.0 -rect_min_size = Vector2( 40, 40 ) -text = "X" - -[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"] -margin_top = 48.0 -margin_right = 523.0 -margin_bottom = 396.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 - -[node name="TextureRect" type="TextureRect" parent="VBoxContainer/ScrollContainer"] - -[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] -margin_top = 404.0 -margin_right = 523.0 -margin_bottom = 434.0 -alignment = 1 - -[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer2"] -margin_left = 133.0 -margin_right = 213.0 -margin_bottom = 30.0 -rect_min_size = Vector2( 80, 30 ) -text = "Search" - -[node name="Button2" type="Button" parent="VBoxContainer/HBoxContainer2"] -margin_left = 221.0 -margin_right = 301.0 -margin_bottom = 30.0 -rect_min_size = Vector2( 80, 30 ) -text = "Custom" - -[node name="Button3" type="Button" parent="VBoxContainer/HBoxContainer2"] -margin_left = 309.0 -margin_right = 389.0 -margin_bottom = 30.0 -rect_min_size = Vector2( 80, 30 ) -text = "Go" -[connection signal="pressed" from="VBoxContainer/HBoxContainer/Button" to="." method="hide"]