Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper

HUD.tscn

@@ -1,16 +1,9 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://SlapGauge.gd" type="Script" id=1]
-[ext_resource path="res://Title Timer.gd" type="Script" id=2]
+[ext_resource path="res://Start.gd" type="Script" id=2]
 [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=3]
 
-[sub_resource type="DynamicFont" id=7]
-size = 88
-outline_size = 5
-outline_color = Color( 0, 0, 0, 1 )
-use_filter = true
-font_data = ExtResource( 3 )
-
 [sub_resource type="DynamicFont" id=4]
 size = 19
 outline_size = 2
@@ -22,17 +15,6 @@ font_data = ExtResource( 3 )
 [sub_resource type="Theme" id=8]
 default_font = SubResource( 4 )
 
-[sub_resource type="DynamicFont" id=9]
-size = 19
-outline_size = 2
-outline_color = Color( 0, 0, 0, 1 )
-use_mipmaps = true
-use_filter = true
-font_data = ExtResource( 3 )
-
-[sub_resource type="Theme" id=10]
-default_font = SubResource( 9 )
-
 [sub_resource type="Shader" id=6]
 code = "shader_type canvas_item;
 render_mode unshaded;
@@ -69,40 +51,20 @@ shader_param/kill = null
 shader_param/bkgcol = Plane( 0, 0, 0, 0.3 )
 shader_param/kilcol = Plane( 0.5, 0, 0, 0.3 )
 
+[sub_resource type="DynamicFont" id=12]
+size = 33
+use_filter = true
+font_data = ExtResource( 3 )
+
+[sub_resource type="DynamicFont" id=7]
+size = 88
+outline_size = 5
+outline_color = Color( 0, 0, 0, 1 )
+use_filter = true
+font_data = ExtResource( 3 )
+
 [node name="HUD" type="CanvasLayer"]
-
-[node name="Start" type="Control" parent="."]
-visible = false
-margin_right = 40.0
-margin_bottom = 40.0
-
-[node name="Title" type="Label" parent="Start"]
-anchor_left = 12.9
-anchor_top = 7.625
-anchor_right = 12.9
-anchor_bottom = 7.625
-margin_left = -439.0
-margin_top = -54.0
-margin_right = 443.0
-margin_bottom = 48.0
-custom_fonts/font = SubResource( 7 )
-text = "FIRST PERSON SLAPPER"
-
-[node name="Title Timer" type="Timer" parent="Start"]
-one_shot = true
-script = ExtResource( 2 )
-
-[node name="New Game" type="Button" parent="Start"]
-anchor_left = 12.85
-anchor_top = 10.525
-anchor_right = 12.85
-anchor_bottom = 10.525
-margin_left = -67.0
-margin_top = -20.0
-margin_right = 70.0
-margin_bottom = 16.0
-theme = SubResource( 8 )
-text = "New Game"
+follow_viewport_enable = true
 
 [node name="ActualHUD" type="Control" parent="."]
 anchor_left = 0.037
@@ -111,7 +73,7 @@ anchor_right = 0.037
 anchor_bottom = 0.916
 margin_right = 40.0
 margin_bottom = 40.0
-theme = SubResource( 10 )
+theme = SubResource( 8 )
 
 [node name="SlapGauge" type="ColorRect" parent="ActualHUD"]
 material = SubResource( 11 )
@@ -130,3 +92,50 @@ margin_top = -169.452
 margin_right = -3572.2
 margin_bottom = -137.452
 text = "Slap"
+
+[node name="Start" type="Control" parent="."]
+pause_mode = 2
+margin_right = 40.0
+margin_bottom = 40.0
+theme = SubResource( 8 )
+script = ExtResource( 2 )
+
+[node name="Background" type="ColorRect" parent="Start"]
+margin_left = -4.0
+margin_top = -8.0
+margin_right = 1927.0
+margin_bottom = 1085.0
+color = Color( 0.14902, 0.121569, 0.121569, 1 )
+
+[node name="Title" type="Label" parent="Start"]
+margin_left = 532.0
+margin_top = 353.0
+margin_right = 1414.0
+margin_bottom = 455.0
+custom_fonts/font = SubResource( 7 )
+text = "FIRST PERSON SLAPPER"
+
+[node name="New Game" type="Button" parent="Start"]
+margin_left = 886.0
+margin_top = 554.0
+margin_right = 1061.0
+margin_bottom = 598.0
+text = "New Game"
+
+[node name="Quit to Desktop" type="Button" parent="Start"]
+margin_left = 887.0
+margin_top = 664.0
+margin_right = 1062.0
+margin_bottom = 708.0
+text = "Quit to Desktop"
+
+[node name="Quit Game" type="Button" parent="Start"]
+margin_left = 887.0
+margin_top = 609.0
+margin_right = 1062.0
+margin_bottom = 653.0
+text = "Quit Game"
+
+[connection signal="pressed" from="Start/New Game" to="Start" method="_on_New_Game_pressed"]
+[connection signal="pressed" from="Start/Quit to Desktop" to="Start" method="_on_Quit_to_Desktop_Button_pressed"]
+[connection signal="pressed" from="Start/Quit Game" to="Start" method="_on_Quit_Game_pressed"]