From 79f6f4350278a0bd4438af8c9501b161b4152c52 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 16:54:04 +0200 Subject: [PATCH] Fixing up all the stuff about UI --- .../Start Menu Old/Easter Egg/Egg 1.png | Bin 522 -> 0 bytes .../Easter Egg/Egg 1.png.import | 34 -- .../Start Menu Old/Easter Egg/Egg 2.png | Bin 470 -> 0 bytes .../Easter Egg/Egg 2.png.import | 34 -- .../Start Menu Old/Easter Egg/Egg 3.png | Bin 445 -> 0 bytes .../Easter Egg/Egg 3.png.import | 34 -- .../Start Menu Old/Easter Egg/Shadow.png | Bin 145 -> 0 bytes Assets/Sprites/{GUI => UI}/Heart.png | Bin Assets/Sprites/{GUI => UI}/Heart.png.import | 6 +- Assets/Sprites/UI/Shadow.png | Bin 0 -> 184 bytes .../Easter Egg => UI}/Shadow.png.import | 6 +- Assets/UI/Theme.tres | 8 +- Prefabs/Settings Menu.tscn | 369 ++++++++++-------- Scenes/Main Menu.tscn | 254 +++++------- Scripts/SaveSystem/GlobalSettings.gd | 1 + Scripts/UI/MainMenuManager.gd | 1 + Scripts/UI/SettingsMenu.gd | 3 +- project.godot | 6 +- 18 files changed, 325 insertions(+), 431 deletions(-) delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png rename Assets/Sprites/{GUI => UI}/Heart.png (100%) rename Assets/Sprites/{GUI => UI}/Heart.png.import (72%) create mode 100644 Assets/Sprites/UI/Shadow.png rename Assets/Sprites/{Start Menu Old/Easter Egg => UI}/Shadow.png.import (70%) diff --git a/Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png b/Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png deleted file mode 100644 index 3943e7e2ca7f25652058713ff2e34c39689b93f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 522 zcmV+l0`>igP)Px$#7RU!R9Hvdm%U2FKoo^DzJtDo7J}Q0m5VmkHZE2+vWOt4VFkfLY^?lgtZn?O ze1R1d^fi2ltW3fgW>4nM&zdD-y4_6Xe)pU^Cq!k5*VgLc$oI(Y%ZWs)U39u-Na=Y!dYJXT!1BmTV1LW)TV~qL3ml)MNBNGGIox1>H zhxAtfT$ru$DZ#T)vw$~qW&TtFhMP-

y|E^VH>iqY5wpdzu2^3ng&|YycFul}H&v zy>{WOGbYgI{?L64u?l%Gi52$n0TcjS81=*?i~(>36^53(ZyZ31Tsv@V`I7-c$8l-^ zJPWbW%s{X}>RgPx$kV!;AR9Hu2WFQeFd)NNQr)BQeW=2wsBuO#I-~n?0%;G6)s_=R+C!`H5Pi#mK z9Re^1%-Pa}*8wR$b<}kLu@E8WK1|VAKHv76R0=nAo&{kp>7k z0F=E5l?B)e3S8NeBnQ9@0a-w*BPezN%zy@eeTIgO7r~w+#SsJ@01NtAn;IAx85zMC z29PZWiSatHG87k{A;}T{{`~{1PxEU)DXQVN5US-sK8FF213&Tu($`AfXflc(e?1~XAIAf?EvJ2 z2eSm5BS1F7qKj${fVmnu)#Gvma#|tF0k~Ql*s>hDBR(JajgnUIwOnu}LQ?WJ$O2?X zz#M?DoIo!RNGb_&`G}Z8ieNzmGn`OeK*$leN=TYJ02Up%qL3~Qz?bNVb^xVOf$j)G zt>eMlCPWVj7@tr!MX!Vi^^l0}7YvvK(BqU)wN1#!=;jd&0a`l%0ObHQFzTo}vH$=8 M07*qoM6N<$f>rFaQ2+n{ diff --git a/Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png.import b/Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png.import deleted file mode 100644 index 9d1176b..0000000 --- a/Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c3yg6u8yncau3" -path="res://.godot/imported/Egg 2.png-af579f6c406ae3454de989d8d70067ac.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" -dest_files=["res://.godot/imported/Egg 2.png-af579f6c406ae3454de989d8d70067ac.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png b/Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png deleted file mode 100644 index afbbf1453ca0662dffa0ff2b0f1ad43dd979ad81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 445 zcmV;u0Yd(XP)Px$cS%G+R9Hvtm%VKQK@f$Z1xla+61u>W6E}cx=)@vJvULK943QApasy5*K^G)6 z;1b*dXis`*Jj~ys6H9Ox?(WR{c4lsNx7*45CZo5bW%9XObaPy0El!S$0YG^3Ju^4> z^0chyqmc+l001A`xe4(6@ZKyyRG3pmLEH!w1GrW=Hxgw+olXh2%K9B_b$ zfYS?$S%g{&=Uk|<{imAJ>Cl`{4M~{ n%>j6xi#<-YlyE>V=p}EA#*W diff --git a/Assets/Sprites/GUI/Heart.png b/Assets/Sprites/UI/Heart.png similarity index 100% rename from Assets/Sprites/GUI/Heart.png rename to Assets/Sprites/UI/Heart.png diff --git a/Assets/Sprites/GUI/Heart.png.import b/Assets/Sprites/UI/Heart.png.import similarity index 72% rename from Assets/Sprites/GUI/Heart.png.import rename to Assets/Sprites/UI/Heart.png.import index 409bc13..2a5d738 100644 --- a/Assets/Sprites/GUI/Heart.png.import +++ b/Assets/Sprites/UI/Heart.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://7j7ufllfyi0c" -path="res://.godot/imported/Heart.png-ebd7db14ae3fcb705890a9b88bc59e29.ctex" +path="res://.godot/imported/Heart.png-f9bbc38428c117b5a1733171680ae999.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Sprites/GUI/Heart.png" -dest_files=["res://.godot/imported/Heart.png-ebd7db14ae3fcb705890a9b88bc59e29.ctex"] +source_file="res://Assets/Sprites/UI/Heart.png" +dest_files=["res://.godot/imported/Heart.png-f9bbc38428c117b5a1733171680ae999.ctex"] [params] diff --git a/Assets/Sprites/UI/Shadow.png b/Assets/Sprites/UI/Shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..5e1cd223d36718225569cd3f167d0a400ba1b116 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^20$#p!3HD)*8SNCr0P9g978-hlT#Kjs8nD7x7@{^ z=gi$(XFS%$Eiwr@y>JOrl1*FiK?h4I@dHmKc@7?YR#4LLPS7HKgSCw80h>c74j6oq z;b$)1Zf0!67kd0K!(|8Sh9HAijg4&1_QHoPoX-kt9Mv$Acq4Z(a^k|~gUgTe~DWM4fWA{Q* literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png.import b/Assets/Sprites/UI/Shadow.png.import similarity index 70% rename from Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png.import rename to Assets/Sprites/UI/Shadow.png.import index cbbac7a..8ac75d2 100644 --- a/Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png.import +++ b/Assets/Sprites/UI/Shadow.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://tjxkew3m4v8m" -path="res://.godot/imported/Shadow.png-a5365acb462689cb9834499edb8acb8b.ctex" +path="res://.godot/imported/Shadow.png-f1189895bd40fd4a82339bf75c98a455.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" -dest_files=["res://.godot/imported/Shadow.png-a5365acb462689cb9834499edb8acb8b.ctex"] +source_file="res://Assets/Sprites/UI/Shadow.png" +dest_files=["res://.godot/imported/Shadow.png-f1189895bd40fd4a82339bf75c98a455.ctex"] [params] diff --git a/Assets/UI/Theme.tres b/Assets/UI/Theme.tres index bcc0b28..4144fdf 100644 --- a/Assets/UI/Theme.tres +++ b/Assets/UI/Theme.tres @@ -41,7 +41,7 @@ [ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="39_dl1e4"] [ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="40_bmcvq"] -[sub_resource type="Image" id="Image_4kppd"] +[sub_resource type="Image" id="Image_avfxn"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), "format": "RGBA8", @@ -51,7 +51,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_g5bup"] -image = SubResource("Image_4kppd") +image = SubResource("Image_avfxn") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] @@ -137,7 +137,7 @@ HSlider/styles/slider = ExtResource("19_ccnyp") Label/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) Label/colors/font_outline_color = Color(0.745098, 0.760784, 0.721569, 1) Label/colors/font_shadow_color = Color(0.745098, 0.760784, 0.721569, 1) -Label/constants/line_spacing = 3 +Label/constants/line_spacing = 8 Label/constants/outline_size = 0 Label/constants/shadow_offset_x = 0 Label/constants/shadow_offset_y = 4 @@ -177,7 +177,7 @@ ProgressBar/styles/background = ExtResource("23_r3p5f") ProgressBar/styles/fill = ExtResource("24_twflh") TabContainer/colors/font_selected_color = Color(0.941176, 0.964706, 0.909804, 1) TabContainer/colors/font_unselected_color = Color(0.941176, 0.964706, 0.909804, 1) -TabContainer/font_sizes/font_size = 16 +TabContainer/font_sizes/font_size = 48 TabContainer/icons/decrement = ExtResource("25_tp1la") TabContainer/icons/decrement_highlight = ExtResource("26_b6do7") TabContainer/icons/increment = ExtResource("27_apyeg") diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index 2d389da..53a3fc5 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -9,18 +9,18 @@ bg_color = Color(0.439216, 0.631373, 0.537255, 1) [node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "bottom_item_controls_gamepad", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] script = ExtResource("1_2rgd2") -back_button = NodePath("Back Button") -tab_container = NodePath("SettingsTabs") -bottom_item_video = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") -bottom_item_audio = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider") -bottom_item_controls = NodePath("SettingsTabs/Controls/MarginContainer/GridContainer/AttackRemapButton") -bottom_item_controls_gamepad = NodePath("SettingsTabs/Gamepad/MarginContainer/GridContainer/AttackRemapButton") -display_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/DisplayModeOptions") -vsync_toggle = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/VsyncButton") -resolutions_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") -master_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider") -music_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider") -sfx_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider") +back_button = NodePath("Panel/MarginContainer/VBoxContainer/MarginContainer/Back Button") +tab_container = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs") +bottom_item_video = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions") +bottom_item_audio = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider") +bottom_item_controls = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/VBox/MarginContainer/GridContainer/AttackRemapButton") +bottom_item_controls_gamepad = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton") +display_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/DisplayModeOptions") +vsync_toggle = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/VsyncButton") +resolutions_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions") +master_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MasterVolumeSlider") +music_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MusicVolSlider") +sfx_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider") [node name="Remap Controller" type="Control" parent="."] visible = false @@ -40,24 +40,43 @@ grow_horizontal = 2 grow_vertical = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_02uod") -[node name="SettingsTabs" type="TabContainer" parent="."] -custom_minimum_size = Vector2(1050, 475) +[node name="MarginContainer" type="MarginContainer" parent="Panel"] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = 12.0 -offset_top = 12.0 -offset_right = -12.0 -offset_bottom = -109.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_font_sizes/font_size = 29 +theme_override_constants/margin_left = 32 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 32 +theme_override_constants/margin_bottom = 32 -[node name="Video" type="VBoxContainer" parent="SettingsTabs"] +[node name="VBoxContainer" type="VBoxContainer" parent="Panel/MarginContainer"] layout_mode = 2 -focus_neighbor_left = NodePath("../Controls") -[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Video"] +[node name="SettingsTabs" type="TabContainer" parent="Panel/MarginContainer/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 3 +tabs_rearrange_group = 0 + +[node name="Video" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] +layout_mode = 2 +theme_override_constants/margin_left = 4 +theme_override_constants/margin_top = 4 +theme_override_constants/margin_right = 4 +theme_override_constants/margin_bottom = 4 + +[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video"] +layout_mode = 2 + +[node name="VBox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView"] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_left = NodePath("../../../Audio/ScrollView/VBox") + +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox"] +clip_contents = true custom_minimum_size = Vector2(0, 425) layout_mode = 2 theme_override_constants/margin_left = 25 @@ -65,19 +84,22 @@ theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Video/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer"] layout_mode = 2 -columns = 2 +columns = 3 -[node name="DisplayModeLabel" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="DisplayModeLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Display Mode" -vertical_alignment = 1 -[node name="DisplayModeOptions" type="OptionButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 + +[node name="DisplayModeOptions" type="OptionButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +text_overrun_behavior = 1 +clip_text = true item_count = 5 selected = 0 popup/item_0/text = "Full-Screen" @@ -91,286 +113,327 @@ popup/item_3/id = 3 popup/item_4/text = "Exclusive Full-Screen" popup/item_4/id = 4 -[node name="VSync Label" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="VSync Label" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "VSync " -vertical_alignment = 1 -[node name="VsyncButton" type="CheckButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] +[node name="Spacer2" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 + +[node name="VsyncButton" type="CheckButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 text = "Vsync" -[node name="ResolutionsLabel" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="ResolutionsLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Resolutions " -vertical_alignment = 1 -[node name="ResolutionsOptions" type="OptionButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] +[node name="Spacer3" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="ResolutionsOptions" type="OptionButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") fit_to_longest_item = false -[node name="Audio" type="VBoxContainer" parent="SettingsTabs"] +[node name="Audio" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] visible = false layout_mode = 2 +theme_override_constants/margin_left = 4 +theme_override_constants/margin_top = 4 +theme_override_constants/margin_right = 4 +theme_override_constants/margin_bottom = 4 -[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Audio"] -custom_minimum_size = Vector2(0, 425) +[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio"] +layout_mode = 2 + +[node name="VBox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox"] layout_mode = 2 theme_override_constants/margin_left = 25 theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Audio/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer"] layout_mode = 2 columns = 2 -[node name="MasterVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MasterVolLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Master Volume " -vertical_alignment = 1 -[node name="MasterVolumeSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] +[node name="MasterVolumeSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 min_value = -72.0 max_value = 0.0 -[node name="MusicVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MusicVolLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Music Volume " -vertical_alignment = 1 -[node name="MusicVolSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] +[node name="MusicVolSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 min_value = -72.0 max_value = 0.0 -[node name="SFXVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="SFXVolLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "SFX Volume" -vertical_alignment = 1 -[node name="SFXVolSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(500, 40) +[node name="SFXVolSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") min_value = -72.0 max_value = 0.0 -[node name="Controls" type="VBoxContainer" parent="SettingsTabs"] +[node name="Controlls" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] visible = false layout_mode = 2 +theme_override_constants/margin_left = 4 +theme_override_constants/margin_top = 4 +theme_override_constants/margin_right = 4 +theme_override_constants/margin_bottom = 4 -[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Controls"] -custom_minimum_size = Vector2(0, 425) +[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls"] +layout_mode = 2 + +[node name="VBox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox"] layout_mode = 2 theme_override_constants/margin_left = 25 theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Controls/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer"] layout_mode = 2 -columns = 2 +columns = 3 -[node name="MoveUpLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveUpLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Up" -vertical_alignment = 1 -[node name="MoveUpRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveUpRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 script = ExtResource("2_4asaa") input_action_name = "move_up" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveLeftLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveLeftLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Left" -vertical_alignment = 1 -[node name="MoveLeftRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer2" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveLeftRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 script = ExtResource("2_4asaa") input_action_name = "move_left" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveDownLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveDownLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Down" -vertical_alignment = 1 -[node name="MoveDownRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer3" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveDownRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 script = ExtResource("2_4asaa") input_action_name = "move_down" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveRightLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveRightLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move RIght" -vertical_alignment = 1 -[node name="MoveRightRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer4" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="MoveRightRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") script = ExtResource("2_4asaa") input_action_name = "move_right" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="AttackLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="AttackLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Attack " -vertical_alignment = 1 -[node name="AttackRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer5" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="AttackRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") script = ExtResource("2_4asaa") input_action_name = "attack" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="Gamepad" type="VBoxContainer" parent="SettingsTabs"] +[node name="Gamepad" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] visible = false layout_mode = 2 +theme_override_constants/margin_left = 4 +theme_override_constants/margin_top = 4 +theme_override_constants/margin_right = 4 +theme_override_constants/margin_bottom = 4 -[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Gamepad"] -custom_minimum_size = Vector2(0, 425) +[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad"] +layout_mode = 2 + +[node name="Vbox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox"] layout_mode = 2 theme_override_constants/margin_left = 25 theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Gamepad/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer"] layout_mode = 2 -columns = 2 +columns = 3 -[node name="MoveUpLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveUpLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Up" -vertical_alignment = 1 -[node name="MoveUpRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveUpRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 script = ExtResource("2_4asaa") input_action_name = "move_up_controller" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveLeftLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveLeftLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Left" -vertical_alignment = 1 -[node name="MoveLeftRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer2" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveLeftRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 script = ExtResource("2_4asaa") input_action_name = "move_left_controller" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveDownLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveDownLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Down" -vertical_alignment = 1 -[node name="MoveDownRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer3" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveDownRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 script = ExtResource("2_4asaa") input_action_name = "move_down_controller" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveRightLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveRightLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move RIght" -vertical_alignment = 1 -[node name="MoveRightRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer4" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="MoveRightRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") script = ExtResource("2_4asaa") input_action_name = "move_right_controller" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="AttackLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="AttackLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Attack " -vertical_alignment = 1 -[node name="AttackRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer5" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="AttackRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") script = ExtResource("2_4asaa") input_action_name = "attack" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="Back Button" type="Button" parent="."] -custom_minimum_size = Vector2(500, 40) -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 = -80.0 -offset_right = 250.0 -offset_bottom = -40.0 -grow_horizontal = 2 -grow_vertical = 0 -theme_override_font_sizes/font_size = 23 +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer"] +layout_mode = 2 +theme_override_constants/margin_top = 32 + +[node name="Back Button" type="Button" parent="Panel/MarginContainer/VBoxContainer/MarginContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 64 text = "Back" -[connection signal="item_selected" from="SettingsTabs/Video/MarginContainer/GridContainer/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] -[connection signal="toggled" from="SettingsTabs/Video/MarginContainer/GridContainer/VsyncButton" to="." method="_on_vsync_button_toggled"] -[connection signal="item_selected" from="SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] -[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] -[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] -[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] -[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] -[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] -[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveUpRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/AttackRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveUpRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveLeftRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveDownRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveRightRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/AttackRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Back Button" to="." method="_on_back_pressed"] +[connection signal="item_selected" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] +[connection signal="toggled" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/VsyncButton" to="." method="_on_vsync_button_toggled"] +[connection signal="item_selected" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] +[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] +[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] +[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] +[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] +[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] +[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveUpRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveLeftRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveDownRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveRightRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/AttackRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveUpRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveLeftRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveDownRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveRightRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/MarginContainer/Back Button" to="." method="_on_back_pressed"] diff --git a/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index f019bd7..cdeaa31 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -1,14 +1,13 @@ -[gd_scene load_steps=28 format=3 uid="uid://cukyb513fah1u"] +[gd_scene load_steps=16 format=3 uid="uid://cukyb513fah1u"] [ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] -[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] [ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] [ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] [ext_resource type="Theme" uid="uid://babphdknr2kkd" path="res://Assets/UI/Theme.tres" id="4_bmt8e"] +[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/UI/Shadow.png" id="5_wt601"] [ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="7_g28i1"] [ext_resource type="Texture2D" uid="uid://dlr823rtwhtq2" path="res://Assets/Sprites/EasterEgg.png" id="7_wokip"] [ext_resource type="Texture2D" uid="uid://c54k7fn4fu42s" path="res://Assets/Sprites/Bunny/good_bunny_spritesheet.png" id="8_5vrmg"] -[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="10_seibg"] [ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Music/omw-to-beat-the-big-bad.wav" id="12_i62fw"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5uvie"] @@ -38,7 +37,7 @@ _data = { [sub_resource type="Animation" id="Animation_53kbk"] resource_name = "Autostart" -length = 0.2 +length = 0.5 loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false @@ -58,120 +57,26 @@ _data = { "Autostart": SubResource("Animation_53kbk") } -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rmi2t"] -bg_color = Color(0.427451, 0.423529, 0.8, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color(0, 0, 0, 1) -expand_margin_left = 7.0 -expand_margin_right = 7.0 +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_h5db4"] +bg_color = Color(0, 0, 0, 0.156863) -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_47cud"] -bg_color = Color(0.427451, 0.423529, 0.8, 1) -border_width_left = 4 -border_width_bottom = 4 -border_color = Color(0.317647, 0.301961, 0.658824, 1) -corner_radius_top_left = 2 -corner_radius_bottom_right = 2 -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2i81h"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -border_width_left = 4 -border_width_bottom = 4 -border_color = Color(0.262745, 0.243137, 0.556863, 1) -corner_radius_top_left = 2 -corner_radius_bottom_right = 2 -expand_margin_left = 10.0 -expand_margin_right = 10.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vel2s"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7k6ml"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -expand_margin_right = 10.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_11k4d"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nyi0q"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qky0m"] -bg_color = Color(0.313726, 0.231373, 0.4, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color(0.313726, 0.231373, 0.4, 1) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lleuj"] -bg_color = Color(0.941176, 0.964706, 0.909804, 1) -border_width_left = 5 -border_width_top = 5 -border_width_right = 5 -border_width_bottom = 5 -border_color = Color(0.65098, 0.741176, 0.509804, 1) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rcukk"] -bg_color = Color(0.941176, 0.964706, 0.909804, 1) -border_width_left = 3 -border_width_top = 3 -border_width_right = 3 -border_color = Color(0.658824, 0.74902, 0.517647, 1) -expand_margin_left = 5.0 -expand_margin_top = 5.0 -expand_margin_right = 5.0 -expand_margin_bottom = 5.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_44exv"] -bg_color = Color(0.894118, 0.94902, 0.835294, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_color = Color(0.635294, 0.756863, 0.482353, 1) -expand_margin_left = 4.0 -expand_margin_top = 4.0 -expand_margin_right = 4.0 - -[sub_resource type="Theme" id="Theme_w723v"] -default_font = ExtResource("10_seibg") -Button/styles/focus = SubResource("StyleBoxFlat_rmi2t") -Button/styles/hover = SubResource("StyleBoxFlat_47cud") -Button/styles/normal = SubResource("StyleBoxFlat_2i81h") -Button/styles/pressed = SubResource("StyleBoxFlat_vel2s") -CheckButton/styles/hover_pressed = SubResource("StyleBoxFlat_7k6ml") -HSlider/styles/grabber_area = SubResource("StyleBoxFlat_11k4d") -HSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_nyi0q") -HSlider/styles/slider = SubResource("StyleBoxFlat_qky0m") -TabContainer/colors/font_selected_color = Color(0.0980392, 0.0980392, 0.0980392, 1) -TabContainer/colors/font_unselected_color = Color(0.435294, 0.435294, 0.435294, 1) -TabContainer/styles/panel = SubResource("StyleBoxFlat_lleuj") -TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_rcukk") -TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_44exv") - -[node name="MainMenu" type="Node" node_paths=PackedStringArray("default_focus")] +[node name="MainMenu" type="Control" node_paths=PackedStringArray("default_focus")] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 6 +size_flags_vertical = 3 script = ExtResource("1_qepq0") game_scene = ExtResource("2_28004") settings_scene = ExtResource("3_r3r61") -default_focus = NodePath("MainVBox/ButtonsVbox/PlayButton") -autostart_animations = Array[NodePath]([NodePath("Decorations/Left Decor/Jesus/AnimationPlayer")]) +default_focus = NodePath("VBoxContainer/MarginBox2/ButtonsVbox/PlayButton") +autostart_animations = Array[NodePath]([NodePath("Decorations/Left Decor/Jesus/AnimationPlayer"), NodePath("Decorations/Right Decor/GoodBunny/AnimationPlayer")]) -[node name="ColorRect" type="Panel" parent="."] +[node name="Panel" type="Panel" parent="."] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -181,7 +86,7 @@ theme = ExtResource("4_bmt8e") theme_override_styles/panel = SubResource("StyleBoxFlat_5uvie") [node name="Decorations" type="Control" parent="."] -layout_mode = 3 +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -196,13 +101,13 @@ anchor_bottom = 1.0 grow_vertical = 2 [node name="Shadow" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(226.563, 338.875) -scale = Vector2(22.7773, 15.6953) -texture = ExtResource("2_8o6th") +position = Vector2(272, 686) +scale = Vector2(10, 10) +texture = ExtResource("5_wt601") [node name="Jesus" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(231.625, 327.793) -scale = Vector2(8.16379, 8.16379) +position = Vector2(279, 408) +scale = Vector2(10, 10) texture = ExtResource("7_g28i1") hframes = 8 vframes = 4 @@ -213,15 +118,15 @@ libraries = { } [node name="EasterEgg" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(137, 503) -scale = Vector2(4.97917, 4.97917) +position = Vector2(142, 555) +scale = Vector2(10, 10) texture = ExtResource("7_wokip") hframes = 6 [node name="EasterEgg2" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(312, 528) -rotation = 1.33289 -scale = Vector2(4.09073, 4.29567) +position = Vector2(450, 572) +rotation = 0.633555 +scale = Vector2(10, 10) texture = ExtResource("7_wokip") hframes = 6 frame = 4 @@ -236,14 +141,22 @@ anchor_bottom = 1.0 grow_horizontal = 0 grow_vertical = 2 -[node name="Shadow2" type="Sprite2D" parent="Decorations/Right Decor"] -position = Vector2(351, 403) -scale = Vector2(19.0938, 11.8125) -texture = ExtResource("2_8o6th") +[node name="Shadow" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(300, 681) +scale = Vector2(10, 10) +texture = ExtResource("5_wt601") + +[node name="EasterEgg" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(416, 537) +rotation = 0.289725 +scale = Vector2(10, 10) +texture = ExtResource("7_wokip") +hframes = 6 +frame = 2 [node name="GoodBunny" type="Sprite2D" parent="Decorations/Right Decor"] -position = Vector2(388, 471.5) -scale = Vector2(7.14286, 7.02941) +position = Vector2(235, 579) +scale = Vector2(10, 10) texture = ExtResource("8_5vrmg") hframes = 5 vframes = 4 @@ -253,45 +166,58 @@ libraries = { "": SubResource("AnimationLibrary_5tgwk") } -[node name="EasterEgg" type="Sprite2D" parent="Decorations/Right Decor"] -position = Vector2(298.625, 516.969) -scale = Vector2(4.11458, 4.11458) -texture = ExtResource("7_wokip") -hframes = 6 -frame = 2 - -[node name="MainVBox" type="VBoxContainer" parent="."] +[node name="Panel" type="Panel" parent="Decorations"] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = 31.0 -offset_top = 22.0 -offset_right = -31.0 -offset_bottom = -22.0 grow_horizontal = 2 grow_vertical = 2 -theme = SubResource("Theme_w723v") +theme_override_styles/panel = SubResource("StyleBoxFlat_h5db4") -[node name="Label" type="Label" parent="MainVBox"] +[node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/separation = 0 + +[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"] layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 8 -theme = ExtResource("4_bmt8e") -theme_override_font_sizes/font_size = 50 -text = "HOPPY EASTER GAME THING" -horizontal_alignment = 1 -vertical_alignment = 1 +theme_override_constants/margin_left = 32 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 32 +theme_override_constants/margin_bottom = 32 -[node name="ButtonsVbox" type="VBoxContainer" parent="MainVBox"] +[node name="Label" type="Label" parent="VBoxContainer/MarginContainer"] +layout_mode = 2 +size_flags_horizontal = 5 +theme_override_colors/font_color = Color(0.388235, 0.294118, 0.490196, 1) +theme_override_colors/font_shadow_color = Color(0.227451, 0.172549, 0.290196, 1) +theme_override_font_sizes/font_size = 96 +text = "Happy Easter Game Thing" +horizontal_alignment = 1 +autowrap_mode = 2 + +[node name="MarginBox2" type="MarginContainer" parent="VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 3 +theme_override_constants/margin_left = 32 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 32 +theme_override_constants/margin_bottom = 32 + +[node name="ButtonsVbox" type="VBoxContainer" parent="VBoxContainer/MarginBox2"] custom_minimum_size = Vector2(0, 495) layout_mode = 2 size_flags_horizontal = 4 -size_flags_vertical = 3 theme = ExtResource("4_bmt8e") -theme_override_constants/separation = 10 +theme_override_constants/separation = 8 alignment = 1 -[node name="PlayButton" type="Button" parent="MainVBox/ButtonsVbox"] +[node name="PlayButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../QuitButton") @@ -304,7 +230,7 @@ theme = ExtResource("4_bmt8e") theme_override_font_sizes/font_size = 64 text = "Play" -[node name="SettingsButton" type="Button" parent="MainVBox/ButtonsVbox"] +[node name="SettingsButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../PlayButton") @@ -317,7 +243,7 @@ theme = ExtResource("4_bmt8e") theme_override_font_sizes/font_size = 64 text = "Settings" -[node name="AboutButton" type="Button" parent="MainVBox/ButtonsVbox"] +[node name="AboutButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../SettingsButton") @@ -330,7 +256,11 @@ theme = ExtResource("4_bmt8e") theme_override_font_sizes/font_size = 64 text = "About" -[node name="QuitButton" type="Button" parent="MainVBox/ButtonsVbox"] +[node name="Spacer" type="MarginContainer" parent="VBoxContainer/MarginBox2/ButtonsVbox"] +layout_mode = 2 +size_flags_vertical = 3 + +[node name="QuitButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../AboutButton") @@ -348,7 +278,7 @@ stream = ExtResource("12_i62fw") autoplay = true bus = &"Music" -[connection signal="pressed" from="MainVBox/ButtonsVbox/PlayButton" to="." method="_on_play_button_pressed"] -[connection signal="pressed" from="MainVBox/ButtonsVbox/SettingsButton" to="." method="_on_settings_button_pressed"] -[connection signal="pressed" from="MainVBox/ButtonsVbox/AboutButton" to="." method="_on_about_button_pressed"] -[connection signal="pressed" from="MainVBox/ButtonsVbox/QuitButton" to="." method="_on_quit_button_pressed"] +[connection signal="pressed" from="VBoxContainer/MarginBox2/ButtonsVbox/PlayButton" to="." method="_on_play_button_pressed"] +[connection signal="pressed" from="VBoxContainer/MarginBox2/ButtonsVbox/SettingsButton" to="." method="_on_settings_button_pressed"] +[connection signal="pressed" from="VBoxContainer/MarginBox2/ButtonsVbox/AboutButton" to="." method="_on_about_button_pressed"] +[connection signal="pressed" from="VBoxContainer/MarginBox2/ButtonsVbox/QuitButton" to="." method="_on_quit_button_pressed"] diff --git a/Scripts/SaveSystem/GlobalSettings.gd b/Scripts/SaveSystem/GlobalSettings.gd index 85f3810..6162cc6 100644 --- a/Scripts/SaveSystem/GlobalSettings.gd +++ b/Scripts/SaveSystem/GlobalSettings.gd @@ -13,6 +13,7 @@ extends Node ] const resolutions_dictionary : Dictionary = { + "640x480" : Vector2(640, 480), "800x600" : Vector2(800, 600), "1024x546" : Vector2(1024, 546), "1280x720" : Vector2(1280, 720), diff --git a/Scripts/UI/MainMenuManager.gd b/Scripts/UI/MainMenuManager.gd index 93f573d..5d0e940 100644 --- a/Scripts/UI/MainMenuManager.gd +++ b/Scripts/UI/MainMenuManager.gd @@ -11,6 +11,7 @@ func _ready(): GlobalSettings.set_display_mode(Save.game_data.display_mode) GlobalSettings.toggle_vsync(Save.game_data.vsync_on) GlobalSettings.set_resolution(Save.game_data.current_resolution_index) + DisplayServer.window_set_min_size(Vector2(640,480)) GlobalSettings.update_master_volume(Save.game_data.master_volume) GlobalSettings.update_music_volume(Save.game_data.music_volume) GlobalSettings.update_sfx_volume(Save.game_data.sfx_volume) diff --git a/Scripts/UI/SettingsMenu.gd b/Scripts/UI/SettingsMenu.gd index 47a1db2..76937d0 100644 --- a/Scripts/UI/SettingsMenu.gd +++ b/Scripts/UI/SettingsMenu.gd @@ -29,8 +29,9 @@ func _ready(): GlobalSettings.set_display_mode(Save.game_data.display_mode) vsync_toggle.set_pressed_no_signal(Save.game_data.vsync_on) GlobalSettings.toggle_vsync(Save.game_data.vsync_on) + if Save.game_data.display_mode == DisplayServer.WINDOW_MODE_FULLSCREEN or Save.game_data.display_mode == DisplayServer.WINDOW_MODE_EXCLUSIVE_FULLSCREEN: + GlobalSettings.set_resolution(Save.game_data.current_resolution_index) resolutions_options_button.select(Save.game_data.current_resolution_index) - GlobalSettings.set_resolution(Save.game_data.current_resolution_index) master_volume_slider.value = Save.game_data.master_volume GlobalSettings.update_master_volume(Save.game_data.master_volume) music_volume_slider.value = Save.game_data.music_volume diff --git a/project.godot b/project.godot index 12f6809..a9d14ef 100644 --- a/project.godot +++ b/project.godot @@ -26,9 +26,9 @@ Save="*res://Scripts/SaveSystem/GameDataSaver.gd" [display] -window/size/viewport_width=1280 -window/size/viewport_height=720 -window/stretch/mode="viewport" +window/size/viewport_width=640 +window/size/viewport_height=1000 +window/stretch/mode="canvas_items" window/stretch/aspect="expand" [dotnet]