diff --git a/Phase2/Godot ===(Game Code)===/Multiplayer/assets/sbf_white.tres b/Phase2/Godot ===(Game Code)===/Multiplayer/assets/sbf_white.tres index 41e0cea..f500b78 100644 --- a/Phase2/Godot ===(Game Code)===/Multiplayer/assets/sbf_white.tres +++ b/Phase2/Godot ===(Game Code)===/Multiplayer/assets/sbf_white.tres @@ -2,6 +2,7 @@ [resource] bg_color = Color( 1, 1, 1, 1 ) +draw_center = false border_width_left = 1 border_width_top = 1 border_width_right = 1 diff --git a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/JoinRoom.tscn b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/JoinRoom.tscn index 8b29b5c..8636f46 100644 --- a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/JoinRoom.tscn +++ b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/JoinRoom.tscn @@ -1,21 +1,52 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 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] +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 0.909804, 0.898039, 0.898039, 1 ) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 1 + [node name="Control" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -[node name="Panel" type="Panel" parent="."] +[node name="Background" type="Panel" parent="."] margin_right = 1024.0 margin_bottom = 600.0 theme = ExtResource( 1 ) -[node name="Title" parent="." instance=ExtResource( 3 )] +[node name="Title" parent="Background" instance=ExtResource( 3 )] margin_top = 51.8676 margin_bottom = 117.868 theme = null custom_fonts/font = ExtResource( 2 ) text = "Join Room" + +[node name="MarginContainer" type="MarginContainer" parent="Background"] +margin_left = 270.0 +margin_top = 150.0 +margin_right = 270.0 +margin_bottom = 150.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer"] +margin_right = 500.0 +margin_bottom = 250.0 +rect_min_size = Vector2( 500, 250 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="PanelContainer" type="PanelContainer" parent="Background/MarginContainer/ScrollContainer"] +margin_right = 500.0 +margin_bottom = 250.0 +rect_min_size = Vector2( 500, 250 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_styles/panel = SubResource( 1 ) diff --git a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn index ae0998c..01f6f94 100644 --- a/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn +++ b/Phase2/Godot ===(Game Code)===/Multiplayer/screens/NewRoom.tscn @@ -8,7 +8,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 -[node name="Panel" type="Panel" parent="."] +[node name="Background" type="Panel" parent="."] margin_right = 1024.0 margin_bottom = 600.0 theme = ExtResource( 3 )