diff --git a/godot_ship/scenes/Credits.tscn b/godot_ship/scenes/Credits.tscn index 1a68115..cc16b06 100644 --- a/godot_ship/scenes/Credits.tscn +++ b/godot_ship/scenes/Credits.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://assets/font/Minecraft.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://script/options/Options.gd" type="Script" id=2] +[ext_resource path="res://script/credits/Credits.gd" type="Script" id=2] [ext_resource path="res://light_theme.tres" type="Theme" id=3] [sub_resource type="DynamicFont" id=1] @@ -269,4 +269,4 @@ __meta__ = { "_edit_use_anchors_": false } -[connection signal="pressed" from="Back" to="." method="_on_Button_pressed"] +[connection signal="pressed" from="Back" to="." method="_on_Back_pressed"] diff --git a/godot_ship/scenes/Title Screen.tscn b/godot_ship/scenes/Title Screen.tscn index 2750f97..8f04e9f 100644 --- a/godot_ship/scenes/Title Screen.tscn +++ b/godot_ship/scenes/Title Screen.tscn @@ -50,10 +50,16 @@ margin_right = 160.0 margin_bottom = 80.0 text = "Options" -[node name="Quit" type="Button" parent="VBoxContainer"] +[node name="Credits" type="Button" parent="VBoxContainer"] margin_top = 84.0 margin_right = 160.0 margin_bottom = 108.0 +text = "Credits" + +[node name="Quit" type="Button" parent="VBoxContainer"] +margin_top = 112.0 +margin_right = 160.0 +margin_bottom = 136.0 focus_neighbour_bottom = NodePath("../Singleplayer") text = "Quit" @@ -82,4 +88,5 @@ __meta__ = { [connection signal="pressed" from="VBoxContainer/Singleplayer" to="." method="_on_Singleplayer_pressed"] [connection signal="pressed" from="VBoxContainer/Multiplayer" to="." method="_on_Multiplayer_pressed"] [connection signal="pressed" from="VBoxContainer/Options" to="." method="_on_Options_pressed"] +[connection signal="pressed" from="VBoxContainer/Credits" to="." method="_on_Credits_pressed"] [connection signal="pressed" from="VBoxContainer/Quit" to="." method="_on_Quit_pressed"] diff --git a/godot_ship/script/Main.gd b/godot_ship/script/Main.gd index 0820385..20c47ef 100644 --- a/godot_ship/script/Main.gd +++ b/godot_ship/script/Main.gd @@ -4,6 +4,7 @@ extends Control onready var Title_Screen = preload("res://scenes/Title Screen.tscn") onready var Game = preload("res://scenes/Game/Game.tscn" ) onready var Options = preload("res://scenes/Options.tscn" ) +onready var Credits = preload("res://scenes/Credits.tscn" ) onready var Debug_Menu = preload("res://scenes/Debug Menu.tscn" ) # Themes @@ -71,6 +72,10 @@ func _on_scene_start(scene): instance = Options.instance() add_child (instance) return true + "Credits": + instance = Credits.instance() + add_child (instance) + return true "Title": instance = Title_Screen.instance() add_child (instance) diff --git a/godot_ship/script/credits/Credits.gd b/godot_ship/script/credits/Credits.gd new file mode 100644 index 0000000..fdd48eb --- /dev/null +++ b/godot_ship/script/credits/Credits.gd @@ -0,0 +1,22 @@ +extends Control + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass + + +func _on_Back_pressed(): + AudioBus.emit_signal("button_clicked") + queue_free() + pass # Replace with function body. diff --git a/godot_ship/script/title screen/Title Screen.gd b/godot_ship/script/title screen/Title Screen.gd index 0f8308a..4111b75 100644 --- a/godot_ship/script/title screen/Title Screen.gd +++ b/godot_ship/script/title screen/Title Screen.gd @@ -25,6 +25,11 @@ func _on_Options_pressed(): MessageBus.emit_signal("change_scene", "Options") queue_free() +func _on_Credits_pressed(): + AudioBus.emit_signal("button_clicked") + MessageBus.emit_signal("change_scene", "Credits") + queue_free() + func _on_Quit_pressed(): AudioBus.emit_signal("button_clicked") MessageBus.emit_signal("quit")