diff --git a/menus/about_menu.gd b/menus/about_menu.gd new file mode 100644 index 0000000..695e45a --- /dev/null +++ b/menus/about_menu.gd @@ -0,0 +1,6 @@ +extends Control + +var from_scene_name + +func _ready(): + pass diff --git a/menus/about_menu.tscn b/menus/about_menu.tscn new file mode 100644 index 0000000..4077eac --- /dev/null +++ b/menus/about_menu.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://menus/about_menu.gd" type="Script" id=1] + +[node name="about_menu" type="Control" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +script = ExtResource( 1 ) + + diff --git a/menus/load_menu.gd b/menus/load_menu.gd new file mode 100644 index 0000000..095f737 --- /dev/null +++ b/menus/load_menu.gd @@ -0,0 +1,6 @@ +extends Control + +var from_scene_name + +func _ready(): + pass \ No newline at end of file diff --git a/menus/load_menu.tscn b/menus/load_menu.tscn new file mode 100644 index 0000000..13eeb36 --- /dev/null +++ b/menus/load_menu.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://menus/load_menu.gd" type="Script" id=1] + +[node name="load_menu" type="Control" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +script = ExtResource( 1 ) + + diff --git a/menus/options_menu.tscn b/menus/options_menu.tscn index 647cfaa..d25ac90 100644 --- a/menus/options_menu.tscn +++ b/menus/options_menu.tscn @@ -126,7 +126,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 1024.0 -margin_bottom = 136.0 +margin_bottom = 184.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -145,7 +145,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 291.0 margin_right = 381.0 -margin_bottom = 136.0 +margin_bottom = 184.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -190,7 +190,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -[node name="read_speed_title" type="Label" parent="split/opts_panel/panels/game_opts" index="2"] +[node name="sep3" type="Control" parent="split/opts_panel/panels/game_opts" index="2"] anchor_left = 0.0 anchor_top = 0.0 @@ -198,7 +198,25 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 26.0 margin_right = 90.0 -margin_bottom = 40.0 +margin_bottom = 34.0 +rect_min_size = Vector2( 0, 8 ) +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +_sections_unfolded = [ "Rect" ] + +[node name="read_speed_title" type="Label" parent="split/opts_panel/panels/game_opts" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 38.0 +margin_right = 90.0 +margin_bottom = 52.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -211,15 +229,15 @@ percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[node name="read_speed_slider" type="HSlider" parent="split/opts_panel/panels/game_opts" index="3"] +[node name="read_speed_slider" type="HSlider" parent="split/opts_panel/panels/game_opts" index="4"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 44.0 +margin_top = 56.0 margin_right = 90.0 -margin_bottom = 60.0 +margin_bottom = 72.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -239,16 +257,16 @@ tick_count = 0 ticks_on_borders = false focus_mode = 2 -[node name="read_speed_test" type="Button" parent="split/opts_panel/panels/game_opts" index="4"] +[node name="read_speed_test" type="Button" parent="split/opts_panel/panels/game_opts" index="5"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 23.0 -margin_top = 64.0 +margin_top = 76.0 margin_right = 66.0 -margin_bottom = 84.0 +margin_bottom = 96.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -278,7 +296,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 385.0 margin_right = 389.0 -margin_bottom = 136.0 +margin_bottom = 184.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -295,7 +313,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 393.0 margin_right = 490.0 -margin_bottom = 136.0 +margin_bottom = 184.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -340,7 +358,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -[node name="window_size_title" type="Label" parent="split/opts_panel/panels/display_opts" index="2"] +[node name="sep2" type="Control" parent="split/opts_panel/panels/display_opts" index="2"] anchor_left = 0.0 anchor_top = 0.0 @@ -348,7 +366,25 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 26.0 margin_right = 97.0 -margin_bottom = 40.0 +margin_bottom = 34.0 +rect_min_size = Vector2( 0, 8 ) +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +_sections_unfolded = [ "Rect" ] + +[node name="window_size_title" type="Label" parent="split/opts_panel/panels/display_opts" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 38.0 +margin_right = 97.0 +margin_bottom = 52.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -361,15 +397,15 @@ percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[node name="window_size_menu" type="MenuButton" parent="split/opts_panel/panels/display_opts" index="3"] +[node name="window_size_menu" type="MenuButton" parent="split/opts_panel/panels/display_opts" index="4"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 44.0 +margin_top = 56.0 margin_right = 97.0 -margin_bottom = 60.0 +margin_bottom = 72.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -392,36 +428,55 @@ align = 1 items = [ "1920x1080", null, 0, false, false, -1, 0, null, "", false ] _sections_unfolded = [ "custom_colors", "custom_constants", "custom_fonts", "custom_styles" ] -[node name="window_mode_title" type="Label" parent="split/opts_panel/panels/display_opts" index="4"] +[node name="sep" type="Control" parent="split/opts_panel/panels/display_opts" index="5"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 64.0 +margin_top = 76.0 margin_right = 97.0 -margin_bottom = 78.0 +margin_bottom = 84.0 +rect_min_size = Vector2( 0, 8 ) +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +_sections_unfolded = [ "Rect" ] + +[node name="window_mode_title" type="Label" parent="split/opts_panel/panels/display_opts" index="6"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 88.0 +margin_right = 97.0 +margin_bottom = 102.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 4 -text = "window size" +text = "window mode" align = 1 percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 +_sections_unfolded = [ "Margin" ] -[node name="window_mode_menu" type="MenuButton" parent="split/opts_panel/panels/display_opts" index="5"] +[node name="window_mode_menu" type="MenuButton" parent="split/opts_panel/panels/display_opts" index="7"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 82.0 +margin_top = 106.0 margin_right = 97.0 -margin_bottom = 98.0 +margin_bottom = 122.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -452,7 +507,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 494.0 margin_right = 498.0 -margin_bottom = 136.0 +margin_bottom = 184.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -462,14 +517,13 @@ size_flags_vertical = 1 [node name="sound_opts" type="VBoxContainer" parent="split/opts_panel/panels" index="4"] -editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 502.0 margin_right = 599.0 -margin_bottom = 136.0 +margin_bottom = 184.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -513,7 +567,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -[node name="master_vol_title" type="Label" parent="split/opts_panel/panels/sound_opts" index="2"] +[node name="sep4" type="Control" parent="split/opts_panel/panels/sound_opts" index="2"] anchor_left = 0.0 anchor_top = 0.0 @@ -521,7 +575,25 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 26.0 margin_right = 97.0 -margin_bottom = 40.0 +margin_bottom = 34.0 +rect_min_size = Vector2( 0, 8 ) +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +_sections_unfolded = [ "Rect" ] + +[node name="master_vol_title" type="Label" parent="split/opts_panel/panels/sound_opts" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 38.0 +margin_right = 97.0 +margin_bottom = 52.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -534,15 +606,15 @@ percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[node name="master_vol_slider" type="HSlider" parent="split/opts_panel/panels/sound_opts" index="3"] +[node name="master_vol_slider" type="HSlider" parent="split/opts_panel/panels/sound_opts" index="4"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 44.0 +margin_top = 56.0 margin_right = 97.0 -margin_bottom = 60.0 +margin_bottom = 72.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -550,11 +622,11 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 0 -min_value = 0.0 +min_value = 1.0 max_value = 100.0 step = 1.0 page = 0.0 -value = 0.0 +value = 1.0 exp_edit = false rounded = false editable = true @@ -562,15 +634,33 @@ tick_count = 0 ticks_on_borders = false focus_mode = 2 -[node name="music_vol_title" type="Label" parent="split/opts_panel/panels/sound_opts" index="4"] +[node name="sep2" type="Control" parent="split/opts_panel/panels/sound_opts" index="5"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 64.0 +margin_top = 76.0 margin_right = 97.0 -margin_bottom = 78.0 +margin_bottom = 84.0 +rect_min_size = Vector2( 0, 8 ) +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +_sections_unfolded = [ "Rect" ] + +[node name="music_vol_title" type="Label" parent="split/opts_panel/panels/sound_opts" index="6"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 88.0 +margin_right = 97.0 +margin_bottom = 102.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -583,15 +673,15 @@ percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[node name="music_vol_slider" type="HSlider" parent="split/opts_panel/panels/sound_opts" index="5"] +[node name="music_vol_slider" type="HSlider" parent="split/opts_panel/panels/sound_opts" index="7"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 82.0 +margin_top = 106.0 margin_right = 97.0 -margin_bottom = 98.0 +margin_bottom = 122.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -611,15 +701,33 @@ tick_count = 0 ticks_on_borders = false focus_mode = 2 -[node name="sfx_vol_title" type="Label" parent="split/opts_panel/panels/sound_opts" index="6"] +[node name="sep3" type="Control" parent="split/opts_panel/panels/sound_opts" index="8"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 102.0 +margin_top = 126.0 margin_right = 97.0 -margin_bottom = 116.0 +margin_bottom = 134.0 +rect_min_size = Vector2( 0, 8 ) +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +_sections_unfolded = [ "Rect" ] + +[node name="sfx_vol_title" type="Label" parent="split/opts_panel/panels/sound_opts" index="9"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 138.0 +margin_right = 97.0 +margin_bottom = 152.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -632,15 +740,15 @@ percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[node name="sfx_vol_slider" type="HSlider" parent="split/opts_panel/panels/sound_opts" index="7"] +[node name="sfx_vol_slider" type="HSlider" parent="split/opts_panel/panels/sound_opts" index="10"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 120.0 +margin_top = 156.0 margin_right = 97.0 -margin_bottom = 136.0 +margin_bottom = 172.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -660,6 +768,24 @@ tick_count = 0 ticks_on_borders = false focus_mode = 2 +[node name="sep5" type="Control" parent="split/opts_panel/panels/sound_opts" index="11"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 176.0 +margin_right = 97.0 +margin_bottom = 184.0 +rect_min_size = Vector2( 0, 8 ) +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +_sections_unfolded = [ "Rect" ] + [node name="vsep3" type="VSeparator" parent="split/opts_panel/panels" index="5"] anchor_left = 0.0 @@ -668,7 +794,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 603.0 margin_right = 607.0 -margin_bottom = 136.0 +margin_bottom = 184.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -684,7 +810,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 611.0 margin_right = 732.0 -margin_bottom = 136.0 +margin_bottom = 184.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -735,9 +861,9 @@ anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 margin_left = -52.0 -margin_top = 130.0 +margin_top = 210.0 margin_right = 47.0 -margin_bottom = 150.0 +margin_bottom = 230.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2