From dd87036a4ac88326607b822825d82513655a7889 Mon Sep 17 00:00:00 2001 From: darioGerussi Date: Sun, 10 Apr 2022 13:11:30 -0500 Subject: [PATCH] Multiplayer updates --- .../Multiplayer/screens/JoinRoom.tscn | 29 +++++++++++++++++-- .../Multiplayer/screens/Multiplayer.tscn | 11 +++++++ .../Multiplayer/screens/NewRoom.tscn | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/JoinRoom.tscn b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/JoinRoom.tscn index 8636f46..a5c93e5 100644 --- a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/JoinRoom.tscn +++ b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/JoinRoom.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://assets/ui_controlNode_dark_theme.tres" type="Theme" id=1] [ext_resource path="res://assets/liberation_serif_40pt.tres" type="DynamicFont" id=2] [ext_resource path="res://UserInterface/Title.tscn" type="PackedScene" id=3] +[ext_resource path="res://UserInterface/But_ChangeScene.tscn" type="PackedScene" id=4] [sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 0.909804, 0.898039, 0.898039, 1 ) +bg_color = Color( 0.901961, 0.898039, 0.862745, 1 ) corner_radius_top_left = 3 corner_radius_top_right = 3 corner_radius_bottom_right = 3 @@ -50,3 +51,27 @@ rect_min_size = Vector2( 500, 250 ) size_flags_horizontal = 3 size_flags_vertical = 3 custom_styles/panel = SubResource( 1 ) + +[node name="VBoxContainer" type="VBoxContainer" parent="Background"] +margin_left = 393.0 +margin_top = 422.0 +margin_right = 631.0 +margin_bottom = 462.0 +rect_min_size = Vector2( 0, 51 ) + +[node name="But_Multiplayer" parent="Background/VBoxContainer" instance=ExtResource( 4 )] +margin_right = 238.0 +margin_bottom = 51.0 +text = "Go Back" +next_scene_path = "res://Screens/Multiplayer.tscn" + +[node name="Version" type="Label" parent="Background"] +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -177.0 +margin_top = -44.0 +margin_right = -5.0 +margin_bottom = -6.0 +text = "Version: 0.0.0" diff --git a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/Multiplayer.tscn b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/Multiplayer.tscn index 39ac874..dcf6c4f 100644 --- a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/Multiplayer.tscn +++ b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/Multiplayer.tscn @@ -54,3 +54,14 @@ margin_bottom = 152.0 theme = ExtResource( 5 ) text = "Back to Menu" next_scene_path = "res://Screens/MenuScreen.tscn" + +[node name="Version" type="Label" parent="."] +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -177.0 +margin_top = -44.0 +margin_right = -5.0 +margin_bottom = -6.0 +text = "Version: 0.0.0" diff --git a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn index 01f6f94..94d6db4 100644 --- a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn +++ b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn @@ -13,7 +13,7 @@ margin_right = 1024.0 margin_bottom = 600.0 theme = ExtResource( 3 ) -[node name="Title" parent="." instance=ExtResource( 2 )] +[node name="Title" parent="Background" instance=ExtResource( 2 )] margin_top = 51.8676 margin_bottom = 117.868 theme = null