Skip to content

Commit

Permalink
Increased spacing between buttons. Made font resources to unify futur…
Browse files Browse the repository at this point in the history
…e changes in font size.
  • Loading branch information
ra314 committed Sep 1, 2021
1 parent 057d2f4 commit a3dd437
Show file tree
Hide file tree
Showing 12 changed files with 151 additions and 132 deletions.
7 changes: 7 additions & 0 deletions Assets/Fonts/Font_100.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://Assets/Montserrat-Regular.ttf" type="DynamicFontData" id=1]

[resource]
size = 100
font_data = ExtResource( 1 )
7 changes: 7 additions & 0 deletions Assets/Fonts/Font_200.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://Assets/Montserrat-Regular.ttf" type="DynamicFontData" id=1]

[resource]
size = 200
font_data = ExtResource( 1 )
File renamed without changes.
2 changes: 1 addition & 1 deletion Scenes/Levels/Level Components/Player.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[ext_resource path="res://Assets/label_background.tres" type="StyleBox" id=3]

[sub_resource type="DynamicFont" id=1]
size = 25
size = 50
font_data = ExtResource( 2 )

[node name="Player" type="Node2D"]
Expand Down
63 changes: 39 additions & 24 deletions Scenes/Levels/Level Main.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=16 format=2]
[gd_scene load_steps=17 format=2]

[ext_resource path="res://Assets/Our World.png" type="Texture" id=1]
[ext_resource path="res://Scripts/Levels/Level Main.gd" type="Script" id=2]
Expand All @@ -7,7 +7,7 @@
[ext_resource path="res://Assets/No Mans Land.png" type="Texture" id=5]
[ext_resource path="res://Scenes/Levels/Level Components/Player.tscn" type="PackedScene" id=6]
[ext_resource path="res://Assets/Montserrat-Regular.ttf" type="DynamicFontData" id=7]
[ext_resource path="res://Assets/new_dynamicfont.tres" type="DynamicFont" id=8]
[ext_resource path="res://Assets/Fonts/Font_50.tres" type="DynamicFont" id=8]
[ext_resource path="res://Assets/zoom-out-line.svg" type="Texture" id=9]
[ext_resource path="res://Assets/zoom-in-line.svg" type="Texture" id=10]
[ext_resource path="res://Assets/expand-arrow.svg" type="Texture" id=11]
Expand All @@ -16,10 +16,15 @@
[ext_resource path="res://Assets/Parallax Background.png" type="Texture" id=14]

[sub_resource type="DynamicFont" id=1]
size = 25
size = 50
font_data = ExtResource( 7 )

[sub_resource type="DynamicFont" id=2]
size = 50
font_data = ExtResource( 7 )

[node name="Level 1" type="Node2D"]
position = Vector2( 122.348, 0 )
script = ExtResource( 2 )

[node name="CanvasLayer" type="CanvasLayer" parent="."]
Expand All @@ -35,14 +40,18 @@ __meta__ = {
}

[node name="Player Red" parent="CanvasLayer" instance=ExtResource( 6 )]
position = Vector2( 0, 300 )
position = Vector2( 0, 251 )

[node name="Player Blue" parent="CanvasLayer" instance=ExtResource( 6 )]
position = Vector2( 0, 450 )
position = Vector2( 0, 513 )

[node name="End Attack" type="Button" parent="CanvasLayer"]
visible = false
margin_right = 125.0
anchor_left = 0.0637231
anchor_right = 0.149661
anchor_bottom = 0.0351852
margin_left = -0.348328
margin_right = 124.652
margin_bottom = 30.0
custom_fonts/font = ExtResource( 8 )
text = "End Attack"
Expand All @@ -52,61 +61,67 @@ __meta__ = {

[node name="End Reinforcement" type="Button" parent="CanvasLayer"]
visible = false
margin_left = 290.0
margin_right = 792.0
anchor_left = 0.0637231
anchor_right = 0.0637231
margin_left = 289.652
margin_right = 791.652
margin_bottom = 68.0
custom_fonts/font = ExtResource( 8 )
custom_fonts/font = SubResource( 1 )
text = "End Reinforcement"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Reroll Spawn" type="Button" parent="CanvasLayer"]
margin_top = 940.0
margin_right = 341.0
margin_bottom = 1008.0
margin_left = 0.0701532
margin_top = 932.034
margin_right = 341.07
margin_bottom = 1000.03
custom_fonts/font = ExtResource( 8 )
text = "Reroll Spawn"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Start Game" type="Button" parent="CanvasLayer"]
margin_top = 1010.0
margin_right = 298.0
margin_bottom = 1078.0
margin_left = 0.0701532
margin_top = 1012.03
margin_right = 298.07
margin_bottom = 1080.03
custom_fonts/font = ExtResource( 8 )
text = "Start Game"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Play Blue" type="Button" parent="CanvasLayer"]
margin_top = 804.0
margin_right = 464.0
margin_bottom = 872.0
margin_left = 0.0701532
margin_top = 796.034
margin_right = 464.07
margin_bottom = 864.034
custom_fonts/font = ExtResource( 8 )
text = "Host plays as Blue"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Play Red" type="Button" parent="CanvasLayer"]
margin_top = 734.0
margin_right = 449.0
margin_bottom = 802.0
margin_left = 0.0701532
margin_top = 716.034
margin_right = 449.07
margin_bottom = 784.034
custom_fonts/font = ExtResource( 8 )
text = "Host plays as Red"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Player and Round Tracker" type="Label" parent="CanvasLayer"]
margin_top = 200.0
margin_top = 119.0
margin_right = 40.0
margin_bottom = 221.0
margin_bottom = 181.0
custom_styles/normal = ExtResource( 13 )
custom_fonts/font = SubResource( 1 )
custom_fonts/font = SubResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}
Expand Down
29 changes: 14 additions & 15 deletions Scenes/UI/Help Menu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

[ext_resource path="res://Assets/Montserrat-Regular.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://Scripts/UI/Help Menu.gd" type="Script" id=2]
[ext_resource path="res://Assets/new_dynamicfont.tres" type="DynamicFont" id=3]
[ext_resource path="res://Assets/Fonts/Font_50.tres" type="DynamicFont" id=3]

[sub_resource type="DynamicFont" id=1]
size = 100
size = 200
font_data = ExtResource( 1 )

[sub_resource type="DynamicFont" id=2]
size = 20
size = 25
font_data = ExtResource( 1 )

[node name="Menu1" type="Control"]
Expand All @@ -28,26 +28,25 @@ __meta__ = {
}

[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
margin_left = 302.0
margin_top = 144.0
margin_right = 1617.0
margin_bottom = 935.0
margin_left = 41.0
margin_top = 14.0
margin_right = 1879.0
margin_bottom = 1065.0

[node name="CenterContainer" type="CenterContainer" parent="CenterContainer/VBoxContainer"]
margin_right = 1315.0
margin_bottom = 123.0
margin_right = 1838.0
margin_bottom = 245.0

[node name="Label" type="Label" parent="CenterContainer/VBoxContainer/CenterContainer"]
margin_left = 198.0
margin_right = 1117.0
margin_bottom = 123.0
margin_right = 1838.0
margin_bottom = 245.0
custom_fonts/font = SubResource( 1 )
text = "Deterministic Risk"

[node name="Label2" type="Label" parent="CenterContainer/VBoxContainer"]
margin_top = 127.0
margin_right = 1315.0
margin_bottom = 791.0
margin_top = 249.0
margin_right = 1838.0
margin_bottom = 1051.0
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Rules:
Expand Down
26 changes: 13 additions & 13 deletions Scenes/UI/Host Guest.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[ext_resource path="res://Scenes/UI/Menu Item.tscn" type="PackedScene" id=3]

[sub_resource type="DynamicFont" id=1]
size = 100
size = 200
font_data = ExtResource( 1 )

[node name="Menu1" type="Control"]
Expand All @@ -20,32 +20,32 @@ margin_right = 1920.0
margin_bottom = 1080.0

[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
margin_left = 500.0
margin_top = 404.0
margin_right = 1419.0
margin_bottom = 675.0
margin_left = 41.0
margin_top = 282.0
margin_right = 1879.0
margin_bottom = 797.0
script = ExtResource( 2 )

[node name="Label" type="Label" parent="CenterContainer/VBoxContainer"]
margin_right = 919.0
margin_bottom = 123.0
margin_right = 1838.0
margin_bottom = 245.0
custom_fonts/font = SubResource( 1 )
text = "Deterministic Risk"

[node name="Host" parent="CenterContainer/VBoxContainer" instance=ExtResource( 3 )]
anchor_left = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 127.0
margin_right = 919.0
margin_bottom = 197.0
margin_top = 249.0
margin_right = 1838.0
margin_bottom = 380.0
item_name = "Host"

[node name="Guest" parent="CenterContainer/VBoxContainer" instance=ExtResource( 3 )]
anchor_left = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 201.0
margin_right = 919.0
margin_bottom = 271.0
margin_top = 384.0
margin_right = 1838.0
margin_bottom = 515.0
item_name = "Guest"
30 changes: 15 additions & 15 deletions Scenes/UI/IP Select.tscn
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[gd_scene load_steps=6 format=2]

[ext_resource path="res://Assets/new_dynamicfont.tres" type="DynamicFont" id=1]
[ext_resource path="res://Assets/Fonts/Font_100.tres" type="DynamicFont" id=1]
[ext_resource path="res://Scripts/UI/IP Select.gd" type="Script" id=2]
[ext_resource path="res://Scenes/UI/Menu Item.tscn" type="PackedScene" id=3]
[ext_resource path="res://Assets/Montserrat-Regular.ttf" type="DynamicFontData" id=4]

[sub_resource type="DynamicFont" id=1]
size = 100
size = 200
font_data = ExtResource( 4 )

[node name="Menu1" type="Control"]
Expand All @@ -24,31 +24,31 @@ __meta__ = {
}

[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
margin_left = 500.0
margin_top = 409.0
margin_right = 1419.0
margin_bottom = 670.0
margin_left = 41.0
margin_top = 280.0
margin_right = 1879.0
margin_bottom = 799.0
script = ExtResource( 2 )

[node name="Label" type="Label" parent="CenterContainer/VBoxContainer"]
margin_right = 919.0
margin_bottom = 123.0
margin_right = 1838.0
margin_bottom = 245.0
custom_fonts/font = SubResource( 1 )
text = "Deterministic Risk"

[node name="TextEdit" type="TextEdit" parent="CenterContainer/VBoxContainer"]
margin_top = 127.0
margin_right = 919.0
margin_bottom = 187.0
rect_min_size = Vector2( 0, 60 )
margin_top = 249.0
margin_right = 1838.0
margin_bottom = 384.251
rect_min_size = Vector2( 0, 135.251 )
custom_fonts/font = ExtResource( 1 )
text = "IP: "

[node name="Connect" parent="CenterContainer/VBoxContainer" instance=ExtResource( 3 )]
anchor_left = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 191.0
margin_right = 919.0
margin_bottom = 261.0
margin_top = 388.0
margin_right = 1838.0
margin_bottom = 519.0
item_name = "Connect"
Loading

0 comments on commit a3dd437

Please sign in to comment.