diff --git a/bbounce1.wav b/bbounce1.wav new file mode 100644 index 0000000..c31db32 --- /dev/null +++ b/bbounce1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c89abc11a3bf3e9fc038c9c7af372c5420c63b1c05a2def5929fdcba2b726046 +size 37396 diff --git a/bbounce1.wav.import b/bbounce1.wav.import new file mode 100644 index 0000000..e83b173 --- /dev/null +++ b/bbounce1.wav.import @@ -0,0 +1,16 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/bbounce1.wav-79112530a7b37a85d14656fcb0c07570.sample" + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=true +edit/normalize=true +edit/loop=false +compress/mode=0 diff --git a/bbounce2.wav b/bbounce2.wav new file mode 100644 index 0000000..9144487 --- /dev/null +++ b/bbounce2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ececa991cc24ebbbd518082bac54e9c6a7da4158bd04cd5345bc0ea958b7c34 +size 37396 diff --git a/bbounce2.wav.import b/bbounce2.wav.import new file mode 100644 index 0000000..56b5821 --- /dev/null +++ b/bbounce2.wav.import @@ -0,0 +1,16 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/bbounce2.wav-6cc5769e5bc0d07cde0fc8d7e5168988.sample" + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=true +edit/normalize=true +edit/loop=false +compress/mode=0 diff --git a/bounce1.wav b/bounce1.wav deleted file mode 100644 index 10e8817..0000000 --- a/bounce1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31063f0c41c7dc4701176eff54c1811d1a8a88a41b1033e93af61bc400b8fdef -size 10188 diff --git a/cheer.wav b/cheer.wav new file mode 100644 index 0000000..e157e6b --- /dev/null +++ b/cheer.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c065447ca08094ff79a70a367cc002293a7faac72f1ead49f672595b8e35469 +size 1004252 diff --git a/bounce1.wav.import b/cheer.wav.import similarity index 73% rename from bounce1.wav.import rename to cheer.wav.import index ad2e2b8..8d2c902 100644 --- a/bounce1.wav.import +++ b/cheer.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamSample" -path="res://.import/bounce1.wav-03304e4f3b8c5221bfea1662f69dd036.sample" +path="res://.import/cheer.wav-c06d5457c932fe27d8344db82afda5ed.sample" [params] diff --git a/pong.tscn b/pong.tscn index 5ccf960..1e93d62 100644 --- a/pong.tscn +++ b/pong.tscn @@ -1,11 +1,14 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://pong.vs" type="Script" id=1] [ext_resource path="res://left_pallete.png" type="Texture" id=2] [ext_resource path="res://right_pallete.png" type="Texture" id=3] [ext_resource path="res://separator.png" type="Texture" id=4] [ext_resource path="res://ball.png" type="Texture" id=5] -[ext_resource path="res://bounce1.wav" type="AudioStream" id=6] +[ext_resource path="res://bbounce1.wav" type="AudioStream" id=6] +[ext_resource path="res://bbounce2.wav" type="AudioStream" id=7] +[ext_resource path="res://wallbounce.wav" type="AudioStream" id=8] +[ext_resource path="res://cheer.wav" type="AudioStream" id=9] [node name="Node2D" type="Node2D"] @@ -34,7 +37,31 @@ texture = ExtResource( 5 ) [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource( 6 ) -volume_db = 5.0 +volume_db = 0.0 +autoplay = false +mix_target = 0 +bus = "Master" + +[node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."] + +stream = ExtResource( 7 ) +volume_db = 0.0 +autoplay = false +mix_target = 0 +bus = "Master" + +[node name="AudioStreamPlayer3" type="AudioStreamPlayer" parent="."] + +stream = ExtResource( 8 ) +volume_db = 0.0 +autoplay = false +mix_target = 0 +bus = "Master" + +[node name="AudioStreamPlayer4" type="AudioStreamPlayer" parent="."] + +stream = ExtResource( 9 ) +volume_db = 0.0 autoplay = false mix_target = 0 bus = "Master" diff --git a/pong.vs b/pong.vs index 531723f..e8b8055 100644 Binary files a/pong.vs and b/pong.vs differ diff --git a/wallbounce.wav b/wallbounce.wav new file mode 100644 index 0000000..dbb1612 --- /dev/null +++ b/wallbounce.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5942b9dcc8ac8407d4a893ccb1f891a58f33528b2158953f3ef4b3ab512e49d +size 10486 diff --git a/wallbounce.wav.import b/wallbounce.wav.import new file mode 100644 index 0000000..b0fe8d4 --- /dev/null +++ b/wallbounce.wav.import @@ -0,0 +1,16 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/wallbounce.wav-7ec0e5e7cbc47c8efb8341d9e5b917d3.sample" + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=true +edit/normalize=true +edit/loop=false +compress/mode=0