Merge branch 'feat/settings'
This commit is contained in:
commit
7374d8f3ca
22 files changed
+339
-51
No files matched your search
+3
-25
@@ -1,10 +1,9 @@
|
||||
[gd_scene load_steps=12 format=3 uid="uid://bg4fa11htun38"]
|
||||
[gd_scene load_steps=11 format=3 uid="uid://bg4fa11htun38"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://crsloi4abxhqh" path="res://Scripts/LoadSaveFIle.cs" id="1_df05h"]
|
||||
[ext_resource type="Script" uid="uid://cyo278cd6hfm" path="res://Scripts/FirstLoad.cs" id="1_ghw46"]
|
||||
[ext_resource type="FontFile" uid="uid://dq7nkk7n7wrq4" path="res://Fonts/Lexend.ttf" id="1_tt5f1"]
|
||||
[ext_resource type="Script" uid="uid://bc4miccifwrk0" path="res://Scripts/SceneSwitcher.cs" id="2_8saeu"]
|
||||
[ext_resource type="AudioStream" uid="uid://6v4630hrkeg6" path="res://Audio/Music/Menu.mp3" id="2_853f1"]
|
||||
[ext_resource type="Script" uid="uid://c61hc1raouekv" path="res://Scripts/VersionChecker.cs" id="3_ghw46"]
|
||||
|
||||
[sub_resource type="LabelSettings" id="LabelSettings_tt5f1"]
|
||||
font = ExtResource("1_tt5f1")
|
||||
@@ -52,7 +51,7 @@ anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
script = ExtResource("1_df05h")
|
||||
script = ExtResource("1_ghw46")
|
||||
|
||||
[node name="Center" type="Control" parent="."]
|
||||
layout_mode = 1
|
||||
@@ -183,30 +182,10 @@ theme_override_styles/normal = SubResource("StyleBoxFlat_tt5f1")
|
||||
theme_override_styles/pressed = SubResource("StyleBoxFlat_8saeu")
|
||||
theme_override_styles/hover = SubResource("StyleBoxFlat_df05h")
|
||||
theme_override_styles/disabled = SubResource("StyleBoxFlat_8um5k")
|
||||
disabled = true
|
||||
text = "Settings"
|
||||
script = ExtResource("2_8saeu")
|
||||
ScenePath = "res://Scenes/Settings.tscn"
|
||||
|
||||
[node name="Label" type="Label" parent="Center/Buttons/HBoxContainer/Settings"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 7
|
||||
anchor_left = 0.5
|
||||
anchor_top = 1.0
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 1.0
|
||||
offset_left = -250.0
|
||||
offset_top = -57.0
|
||||
offset_right = 250.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 0
|
||||
theme_override_colors/font_color = Color(1, 0.9609375, 0, 1)
|
||||
theme_override_fonts/font = ExtResource("1_tt5f1")
|
||||
theme_override_font_sizes/font_size = 35
|
||||
text = "Coming Soon!"
|
||||
horizontal_alignment = 1
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="VersionText" type="Control" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 1
|
||||
@@ -215,7 +194,6 @@ anchor_right = 1.0
|
||||
offset_left = -40.0
|
||||
offset_bottom = 40.0
|
||||
grow_horizontal = 0
|
||||
script = ExtResource("3_ghw46")
|
||||
|
||||
[node name="Version" type="Label" parent="VersionText"]
|
||||
layout_mode = 0
|
||||
|
||||
+143
-2
@@ -1,7 +1,10 @@
|
||||
[gd_scene load_steps=6 format=3 uid="uid://ctb5p8ymhcshq"]
|
||||
[gd_scene load_steps=9 format=3 uid="uid://ctb5p8ymhcshq"]
|
||||
|
||||
[ext_resource type="FontFile" uid="uid://dq7nkk7n7wrq4" path="res://Fonts/Lexend.ttf" id="1_flfri"]
|
||||
[ext_resource type="Script" uid="uid://bc4miccifwrk0" path="res://Scripts/SceneSwitcher.cs" id="2_yrknh"]
|
||||
[ext_resource type="Script" uid="uid://jpjswk46hc64" path="res://Scripts/SettingsContainer.cs" id="3_mjqtt"]
|
||||
[ext_resource type="Texture2D" uid="uid://c0gvup8f48soq" path="res://Textures/MenuIcons/square-check-solid-full-recolored.svg" id="3_w1nw0"]
|
||||
[ext_resource type="Texture2D" uid="uid://uph0cthbcrxs" path="res://Textures/MenuIcons/square-solid-full.svg" id="4_mjqtt"]
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_w1nw0"]
|
||||
bg_color = Color(1, 1, 1, 1)
|
||||
@@ -24,7 +27,7 @@ anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
|
||||
[node name="Play" type="Button" parent="."]
|
||||
[node name="Back" type="Button" parent="."]
|
||||
layout_mode = 1
|
||||
offset_left = 40.0
|
||||
offset_top = 40.0
|
||||
@@ -44,3 +47,141 @@ theme_override_styles/hover = SubResource("StyleBoxFlat_ppjuv")
|
||||
text = "Back"
|
||||
script = ExtResource("2_yrknh")
|
||||
ScenePath = "res://Scenes/MainMenu.tscn"
|
||||
|
||||
[node name="SettingsContainer" type="VBoxContainer" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 8
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
offset_left = -20.0
|
||||
offset_top = -20.0
|
||||
offset_right = -20.0
|
||||
offset_bottom = 20.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
theme_override_constants/separation = 179
|
||||
alignment = 1
|
||||
script = ExtResource("3_mjqtt")
|
||||
|
||||
[node name="Fullscreen" type="Control" parent="SettingsContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="CheckBox" type="CheckBox" parent="SettingsContainer/Fullscreen"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 6
|
||||
anchor_left = 1.0
|
||||
anchor_top = 0.5
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 0.5
|
||||
offset_left = -219.0
|
||||
offset_top = -63.0
|
||||
offset_right = -91.0
|
||||
offset_bottom = 65.0
|
||||
grow_horizontal = 0
|
||||
grow_vertical = 2
|
||||
theme_override_constants/icon_max_width = 120
|
||||
theme_override_icons/checked = ExtResource("3_w1nw0")
|
||||
theme_override_icons/unchecked = ExtResource("4_mjqtt")
|
||||
icon_alignment = 1
|
||||
|
||||
[node name="Label" type="Label" parent="SettingsContainer/Fullscreen"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 8
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
offset_left = -59.5
|
||||
offset_top = -47.5
|
||||
offset_right = 309.5
|
||||
offset_bottom = 47.5
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
theme_override_fonts/font = ExtResource("1_flfri")
|
||||
theme_override_font_sizes/font_size = 76
|
||||
text = "Fullscreen"
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="VSync" type="Control" parent="SettingsContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="CheckBox" type="CheckBox" parent="SettingsContainer/VSync"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 6
|
||||
anchor_left = 1.0
|
||||
anchor_top = 0.5
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 0.5
|
||||
offset_left = -219.0
|
||||
offset_top = -63.0
|
||||
offset_right = -91.0
|
||||
offset_bottom = 65.0
|
||||
grow_horizontal = 0
|
||||
grow_vertical = 2
|
||||
theme_override_constants/icon_max_width = 120
|
||||
theme_override_icons/checked = ExtResource("3_w1nw0")
|
||||
theme_override_icons/unchecked = ExtResource("4_mjqtt")
|
||||
icon_alignment = 1
|
||||
|
||||
[node name="Label" type="Label" parent="SettingsContainer/VSync"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 8
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
offset_left = -59.5
|
||||
offset_top = -47.5
|
||||
offset_right = 309.5
|
||||
offset_bottom = 47.5
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
theme_override_fonts/font = ExtResource("1_flfri")
|
||||
theme_override_font_sizes/font_size = 76
|
||||
text = "Vsync"
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="ShowFPS" type="Control" parent="SettingsContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="CheckBox" type="CheckBox" parent="SettingsContainer/ShowFPS"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 6
|
||||
anchor_left = 1.0
|
||||
anchor_top = 0.5
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 0.5
|
||||
offset_left = -219.0
|
||||
offset_top = -63.0
|
||||
offset_right = -91.0
|
||||
offset_bottom = 65.0
|
||||
grow_horizontal = 0
|
||||
grow_vertical = 2
|
||||
theme_override_constants/icon_max_width = 120
|
||||
theme_override_icons/checked = ExtResource("3_w1nw0")
|
||||
theme_override_icons/unchecked = ExtResource("4_mjqtt")
|
||||
icon_alignment = 1
|
||||
|
||||
[node name="Label" type="Label" parent="SettingsContainer/ShowFPS"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 8
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
offset_left = -59.5
|
||||
offset_top = -47.5
|
||||
offset_right = 309.5
|
||||
offset_bottom = 47.5
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
theme_override_fonts/font = ExtResource("1_flfri")
|
||||
theme_override_font_sizes/font_size = 76
|
||||
text = "Show FPS"
|
||||
vertical_alignment = 1
|
||||
|
||||
[connection signal="toggled" from="SettingsContainer/Fullscreen/CheckBox" to="SettingsContainer" method="Fullscreen_Toggled"]
|
||||
[connection signal="toggled" from="SettingsContainer/VSync/CheckBox" to="SettingsContainer" method="VSync_Toggled"]
|
||||
[connection signal="toggled" from="SettingsContainer/ShowFPS/CheckBox" to="SettingsContainer" method="ShowFPS_Toggled"]
|
||||
Reference in new issue
Block a user