commit 36d731eb75666140a1653868feb9422a844c2a9d from: Riccardo Mazzurco date: Fri Jul 22 22:00:33 2022 UTC better menu commit - 305f494297b7fb2949580a901cabefdeaa67e108 commit + 36d731eb75666140a1653868feb9422a844c2a9d blob - bca1f5dc5a4ec7feb6815e7793b51880fc4edecd blob + 33b11f53452d47c818e25c0f53ee4daa7d2b1f85 --- src/board.tscn +++ src/board.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://assets/board.png" type="Texture" id=1] +[ext_resource path="res://assets/board/board.png" type="Texture" id=1] [ext_resource path="res://src/board.gd" type="Script" id=2] [node name="board" type="Node2D"] blob - c72ef621c66254dfada248a3fc255269ec8d0f09 blob + 2143f63ce160f4be6f912d83a03f254e546dc11c --- src/menu.gd +++ src/menu.gd @@ -1,4 +1,4 @@ -extends Node2D +extends Control const MAX_PLAYERS = 2 @@ -21,7 +21,7 @@ func _on_serverz_click() -> void: func _on_clientz_click() -> void: var peer := NetworkedMultiplayerENet.new() - var err := peer.create_client($ipaddr.text, SERVER_PORT) + var err := peer.create_client($VBoxContainer/HBoxContainer/ipaddr.text, SERVER_PORT) if err != OK: print("WOOOOPS, failed with error ", err) return blob - ab18aceaf201668afaa357d3d9b3221334dc37eb blob + e7e86b5dbcb1536063f9a0746ded7056839bcaa3 --- src/menu.tscn +++ src/menu.tscn @@ -2,43 +2,55 @@ [ext_resource path="res://src/menu.gd" type="Script" id=1] -[node name="menu" type="Node2D"] +[node name="menu" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 script = ExtResource( 1 ) -[node name="serverz" type="Button" parent="."] -margin_left = 503.0 -margin_top = 43.0 -margin_right = 588.0 -margin_bottom = 63.0 +[node name="VBoxContainer" type="VBoxContainer" parent="."] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -42.5 +margin_top = 50.0 +margin_right = 42.5 +margin_bottom = 40.0 +custom_constants/separation = 50 + +[node name="serverz" type="Button" parent="VBoxContainer"] +margin_right = 141.0 +margin_bottom = 20.0 text = "start server" -[node name="label francesco 2" type="Label" parent="."] -margin_left = 508.0 -margin_top = 101.0 -margin_right = 591.0 -margin_bottom = 115.0 +[node name="label francesco 2" type="Label" parent="VBoxContainer"] +margin_top = 70.0 +margin_right = 141.0 +margin_bottom = 84.0 text = "--- oppure ---" -[node name="clientz" type="Button" parent="."] -margin_left = 489.0 -margin_top = 151.0 -margin_right = 613.0 -margin_bottom = 171.0 +[node name="clientz" type="Button" parent="VBoxContainer"] +margin_top = 134.0 +margin_right = 141.0 +margin_bottom = 154.0 text = "connect to server" -[node name="ipaddr" type="LineEdit" parent="."] -margin_left = 450.0 -margin_top = 189.0 -margin_right = 799.0 -margin_bottom = 213.0 -text = "10.0.0.2" +[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] +margin_top = 204.0 +margin_right = 141.0 +margin_bottom = 228.0 -[node name="label francesco" type="Label" parent="."] -margin_left = 367.0 -margin_top = 194.0 -margin_right = 446.0 -margin_bottom = 208.0 +[node name="label francesco" type="Label" parent="VBoxContainer/HBoxContainer"] +margin_top = 5.0 +margin_right = 79.0 +margin_bottom = 19.0 text = "IP ADDRESS:" -[connection signal="button_down" from="serverz" to="." method="_on_serverz_click"] -[connection signal="button_down" from="clientz" to="." method="_on_clientz_click"] +[node name="ipaddr" type="LineEdit" parent="VBoxContainer/HBoxContainer"] +margin_left = 83.0 +margin_right = 141.0 +margin_bottom = 24.0 +text = "10.0.0.2" +caret_blink = true +caret_blink_speed = 0.5 + +[connection signal="button_down" from="VBoxContainer/serverz" to="." method="_on_serverz_click"] +[connection signal="button_down" from="VBoxContainer/clientz" to="." method="_on_clientz_click"]