Merge remote-tracking branch 'origin/master'

This commit is contained in:
Logan 2020-07-17 14:26:05 -05:00
commit e0301456a7
9 changed files with 177 additions and 6 deletions

View file

@ -0,0 +1,21 @@
[remap]
importer="wav"
type="AudioStreamSample"
path="res://.import/Hawaii Partii - Labyrinth (8-Bit).wav-510614bcb7d5cfd2ff8f19601b4cdc47.sample"
[deps]
source_file="res://Music and Fonts(Misc.)/Hawaii Partii - Labyrinth (8-Bit).wav"
dest_files=[ "res://.import/Hawaii Partii - Labyrinth (8-Bit).wav-510614bcb7d5cfd2ff8f19601b4cdc47.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=true
compress/mode=0

View file

@ -0,0 +1,21 @@
[remap]
importer="wav"
type="AudioStreamSample"
path="res://.import/Hawaii Partii - Stranded Lullaby(8-Bit).wav-de6591e062fec68f033210a2e9cdbdd0.sample"
[deps]
source_file="res://Music and Fonts(Misc.)/Hawaii Partii - Stranded Lullaby(8-Bit).wav"
dest_files=[ "res://.import/Hawaii Partii - Stranded Lullaby(8-Bit).wav-de6591e062fec68f033210a2e9cdbdd0.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=true
compress/mode=0

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=7 format=2]
[gd_scene load_steps=8 format=2]
<<<<<<< Updated upstream:Title/Tilte.tscn
[ext_resource path="res://Title/Quit 1.png" type="Texture" id=1]
@ -51,5 +51,10 @@ expand = true
__meta__ = {
"_edit_use_anchors_": false
}
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 7 )
volume_db = -36.349
autoplay = true
[connection signal="pressed" from="TextureButton" to="." method="_on_TextureButton_pressed"]
[connection signal="pressed" from="TextureButton2" to="." method="_on_TextureButton2_pressed"]

File diff suppressed because one or more lines are too long

View file

@ -75,6 +75,16 @@ texture={
"stream": false,
"svg/scale": 1.0
}
wav={
"compress/mode": 0,
"edit/loop": true,
"edit/normalize": false,
"edit/trim": false,
"force/8_bit": false,
"force/max_rate": false,
"force/max_rate_hz": 44100,
"force/mono": false
}
[input]

View file

@ -13,4 +13,4 @@ func launch(direction: Vector2):
velocity = direction * speed
func on_impact():
queue_free()
queue_free()