Merge branch 'musique_et_son_3' of https://git.zacharie-guet.fr/zacharie/seeding-planets into musique_et_son_3
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
importer="wav"
|
||||
type="AudioStreamWAV"
|
||||
<<<<<<<< HEAD:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import
|
||||
uid="uid://dh3oho0pis6jv"
|
||||
path="res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"
|
||||
|
||||
@@ -9,6 +10,15 @@ path="res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.
|
||||
|
||||
source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav"
|
||||
dest_files=["res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"]
|
||||
========
|
||||
uid="uid://c6jdmdjncamcu"
|
||||
path="res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav"
|
||||
dest_files=["res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"]
|
||||
>>>>>>>> f7f1d2be2c5b797138414266ce6324e8a3ff748f:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import
|
||||
|
||||
[params]
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
importer="wav"
|
||||
type="AudioStreamWAV"
|
||||
<<<<<<<< HEAD:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import
|
||||
uid="uid://c6jdmdjncamcu"
|
||||
path="res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"
|
||||
|
||||
@@ -9,6 +10,15 @@ path="res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a
|
||||
|
||||
source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav"
|
||||
dest_files=["res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"]
|
||||
========
|
||||
uid="uid://dh3oho0pis6jv"
|
||||
path="res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav"
|
||||
dest_files=["res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"]
|
||||
>>>>>>>> f7f1d2be2c5b797138414266ce6324e8a3ff748f:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import
|
||||
|
||||
[params]
|
||||
|
||||
|
||||
BIN
common/audio_manager/assets/sfx/tractor_beam/drop.wav
Normal file
BIN
common/audio_manager/assets/sfx/tractor_beam/drop.wav
Normal file
Binary file not shown.
24
common/audio_manager/assets/sfx/tractor_beam/drop.wav.import
Normal file
24
common/audio_manager/assets/sfx/tractor_beam/drop.wav.import
Normal file
@@ -0,0 +1,24 @@
|
||||
[remap]
|
||||
|
||||
importer="wav"
|
||||
type="AudioStreamWAV"
|
||||
uid="uid://cam4vv1am40dy"
|
||||
path="res://.godot/imported/drop.wav-b76e8a2f6f5f0c41737e74496f01ceaa.sample"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://common/audio_manager/assets/sfx/tractor_beam/drop.wav"
|
||||
dest_files=["res://.godot/imported/drop.wav-b76e8a2f6f5f0c41737e74496f01ceaa.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=2
|
||||
BIN
common/audio_manager/assets/sfx/tractor_beam/take.wav
Normal file
BIN
common/audio_manager/assets/sfx/tractor_beam/take.wav
Normal file
Binary file not shown.
24
common/audio_manager/assets/sfx/tractor_beam/take.wav.import
Normal file
24
common/audio_manager/assets/sfx/tractor_beam/take.wav.import
Normal file
@@ -0,0 +1,24 @@
|
||||
[remap]
|
||||
|
||||
importer="wav"
|
||||
type="AudioStreamWAV"
|
||||
uid="uid://bdrdnli5k27a2"
|
||||
path="res://.godot/imported/take.wav-d597c4daf1adbf3b061372ab36ef9940.sample"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://common/audio_manager/assets/sfx/tractor_beam/take.wav"
|
||||
dest_files=["res://.godot/imported/take.wav-d597c4daf1adbf3b061372ab36ef9940.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=2
|
||||
Reference in New Issue
Block a user