Merged with Main and fixed conflicts
This commit is contained in:
@@ -11,3 +11,23 @@ func _on_new_game_button_pressed() -> void:
|
||||
func _on_quit_button_pressed() -> void:
|
||||
emit_signal('complete', 'quit')
|
||||
return
|
||||
|
||||
|
||||
func _on_Quit_Button_mouse_entered() -> void:
|
||||
get_node("Menu-Select").play(0.0)
|
||||
return
|
||||
|
||||
|
||||
func _on_Credits_Button_mouse_entered() -> void:
|
||||
get_node("Menu-Select").play(0.0)
|
||||
return
|
||||
|
||||
|
||||
func _on_Settings_Button_mouse_entered() -> void:
|
||||
get_node("Menu-Select").play(0.0)
|
||||
return
|
||||
|
||||
|
||||
func _on_New_Game_Button_mouse_entered() -> void:
|
||||
get_node("Menu-Select").play(0.0)
|
||||
return
|
||||
|
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=16 format=2]
|
||||
[gd_scene load_steps=18 format=2]
|
||||
|
||||
[ext_resource path="res://Sprites/Menus/Main Menu/Settings_Button_Normal.png" type="Texture" id=1]
|
||||
[ext_resource path="res://Sprites/Menus/Main Menu/Continue_Button_Hover.png" type="Texture" id=2]
|
||||
@@ -14,6 +14,8 @@
|
||||
[ext_resource path="res://Sprites/Menus/Main Menu/Main_Menu_Background.png" type="Texture" id=12]
|
||||
[ext_resource path="res://Resources/Ash.tres" type="DynamicFontData" id=13]
|
||||
[ext_resource path="res://GUI/Main Menu.gd" type="Script" id=14]
|
||||
[ext_resource path="res://Music/Interface/main-menu.mp3" type="AudioStream" id=15]
|
||||
[ext_resource path="res://Sounds/Interface/menu-select.wav" type="AudioStream" id=16]
|
||||
|
||||
[sub_resource type="DynamicFont" id=1]
|
||||
size = 20
|
||||
@@ -122,5 +124,19 @@ margin_bottom = 15.0
|
||||
texture_normal = ExtResource( 8 )
|
||||
texture_hover = ExtResource( 11 )
|
||||
|
||||
[node name="BGM" type="AudioStreamPlayer" parent="."]
|
||||
pause_mode = 2
|
||||
stream = ExtResource( 15 )
|
||||
volume_db = -14.136
|
||||
autoplay = true
|
||||
|
||||
[node name="Menu-Select" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource( 16 )
|
||||
volume_db = -15.146
|
||||
|
||||
[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer2/New Game Button" to="." method="_on_New_Game_Button_mouse_entered"]
|
||||
[connection signal="pressed" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer2/New Game Button" to="." method="_on_new_game_button_pressed"]
|
||||
[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer3/Settings Button" to="." method="_on_Settings_Button_mouse_entered"]
|
||||
[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer4/Credits Button" to="." method="_on_Credits_Button_mouse_entered"]
|
||||
[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer5/Quit Button" to="." method="_on_Quit_Button_mouse_entered"]
|
||||
[connection signal="pressed" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer5/Quit Button" to="." method="_on_quit_button_pressed"]
|
||||
|
@@ -1,7 +1,8 @@
|
||||
[gd_scene load_steps=3 format=2]
|
||||
[gd_scene load_steps=4 format=2]
|
||||
|
||||
[ext_resource path="res://Sprites/Assets/Splash_Screen.png" type="Texture" id=1]
|
||||
[ext_resource path="res://GUI/Splash Screen.gd" type="Script" id=2]
|
||||
[ext_resource path="res://Music/Interface/splash.wav" type="AudioStream" id=3]
|
||||
|
||||
[node name="Splash Screen" type="Sprite"]
|
||||
self_modulate = Color( 1, 1, 1, 0 )
|
||||
@@ -10,3 +11,8 @@ centered = false
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="Tween" type="Tween" parent="."]
|
||||
|
||||
[node name="BGM" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource( 3 )
|
||||
volume_db = -15.146
|
||||
autoplay = true
|
||||
|
Reference in New Issue
Block a user