diff --git a/core/game_menu/assets/page_1/chooseyourbiome_text.png b/core/game_menu/assets/page_1/chooseyourbiome_text.png index 203038d..5e123c2 100644 Binary files a/core/game_menu/assets/page_1/chooseyourbiome_text.png and b/core/game_menu/assets/page_1/chooseyourbiome_text.png differ diff --git a/core/game_menu/assets/page_1/chooseyourtrain_text.png b/core/game_menu/assets/page_1/chooseyourtrain_text.png index fb29f12..c655cb1 100644 Binary files a/core/game_menu/assets/page_1/chooseyourtrain_text.png and b/core/game_menu/assets/page_1/chooseyourtrain_text.png differ diff --git a/core/game_menu/assets/page_2/achievements_text.png b/core/game_menu/assets/page_2/achievements_text.png index 65c4104..21ac915 100644 Binary files a/core/game_menu/assets/page_2/achievements_text.png and b/core/game_menu/assets/page_2/achievements_text.png differ diff --git a/core/game_menu/assets/page_2/photocollections_text.png b/core/game_menu/assets/page_2/photocollections_text.png index de1ff52..a66316d 100644 Binary files a/core/game_menu/assets/page_2/photocollections_text.png and b/core/game_menu/assets/page_2/photocollections_text.png differ diff --git a/core/game_menu/assets/page_3/base.png b/core/game_menu/assets/page_3/base.png index c99f531..dbfdfa2 100644 Binary files a/core/game_menu/assets/page_3/base.png and b/core/game_menu/assets/page_3/base.png differ diff --git a/core/game_menu/assets/page_3/checkbox.png b/core/game_menu/assets/page_3/checkbox.png new file mode 100644 index 0000000..b6a3621 Binary files /dev/null and b/core/game_menu/assets/page_3/checkbox.png differ diff --git a/core/game_menu/assets/page_3/checkbox.png.import b/core/game_menu/assets/page_3/checkbox.png.import new file mode 100644 index 0000000..18cb1b1 --- /dev/null +++ b/core/game_menu/assets/page_3/checkbox.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dde30f2ngoj53" +path="res://.godot/imported/checkbox.png-999e5910ae6271ca60b788aac7231b32.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/checkbox.png" +dest_files=["res://.godot/imported/checkbox.png-999e5910ae6271ca60b788aac7231b32.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/core/game_menu/assets/page_3/resolution.png b/core/game_menu/assets/page_3/resolution.png new file mode 100644 index 0000000..645901b Binary files /dev/null and b/core/game_menu/assets/page_3/resolution.png differ diff --git a/core/game_menu/assets/page_3/resolution.png.import b/core/game_menu/assets/page_3/resolution.png.import new file mode 100644 index 0000000..53cd949 --- /dev/null +++ b/core/game_menu/assets/page_3/resolution.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://djllofh10hgk6" +path="res://.godot/imported/resolution.png-e7791d7c551852aff68481a068a9d7ef.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/resolution.png" +dest_files=["res://.godot/imported/resolution.png-e7791d7c551852aff68481a068a9d7ef.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/core/game_menu/assets/page_3/sfx_volume_button.png b/core/game_menu/assets/page_3/sfx_volume_button.png index beebb4f..935369a 100644 Binary files a/core/game_menu/assets/page_3/sfx_volume_button.png and b/core/game_menu/assets/page_3/sfx_volume_button.png differ diff --git a/core/game_menu/checkbox.gd b/core/game_menu/checkbox.gd index a200f48..df4df40 100644 --- a/core/game_menu/checkbox.gd +++ b/core/game_menu/checkbox.gd @@ -3,31 +3,5 @@ extends Button class_name CustomCheckbox -@export var color: Color = Color(1,1,1,1): - set(value): - color = value - if is_inside_tree() and has_node("%ToggleTexture"): - $%ToggleTexture.modulate = color - -@export var image: Texture: - set(value): - image = value - if is_inside_tree() and has_node("%Texture"): - $%Texture.texture = image - -@export var image_toggle: Texture: - set(value): - image_toggle = value - if is_inside_tree() and has_node("%ToggleTexture"): - $%ToggleTexture.texture = image_toggle - -func _ready(): - if image != null and has_node("%Texture"): - $%Texture.texture = image - if image_toggle != null and has_node("%ToggleTexture"): - $%ToggleTexture.texture = image_toggle - $%ToggleTexture.modulate = color - $%ToggleTexture.visible = button_pressed - func _on_toggled(toggled_on: bool) -> void: $%ToggleTexture.visible = toggled_on diff --git a/core/game_menu/checkbox.tscn b/core/game_menu/checkbox.tscn index 3029322..2a4b582 100644 --- a/core/game_menu/checkbox.tscn +++ b/core/game_menu/checkbox.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://bf28djpewxwai" path="res://core/game_menu/checkbox.gd" id="2_ma3ho"] [ext_resource type="Texture2D" uid="uid://hw1j3ii4eer" path="res://core/game_menu/assets/page_3/buttonsquare_empty.png" id="2_p1o3r"] -[ext_resource type="Texture2D" uid="uid://cq51kdp4p1jfk" path="res://core/game_menu/assets/page_3/buttonsquare_fill.png" id="3_6138f"] +[ext_resource type="Texture2D" uid="uid://dde30f2ngoj53" path="res://core/game_menu/assets/page_3/checkbox.png" id="4_p1o3r"] [node name="Checkbox" type="Button" unique_id=1346986972] custom_minimum_size = Vector2(60, 60) @@ -13,8 +13,6 @@ pivot_offset_ratio = Vector2(0.5, 0.5) toggle_mode = true flat = true script = ExtResource("2_ma3ho") -image = ExtResource("2_p1o3r") -image_toggle = ExtResource("3_6138f") metadata/_edit_use_anchors_ = true [node name="Texture" type="TextureRect" parent="." unique_id=1951376393] @@ -31,6 +29,7 @@ expand_mode = 1 [node name="ToggleTexture" type="TextureRect" parent="." unique_id=1931011536] unique_name_in_owner = true +visible = false custom_minimum_size = Vector2(50, 50) layout_mode = 1 anchors_preset = 8 @@ -45,7 +44,7 @@ offset_bottom = 23.5 grow_horizontal = 2 grow_vertical = 2 pivot_offset_ratio = Vector2(0.5, 0.5) -texture = ExtResource("3_6138f") +texture = ExtResource("4_p1o3r") expand_mode = 1 [connection signal="toggled" from="." to="." method="_on_toggled"] diff --git a/core/game_menu/page_3.tscn b/core/game_menu/page_3.tscn index 6d10607..708220d 100644 --- a/core/game_menu/page_3.tscn +++ b/core/game_menu/page_3.tscn @@ -49,8 +49,8 @@ anchor_right = -0.0328125 anchor_bottom = -0.0129629625 offset_left = 238.0 offset_top = 328.0 -offset_right = 1117.0 -offset_bottom = 883.0 +offset_right = 987.0 +offset_bottom = 853.0 size_flags_horizontal = 6 [editable path="OptionMenu"] diff --git a/core/game_menu/settings_menu.tscn b/core/game_menu/settings_menu.tscn index 5303524..cbbe60b 100644 --- a/core/game_menu/settings_menu.tscn +++ b/core/game_menu/settings_menu.tscn @@ -40,6 +40,7 @@ bus_name = &"SFX" [node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=1034452799] layout_mode = 2 +size_flags_vertical = 0 [node name="AliasingOption" type="Control" parent="VBoxContainer" unique_id=960976098] custom_minimum_size = Vector2(305, 115) @@ -68,7 +69,6 @@ offset_top = -20.0 offset_bottom = 20.0 grow_horizontal = 0 grow_vertical = 2 -color = Color(1, 0.8156863, 0.7176471, 1) [node name="WindowOptionMenu" parent="VBoxContainer" unique_id=1829826194 instance=ExtResource("6_ocbt2")] custom_minimum_size = Vector2(418, 342) diff --git a/core/game_menu/window_option_menu.tscn b/core/game_menu/window_option_menu.tscn index eb100f9..da3630b 100644 --- a/core/game_menu/window_option_menu.tscn +++ b/core/game_menu/window_option_menu.tscn @@ -7,6 +7,7 @@ [ext_resource type="Texture2D" uid="uid://m5llqtaj5kla" path="res://core/game_menu/assets/page_3/borderless.png" id="3_byg38"] [ext_resource type="Texture2D" uid="uid://idvleok1gecb" path="res://core/game_menu/assets/page_3/base.png" id="3_lo8ks"] [ext_resource type="Texture2D" uid="uid://dbcs6apfftxxw" path="res://core/game_menu/assets/page_3/windowed.png" id="4_c6wxr"] +[ext_resource type="Texture2D" uid="uid://djllofh10hgk6" path="res://core/game_menu/assets/page_3/resolution.png" id="8_p62vb"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_323rd"] @@ -41,18 +42,23 @@ metadata/_edit_use_anchors_ = true [node name="Base" type="TextureRect" parent="." unique_id=1093652090] unique_name_in_owner = true -custom_minimum_size = Vector2(255.46, 330.8) layout_mode = 1 -anchors_preset = 5 +anchors_preset = 7 anchor_left = 0.5 +anchor_top = 1.0 anchor_right = 0.5 -offset_left = -109.64252 -offset_right = 109.64252 -offset_bottom = 238.0 +anchor_bottom = 1.0 +offset_left = -116.0 +offset_top = -208.0 +offset_right = 116.0 +offset_bottom = 31.000183 grow_horizontal = 2 +grow_vertical = 0 +rotation = -0.20943952 +pivot_offset_ratio = Vector2(0.5, 0.5) size_flags_horizontal = 4 texture = ExtResource("3_lo8ks") -expand_mode = 1 +stretch_mode = 2 [node name="VBoxContainer" type="VBoxContainer" parent="Base" unique_id=416233744] layout_mode = 1 @@ -65,7 +71,7 @@ grow_vertical = 2 [node name="MarginContainer" type="MarginContainer" parent="Base/VBoxContainer" unique_id=2077693765] layout_mode = 2 theme_override_constants/margin_left = 32 -theme_override_constants/margin_top = 100 +theme_override_constants/margin_top = 32 theme_override_constants/margin_right = 32 theme_override_constants/margin_bottom = 32 @@ -75,19 +81,144 @@ layout_mode = 2 size_flags_horizontal = 4 alignment = 1 -[node name="HBoxContainer" type="HBoxContainer" parent="." unique_id=255911279] -layout_mode = 0 -offset_right = 418.0 -offset_bottom = 100.0 -alignment = 1 +[node name="Control" type="Control" parent="." unique_id=1728565603] +layout_mode = 1 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -209.0 +offset_top = 62.0 +offset_right = 209.0 +offset_bottom = 162.0 +grow_horizontal = 2 -[node name="LeftArrowButton" parent="HBoxContainer" unique_id=579258112 instance=ExtResource("2_c6wxr")] +[node name="FullScreenButton" type="Button" parent="Control" unique_id=658423473] +unique_name_in_owner = true +custom_minimum_size = Vector2(250, 100) +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.20095694 +anchor_right = 0.79904306 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/normal = SubResource("StyleBoxEmpty_323rd") +theme_override_styles/normal_mirrored = SubResource("StyleBoxEmpty_264kt") +theme_override_styles/pressed = SubResource("StyleBoxEmpty_1folt") +theme_override_styles/pressed_mirrored = SubResource("StyleBoxEmpty_tcqrg") +theme_override_styles/hover = SubResource("StyleBoxEmpty_kbu6n") +theme_override_styles/hover_mirrored = SubResource("StyleBoxEmpty_dk0pr") +theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_f16cj") +theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxEmpty_s4jbd") +theme_override_styles/disabled = SubResource("StyleBoxEmpty_2ocph") +theme_override_styles/disabled_mirrored = SubResource("StyleBoxEmpty_5386i") +theme_override_styles/focus = SubResource("StyleBoxEmpty_6pmjh") +metadata/_edit_use_anchors_ = true + +[node name="Texture" type="TextureRect" parent="Control/FullScreenButton" unique_id=1273084077] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("1_1oilv") +expand_mode = 1 +stretch_mode = 5 + +[node name="BorderlessButton" type="Button" parent="Control" unique_id=1930001398] +unique_name_in_owner = true +visible = false +custom_minimum_size = Vector2(250, 100) +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.20095694 +anchor_right = 0.79904306 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/normal = SubResource("StyleBoxEmpty_323rd") +theme_override_styles/normal_mirrored = SubResource("StyleBoxEmpty_264kt") +theme_override_styles/pressed = SubResource("StyleBoxEmpty_1folt") +theme_override_styles/pressed_mirrored = SubResource("StyleBoxEmpty_tcqrg") +theme_override_styles/hover = SubResource("StyleBoxEmpty_kbu6n") +theme_override_styles/hover_mirrored = SubResource("StyleBoxEmpty_dk0pr") +theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_f16cj") +theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxEmpty_s4jbd") +theme_override_styles/disabled = SubResource("StyleBoxEmpty_2ocph") +theme_override_styles/disabled_mirrored = SubResource("StyleBoxEmpty_5386i") +theme_override_styles/focus = SubResource("StyleBoxEmpty_6pmjh") +metadata/_edit_use_anchors_ = true + +[node name="Texture" type="TextureRect" parent="Control/BorderlessButton" unique_id=2113335035] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("3_byg38") +expand_mode = 1 +stretch_mode = 5 + +[node name="WindowedButton" type="Button" parent="Control" unique_id=210063143] +unique_name_in_owner = true +visible = false +custom_minimum_size = Vector2(250, 100) +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -125.0 +offset_top = -50.0 +offset_right = 125.0 +offset_bottom = 50.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/normal = SubResource("StyleBoxEmpty_323rd") +theme_override_styles/normal_mirrored = SubResource("StyleBoxEmpty_264kt") +theme_override_styles/pressed = SubResource("StyleBoxEmpty_1folt") +theme_override_styles/pressed_mirrored = SubResource("StyleBoxEmpty_tcqrg") +theme_override_styles/hover = SubResource("StyleBoxEmpty_kbu6n") +theme_override_styles/hover_mirrored = SubResource("StyleBoxEmpty_dk0pr") +theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_f16cj") +theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxEmpty_s4jbd") +theme_override_styles/disabled = SubResource("StyleBoxEmpty_2ocph") +theme_override_styles/disabled_mirrored = SubResource("StyleBoxEmpty_5386i") +theme_override_styles/focus = SubResource("StyleBoxEmpty_6pmjh") + +[node name="Texture" type="TextureRect" parent="Control/WindowedButton" unique_id=873436909] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("4_c6wxr") +expand_mode = 1 +stretch_mode = 5 + +[node name="LeftArrowButton" parent="Control" unique_id=579258112 instance=ExtResource("2_c6wxr")] unique_name_in_owner = true custom_minimum_size = Vector2(50.5, 62) -layout_mode = 2 +layout_mode = 1 +anchors_preset = 4 +anchor_top = 0.5 +anchor_right = 0.0 +anchor_bottom = 0.5 +offset_left = 70.0 +offset_top = -50.0 +offset_right = 120.50005 +offset_bottom = 50.0 +grow_vertical = 2 flip_h = true -[node name="Texture" parent="HBoxContainer/LeftArrowButton" index="0" unique_id=91599097] +[node name="Texture" parent="Control/LeftArrowButton" index="0" unique_id=91599097] custom_minimum_size = Vector2(50, 62) anchors_preset = -1 anchor_top = 0.19 @@ -102,101 +233,23 @@ stretch_mode = 5 flip_h = true metadata/_edit_use_anchors_ = true -[node name="FullScreenButton" type="Button" parent="HBoxContainer" unique_id=658423473] -unique_name_in_owner = true -custom_minimum_size = Vector2(310, 100) -layout_mode = 2 -theme_override_styles/normal = SubResource("StyleBoxEmpty_323rd") -theme_override_styles/normal_mirrored = SubResource("StyleBoxEmpty_264kt") -theme_override_styles/pressed = SubResource("StyleBoxEmpty_1folt") -theme_override_styles/pressed_mirrored = SubResource("StyleBoxEmpty_tcqrg") -theme_override_styles/hover = SubResource("StyleBoxEmpty_kbu6n") -theme_override_styles/hover_mirrored = SubResource("StyleBoxEmpty_dk0pr") -theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_f16cj") -theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxEmpty_s4jbd") -theme_override_styles/disabled = SubResource("StyleBoxEmpty_2ocph") -theme_override_styles/disabled_mirrored = SubResource("StyleBoxEmpty_5386i") -theme_override_styles/focus = SubResource("StyleBoxEmpty_6pmjh") -metadata/_edit_use_anchors_ = true - -[node name="Texture" type="TextureRect" parent="HBoxContainer/FullScreenButton" unique_id=1273084077] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -texture = ExtResource("1_1oilv") -expand_mode = 1 -stretch_mode = 5 - -[node name="BorderlessButton" type="Button" parent="HBoxContainer" unique_id=1930001398] -unique_name_in_owner = true -visible = false -custom_minimum_size = Vector2(310, 100) -layout_mode = 2 -theme_override_styles/normal = SubResource("StyleBoxEmpty_323rd") -theme_override_styles/normal_mirrored = SubResource("StyleBoxEmpty_264kt") -theme_override_styles/pressed = SubResource("StyleBoxEmpty_1folt") -theme_override_styles/pressed_mirrored = SubResource("StyleBoxEmpty_tcqrg") -theme_override_styles/hover = SubResource("StyleBoxEmpty_kbu6n") -theme_override_styles/hover_mirrored = SubResource("StyleBoxEmpty_dk0pr") -theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_f16cj") -theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxEmpty_s4jbd") -theme_override_styles/disabled = SubResource("StyleBoxEmpty_2ocph") -theme_override_styles/disabled_mirrored = SubResource("StyleBoxEmpty_5386i") -theme_override_styles/focus = SubResource("StyleBoxEmpty_6pmjh") -metadata/_edit_use_anchors_ = true - -[node name="Texture" type="TextureRect" parent="HBoxContainer/BorderlessButton" unique_id=2113335035] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -texture = ExtResource("3_byg38") -expand_mode = 1 -stretch_mode = 5 - -[node name="WindowedButton" type="Button" parent="HBoxContainer" unique_id=210063143] -unique_name_in_owner = true -visible = false -custom_minimum_size = Vector2(310, 100) -layout_mode = 2 -theme_override_styles/normal = SubResource("StyleBoxEmpty_323rd") -theme_override_styles/normal_mirrored = SubResource("StyleBoxEmpty_264kt") -theme_override_styles/pressed = SubResource("StyleBoxEmpty_1folt") -theme_override_styles/pressed_mirrored = SubResource("StyleBoxEmpty_tcqrg") -theme_override_styles/hover = SubResource("StyleBoxEmpty_kbu6n") -theme_override_styles/hover_mirrored = SubResource("StyleBoxEmpty_dk0pr") -theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_f16cj") -theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxEmpty_s4jbd") -theme_override_styles/disabled = SubResource("StyleBoxEmpty_2ocph") -theme_override_styles/disabled_mirrored = SubResource("StyleBoxEmpty_5386i") -theme_override_styles/focus = SubResource("StyleBoxEmpty_6pmjh") -metadata/_edit_use_anchors_ = true - -[node name="Texture" type="TextureRect" parent="HBoxContainer/WindowedButton" unique_id=873436909] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -texture = ExtResource("4_c6wxr") -expand_mode = 1 -stretch_mode = 5 - -[node name="RightArrowButton" parent="HBoxContainer" unique_id=1429974963 instance=ExtResource("2_c6wxr")] +[node name="RightArrowButton" parent="Control" unique_id=1429974963 instance=ExtResource("2_c6wxr")] unique_name_in_owner = true custom_minimum_size = Vector2(50.5, 62) -layout_mode = 2 +layout_mode = 1 +anchors_preset = 6 +anchor_left = 1.0 +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +offset_left = -128.0 +offset_top = -50.0 +offset_right = -77.49994 +offset_bottom = 50.0 +grow_horizontal = 0 +grow_vertical = 2 -[node name="Texture" parent="HBoxContainer/RightArrowButton" index="0" unique_id=91599097] +[node name="Texture" parent="Control/RightArrowButton" index="0" unique_id=91599097] custom_minimum_size = Vector2(50, 62) anchors_preset = -1 anchor_left = 0.00990099 @@ -210,15 +263,29 @@ expand_mode = 1 stretch_mode = 5 metadata/_edit_use_anchors_ = true -[connection signal="mouse_entered" from="HBoxContainer/FullScreenButton" to="HBoxContainer/FullScreenButton" method="_on_mouse_entered"] -[connection signal="mouse_exited" from="HBoxContainer/FullScreenButton" to="HBoxContainer/FullScreenButton" method="_on_mouse_exited"] -[connection signal="pressed" from="HBoxContainer/FullScreenButton" to="HBoxContainer/FullScreenButton" method="_on_pressed"] -[connection signal="mouse_entered" from="HBoxContainer/BorderlessButton" to="HBoxContainer/BorderlessButton" method="_on_mouse_entered"] -[connection signal="mouse_exited" from="HBoxContainer/BorderlessButton" to="HBoxContainer/BorderlessButton" method="_on_mouse_exited"] -[connection signal="pressed" from="HBoxContainer/BorderlessButton" to="HBoxContainer/BorderlessButton" method="_on_pressed"] -[connection signal="mouse_entered" from="HBoxContainer/WindowedButton" to="HBoxContainer/WindowedButton" method="_on_mouse_entered"] -[connection signal="mouse_exited" from="HBoxContainer/WindowedButton" to="HBoxContainer/WindowedButton" method="_on_mouse_exited"] -[connection signal="pressed" from="HBoxContainer/WindowedButton" to="HBoxContainer/WindowedButton" method="_on_pressed"] +[node name="ResolutionTexture" type="TextureRect" parent="." unique_id=12652005] +custom_minimum_size = Vector2(310, 100) +layout_mode = 1 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -155.0 +offset_right = 155.0 +offset_bottom = 100.0 +grow_horizontal = 2 +texture = ExtResource("8_p62vb") +expand_mode = 1 +stretch_mode = 5 -[editable path="HBoxContainer/LeftArrowButton"] -[editable path="HBoxContainer/RightArrowButton"] +[connection signal="mouse_entered" from="Control/FullScreenButton" to="Control/FullScreenButton" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="Control/FullScreenButton" to="Control/FullScreenButton" method="_on_mouse_exited"] +[connection signal="pressed" from="Control/FullScreenButton" to="Control/FullScreenButton" method="_on_pressed"] +[connection signal="mouse_entered" from="Control/BorderlessButton" to="Control/BorderlessButton" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="Control/BorderlessButton" to="Control/BorderlessButton" method="_on_mouse_exited"] +[connection signal="pressed" from="Control/BorderlessButton" to="Control/BorderlessButton" method="_on_pressed"] +[connection signal="mouse_entered" from="Control/WindowedButton" to="Control/WindowedButton" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="Control/WindowedButton" to="Control/WindowedButton" method="_on_mouse_exited"] +[connection signal="pressed" from="Control/WindowedButton" to="Control/WindowedButton" method="_on_pressed"] + +[editable path="Control/LeftArrowButton"] +[editable path="Control/RightArrowButton"] diff --git a/core/game_menu/window_option_menu_button.gd b/core/game_menu/window_option_menu_button.gd index 2f36ef4..948bc3e 100644 --- a/core/game_menu/window_option_menu_button.gd +++ b/core/game_menu/window_option_menu_button.gd @@ -18,13 +18,11 @@ func select() -> void: if checkbox == null: checkbox = $%Checkbox checkbox.set_pressed(true) - #texture.modulate = Color(1,1,1,1) func deselect() -> void: if checkbox == null: checkbox = $%Checkbox checkbox.set_pressed(false) - #texture.modulate = Color(1,1,1,0) func disable() -> void: disabled = true diff --git a/core/game_menu/window_option_menu_button.tscn b/core/game_menu/window_option_menu_button.tscn index 8563093..4cd161c 100644 --- a/core/game_menu/window_option_menu_button.tscn +++ b/core/game_menu/window_option_menu_button.tscn @@ -27,11 +27,8 @@ custom_minimum_size = Vector2(30, 30) layout_mode = 2 size_flags_vertical = 4 mouse_filter = 2 -color = Color(1, 0.816975, 0.71932274, 1) [node name="ToggleTexture" parent="HBoxContainer/Checkbox" index="1" unique_id=1931011536] -visible = false -modulate = Color(1, 0.816975, 0.71932274, 1) custom_minimum_size = Vector2(25, 25) offset_left = -14.0 offset_top = -14.0