Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper
This commit is contained in:
		
							
								
								
									
										
											BIN
										
									
								
								Audio/menumusic.ogg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Audio/menumusic.ogg
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										15
									
								
								Audio/menumusic.ogg.import
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								Audio/menumusic.ogg.import
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | [remap] | ||||||
|  |  | ||||||
|  | importer="ogg_vorbis" | ||||||
|  | type="AudioStreamOGGVorbis" | ||||||
|  | path="res://.import/menumusic.ogg-0b4ab77f8839c433ffe3f01db734eb12.oggstr" | ||||||
|  |  | ||||||
|  | [deps] | ||||||
|  |  | ||||||
|  | source_file="res://Audio/menumusic.ogg" | ||||||
|  | dest_files=[ "res://.import/menumusic.ogg-0b4ab77f8839c433ffe3f01db734eb12.oggstr" ] | ||||||
|  |  | ||||||
|  | [params] | ||||||
|  |  | ||||||
|  | loop=true | ||||||
|  | loop_offset=0 | ||||||
							
								
								
									
										23
									
								
								Audio/menumusic.wav.import
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								Audio/menumusic.wav.import
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | |||||||
|  | [remap] | ||||||
|  |  | ||||||
|  | importer="wav" | ||||||
|  | type="AudioStreamSample" | ||||||
|  | path="res://.import/menumusic.wav-40846d90b2f065f614db712c37889347.sample" | ||||||
|  |  | ||||||
|  | [deps] | ||||||
|  |  | ||||||
|  | source_file="res://Audio/menumusic.wav" | ||||||
|  | dest_files=[ "res://.import/menumusic.wav-40846d90b2f065f614db712c37889347.sample" ] | ||||||
|  |  | ||||||
|  | [params] | ||||||
|  |  | ||||||
|  | force/8_bit=false | ||||||
|  | force/mono=false | ||||||
|  | force/max_rate=false | ||||||
|  | force/max_rate_hz=44100 | ||||||
|  | edit/trim=false | ||||||
|  | edit/normalize=false | ||||||
|  | edit/loop_mode=0 | ||||||
|  | edit/loop_begin=0 | ||||||
|  | edit/loop_end=-1 | ||||||
|  | compress/mode=0 | ||||||
							
								
								
									
										4
									
								
								HUD.tscn
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								HUD.tscn
									
									
									
									
									
								
							| @@ -1,8 +1,9 @@ | |||||||
| [gd_scene load_steps=9 format=2] | [gd_scene load_steps=10 format=2] | ||||||
|  |  | ||||||
| [ext_resource path="res://SlapGauge.gd" type="Script" id=1] | [ext_resource path="res://SlapGauge.gd" type="Script" id=1] | ||||||
| [ext_resource path="res://Start.gd" type="Script" id=2] | [ext_resource path="res://Start.gd" type="Script" id=2] | ||||||
| [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=3] | [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=3] | ||||||
|  | [ext_resource path="res://Audio/menumusic.ogg" type="AudioStream" id=4] | ||||||
|  |  | ||||||
| [sub_resource type="DynamicFont" id=4] | [sub_resource type="DynamicFont" id=4] | ||||||
| size = 19 | size = 19 | ||||||
| @@ -150,6 +151,7 @@ margin_bottom = 653.0 | |||||||
| text = "Quit Game" | text = "Quit Game" | ||||||
|  |  | ||||||
| [node name="MenuMusic" type="AudioStreamPlayer" parent="MenuLayer/Start"] | [node name="MenuMusic" type="AudioStreamPlayer" parent="MenuLayer/Start"] | ||||||
|  | stream = ExtResource( 4 ) | ||||||
|  |  | ||||||
| [connection signal="pressed" from="MenuLayer/Start/New Game" to="MenuLayer/Start" method="_on_New_Game_pressed"] | [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 to Desktop" to="MenuLayer/Start" method="_on_Quit_to_Desktop_Button_pressed"] | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user