Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper
This commit is contained in:
commit
4f68431624
2
HUD.tscn
2
HUD.tscn
@ -149,6 +149,8 @@ margin_right = 1062.0
|
||||
margin_bottom = 653.0
|
||||
text = "Quit Game"
|
||||
|
||||
[node name="MenuMusic" type="AudioStreamPlayer" parent="."]
|
||||
|
||||
[connection signal="pressed" from="MenuLayer/Start/New Game" to="MenuLayer/Start" method="_on_New_Game_pressed"]
|
||||
[connection signal="pressed" from="MenuLayer/Start/Quit to Desktop" to="MenuLayer/Start" method="_on_Quit_to_Desktop_Button_pressed"]
|
||||
[connection signal="pressed" from="MenuLayer/Start/Quit Game" to="MenuLayer/Start" method="_on_Quit_Game_pressed"]
|
||||
|
@ -124,6 +124,15 @@ anims/basic_slap = SubResource( 6 )
|
||||
|
||||
[node name="AudioSlap" type="AudioStreamPlayer3D" parent="."]
|
||||
stream = ExtResource( 5 )
|
||||
bus = "SFX"
|
||||
|
||||
[node name="AudioMegaSlap" type="AudioStreamPlayer3D" parent="."]
|
||||
stream = ExtResource( 6 )
|
||||
bus = "SFX"
|
||||
emission_angle_enabled = true
|
||||
doppler_tracking = 2
|
||||
|
||||
[node name="Music" type="AudioStreamPlayer" parent="."]
|
||||
volume_db = 13.983
|
||||
autoplay = true
|
||||
bus = "Music"
|
||||
|
3
Start.gd
3
Start.gd
@ -4,8 +4,10 @@ var ingame = false
|
||||
onready var NewGame = $"New Game"
|
||||
onready var QuitGame = $"Quit Game"
|
||||
onready var QuitDesktop = $"Quit to Desktop"
|
||||
onready var Music = $"MenuMusic"
|
||||
|
||||
func _ready():
|
||||
Music.play()
|
||||
self.show()
|
||||
get_tree().paused = true
|
||||
QuitGame.hide()
|
||||
@ -21,6 +23,7 @@ func _on_New_Game_pressed():
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||
get_tree().paused = false
|
||||
ingame = true
|
||||
Music.stop()
|
||||
|
||||
func openMenu():
|
||||
if (ingame):
|
||||
|
15
default_bus_layout.tres
Normal file
15
default_bus_layout.tres
Normal file
@ -0,0 +1,15 @@
|
||||
[gd_resource type="AudioBusLayout" format=2]
|
||||
|
||||
[resource]
|
||||
bus/1/name = "SFX"
|
||||
bus/1/solo = false
|
||||
bus/1/mute = false
|
||||
bus/1/bypass_fx = false
|
||||
bus/1/volume_db = 0.0
|
||||
bus/1/send = "Master"
|
||||
bus/2/name = "Music"
|
||||
bus/2/solo = false
|
||||
bus/2/mute = false
|
||||
bus/2/bypass_fx = false
|
||||
bus/2/volume_db = 0.0
|
||||
bus/2/send = "Master"
|
Loading…
Reference in New Issue
Block a user