kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2026-03-22 00:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into loading-screen-implementation

Browse Source
This commit is contained in:
Alan Alexander Cerna
2021-11-18 13:40:51 +02:00
parent eb75c31c20 61c213d188
commit 1e78e16b8a
27 changed files with 906 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/scenes/GUI/main_menu.tscn
View File

@@ -54,11 +54,12 @@ margin_left = -150.0
margin_top = -36.0
margin_right = 150.0
margin_bottom = 36.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 )
text = "PLAY"
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "playground"
align = 1
valign = 1
uppercase = true
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": false
@@ -79,8 +80,8 @@ margin_left = -98.8223
margin_top = -36.0
margin_right = 134.178
margin_bottom = 36.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "LAN Party"
align = 1
valign = 1
@@ -111,8 +112,8 @@ margin_left = -150.0
margin_top = -36.0
margin_right = 150.0
margin_bottom = 36.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "EXIT"
align = 1
valign = 1

4
source/scenes/GUI/network_setup.tscn
View File

@@ -172,14 +172,14 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="enter_server_ip" type="Sprite" parent="multiplayer_configure/popup_screen"]
[node name="enter_username" type="Sprite" parent="multiplayer_configure/popup_screen"]
position = Vector2( 960, 465 )
texture = ExtResource( 14 )
__meta__ = {
"_edit_lock_": true
}
[node name="Label" type="Label" parent="multiplayer_configure/popup_screen/enter_server_ip"]
[node name="Label" type="Label" parent="multiplayer_configure/popup_screen/enter_username"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = -225.0

22
source/scenes/GUI/singleplayer_setup.tscn
View File

@@ -12,23 +12,23 @@ use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=2]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="DynamicFont" id=4]
size = 36
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=2]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="DynamicFont" id=5]
size = 36
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[node name="network_setup2" type="Control"]
[node name="singleplayer_setup" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
@@ -47,22 +47,22 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="enter_server_ip" type="Sprite" parent="popup_screen"]
[node name="enter_username" type="Sprite" parent="popup_screen"]
position = Vector2( 960, 465 )
texture = ExtResource( 3 )
__meta__ = {
"_edit_lock_": true
}
[node name="Label" type="Label" parent="popup_screen/enter_server_ip"]
[node name="Label" type="Label" parent="popup_screen/enter_username"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = -225.0
margin_top = -25.0
margin_right = -225.0
margin_bottom = -25.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Enter your username"
align = 1
valign = 1
@@ -93,10 +93,10 @@ margin_left = -175.0
margin_top = -28.0
margin_right = 175.0
margin_bottom = 28.0
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
custom_fonts/font = SubResource( 4 )
custom_styles/focus = SubResource( 2 )
custom_styles/normal = SubResource( 3 )
custom_fonts/font = SubResource( 4 )
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
align = 1
placeholder_text = "username"
__meta__ = {
@@ -117,8 +117,8 @@ margin_bottom = 97.0
[node name="Label" type="Label" parent="popup_screen/panel/confirm"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "CONFIRM"
align = 1
valign = 1