Merge branch 'main' of https://codeberg.org/code-your-friends/gmtk2022

1 files changed, 39 insertions, 26 deletions

diff --git a/godot/scenes/Menu.tscn b/godot/scenes/Menu.tscn
index e77a18d..32fd74a 100644
--- a/godot/scenes/Menu.tscn
+++ b/godot/scenes/Menu.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=23 format=2]
 
 [ext_resource path="res://assets/theme.tres" type="Theme" id=1]
 [ext_resource path="res://scenes/Menu.gd" type="Script" id=2]
@@ -9,6 +9,7 @@
 [ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=7]
 [ext_resource path="res://assets/fonts/theme_smalltext.tres" type="Theme" id=8]
 [ext_resource path="res://assets/fonts/theme_middletext.tres" type="Theme" id=9]
+[ext_resource path="res://assets/fonts/theme_bigtext.tres" type="Theme" id=10]
 
 [sub_resource type="DynamicFont" id=1]
 size = 55
@@ -40,6 +41,23 @@ content_margin_top = 10.0
 content_margin_bottom = 10.0
 bg_color = Color( 0.176471, 0.14902, 0.141176, 1 )
 
+[sub_resource type="DynamicFont" id=11]
+size = 137
+font_data = ExtResource( 7 )
+
+[sub_resource type="StyleBoxFlat" id=7]
+bg_color = Color( 0.160784, 0.133333, 0.133333, 1 )
+
+[sub_resource type="Theme" id=12]
+Button/fonts/font = SubResource( 1 )
+Button/styles/disabled = SubResource( 2 )
+Button/styles/focus = SubResource( 3 )
+Button/styles/hover = SubResource( 4 )
+Button/styles/normal = SubResource( 5 )
+Button/styles/pressed = SubResource( 6 )
+Label/fonts/font = SubResource( 11 )
+Panel/styles/panel = SubResource( 7 )
+
 [sub_resource type="DynamicFontData" id=8]
 font_path = "res://assets/fonts/Roboto-Medium.ttf"
 
@@ -47,9 +65,6 @@ font_path = "res://assets/fonts/Roboto-Medium.ttf"
 size = 23
 font_data = SubResource( 8 )
 
-[sub_resource type="StyleBoxFlat" id=7]
-bg_color = Color( 0.160784, 0.133333, 0.133333, 1 )
-
 [sub_resource type="Theme" id=10]
 Button/fonts/font = SubResource( 1 )
 Button/styles/disabled = SubResource( 2 )
@@ -96,11 +111,11 @@ focus_neighbour_bottom = NodePath("../StartButton")
 text = "Quit"
 
 [node name="Label" type="Label" parent="."]
-margin_left = 584.0
+margin_left = 2.0
 margin_top = 28.0
-margin_right = 1304.0
-margin_bottom = 156.0
-theme = ExtResource( 1 )
+margin_right = 1917.0
+margin_bottom = 166.0
+theme = SubResource( 12 )
 text = "Golf with your Dice"
 align = 1
 valign = 1
@@ -168,24 +183,17 @@ https://freesound.org/s/586538/
 In Game: \"Background Music\" by Migfus20
 https://freesound.org/s/586838/"
 
-[node name="Label2" type="Label" parent="."]
-anchor_left = 0.05
-anchor_top = 0.2
-anchor_right = 0.3
-anchor_bottom = 0.2
-margin_bottom = 51.0
-theme = ExtResource( 9 )
-text = "HOW TO PLAY"
-align = 1
-
 [node name="VBoxContainer2" type="VBoxContainer" parent="."]
 anchor_left = 0.05
 anchor_top = 0.25
 anchor_right = 0.3
 anchor_bottom = 0.7
+margin_top = 89.0
+margin_right = 108.0
+margin_bottom = 78.0
 
 [node name="Control" type="Control" parent="VBoxContainer2"]
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 80.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -206,7 +214,7 @@ valign = 1
 
 [node name="Control2" type="Control" parent="VBoxContainer2"]
 margin_top = 84.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 164.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -229,7 +237,7 @@ autowrap = true
 
 [node name="Control3" type="Control" parent="VBoxContainer2"]
 margin_top = 168.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 248.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -252,13 +260,13 @@ autowrap = true
 
 [node name="Control4" type="Control" parent="VBoxContainer2"]
 margin_top = 252.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 277.0
 rect_min_size = Vector2( 480, 25 )
 
 [node name="Control5" type="Control" parent="VBoxContainer2"]
 margin_top = 281.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 361.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -283,7 +291,7 @@ autowrap = true
 
 [node name="Control6" type="Control" parent="VBoxContainer2"]
 margin_top = 365.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 445.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -313,8 +321,11 @@ anchor_left = 0.05
 anchor_top = 0.2
 anchor_right = 0.3
 anchor_bottom = 0.2
-margin_bottom = 51.0
-theme = ExtResource( 1 )
+margin_left = 109.0
+margin_top = 44.0
+margin_right = 268.0
+margin_bottom = 138.0
+theme = ExtResource( 10 )
 text = "HOW TO PLAY"
 align = 1
 
@@ -323,6 +334,8 @@ anchor_left = 0.05
 anchor_top = 0.25
 anchor_right = 0.3
 anchor_bottom = 0.7
+margin_top = 42.0
+margin_bottom = 54.0
 
 [connection signal="pressed" from="VBoxContainer/StartButton" to="." method="_on_StartButton_pressed"]
 [connection signal="pressed" from="VBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"]