Skip to content

Commit

Permalink
Merge branch 'main' into tyty/Issue-139/Add-Music
Browse files Browse the repository at this point in the history
  • Loading branch information
Tysterman74 committed Dec 17, 2024
2 parents 905c198 + a566b7e commit 67856e9
Show file tree
Hide file tree
Showing 34 changed files with 1,441 additions and 11 deletions.
102 changes: 102 additions & 0 deletions #Scenes/License.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
[gd_scene load_steps=4 format=3 uid="uid://be5a748kcls0f"]

[ext_resource type="Script" path="res://#Scenes/SceneScripts/license.gd" id="1_qwpco"]

[sub_resource type="Gradient" id="Gradient_w1cvb"]
colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)

[sub_resource type="GradientTexture2D" id="GradientTexture2D_crixh"]
gradient = SubResource("Gradient_w1cvb")

[node name="Control" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_qwpco")

[node name="TextureRect" type="TextureRect" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
texture = SubResource("GradientTexture2D_crixh")

[node name="VBoxContainer" type="VBoxContainer" parent="."]
layout_mode = 0
offset_left = 55.0
offset_right = 372.0
offset_bottom = 121.0

[node name="Godot Engine" type="Button" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 40
text = "Godot Engine"

[node name="Dialogue Manager" type="Button" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 40
text = "Dialogue Manager"

[node name="Smooth scroll" type="Button" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 40
text = "Smooth scroll"

[node name="Free type" type="Button" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 40
text = "Free type"

[node name="ENet" type="Button" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 40
text = "ENet"

[node name="mbed TLS" type="Button" parent="VBoxContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 40
text = "mbed TLS"

[node name="License label" type="Label" parent="."]
layout_mode = 1
anchors_preset = 3
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -1447.0
offset_top = -1044.0
offset_right = -47.0
offset_bottom = -34.0
grow_horizontal = 0
grow_vertical = 0
theme_override_font_sizes/font_size = 30
text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam cursus ex at vulputate tincidunt. Praesent convallis augue ac nisi sollicitudin consectetur. Sed consequat consectetur vestibulum. Nulla elementum ex at neque porttitor, ut volutpat est lobortis. Suspendisse eget finibus lacus. Duis est neque, placerat sit amet odio et, placerat vehicula nisl. Praesent eu egestas leo. Maecenas quis sapien ullamcorper, aliquet ex sed, vestibulum libero. Nam in eros finibus, sagittis dui et, laoreet odio. Proin eros neque, ultricies et sagittis in, mattis in arcu. Morbi volutpat orci dui, eget tincidunt libero tempor quis. Quisque at arcu euismod purus blandit vehicula eget vitae mi. Morbi vel vehicula eros. "
autowrap_mode = 2

[node name="GoBack" type="Button" parent="."]
layout_mode = 1
anchors_preset = 2
anchor_top = 1.0
anchor_bottom = 1.0
offset_left = 33.0
offset_top = -241.0
offset_right = 408.0
offset_bottom = -19.0
grow_vertical = 0
theme_override_font_sizes/font_size = 60
text = "Go back to
main menu"

[connection signal="pressed" from="VBoxContainer/Godot Engine" to="." method="_on_godot_engine_pressed"]
[connection signal="pressed" from="VBoxContainer/Dialogue Manager" to="." method="_on_dialogue_manager_pressed"]
[connection signal="pressed" from="VBoxContainer/Smooth scroll" to="." method="_on_smooth_scroll_pressed"]
[connection signal="pressed" from="VBoxContainer/Free type" to="." method="_on_free_type_pressed"]
[connection signal="pressed" from="VBoxContainer/ENet" to="." method="_on_e_net_pressed"]
[connection signal="pressed" from="VBoxContainer/mbed TLS" to="." method="_on_mbed_tls_pressed"]
[connection signal="pressed" from="GoBack" to="." method="_on_go_back_pressed"]
2 changes: 1 addition & 1 deletion #Scenes/MainMenu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ layout_mode = 2
size_flags_vertical = 3
focus_neighbor_top = NodePath("../Options")
focus_neighbor_bottom = NodePath("../Quit")
disabled = true
texture_normal = ExtResource("9_70yof")
texture_hover = ExtResource("10_vce0e")
texture_focused = ExtResource("10_vce0e")
Expand Down Expand Up @@ -126,5 +125,6 @@ cancel_button_text = "No"
[connection signal="pressed" from="Menu buttons/Continue" to="." method="_on_continue_pressed"]
[connection signal="pressed" from="Menu buttons/New game" to="." method="_on_start_pressed"]
[connection signal="pressed" from="Menu buttons/Options" to="." method="_on_options_pressed"]
[connection signal="pressed" from="Menu buttons/Credits" to="." method="_on_credits_pressed"]
[connection signal="pressed" from="Menu buttons/Quit" to="." method="_on_quit_pressed"]
[connection signal="confirmed" from="StartNewGameDialog" to="." method="_on_start_new_game_dialog_confirmed"]
17 changes: 17 additions & 0 deletions #Scenes/OptionsMenu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,21 @@ grow_horizontal = 2
grow_vertical = 2
icon = ExtResource("1_a6abe")

[node name="License" type="Button" parent="."]
layout_mode = 1
anchors_preset = 3
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -423.0
offset_top = -141.0
offset_right = -70.0
offset_bottom = -52.0
grow_horizontal = 0
grow_vertical = 0
theme_override_font_sizes/font_size = 50
text = "License"

[connection signal="pressed" from="Back" to="." method="_on_back_pressed"]
[connection signal="pressed" from="License" to="." method="_on_license_pressed"]
4 changes: 4 additions & 0 deletions #Scenes/SceneScripts/MainMenu.gd
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ func _on_quit_pressed() -> void:
get_tree().quit()


## Go to the credits
func _on_credits_pressed() -> void:
SceneManager.goto_scene("res://#Scenes/credits.tscn")

func _on_start_new_game_dialog_confirmed() -> void:
SaveManager.clear_data()
_init_managers()
Expand Down
4 changes: 4 additions & 0 deletions #Scenes/SceneScripts/OptionsMenu.gd
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ extends Control

func _on_back_pressed() -> void:
SceneManager.goto_scene("res://#Scenes/MainMenu.tscn")


func _on_license_pressed() -> void:
SceneManager.goto_scene("res://#Scenes/License.tscn")
Loading

0 comments on commit 67856e9

Please sign in to comment.