zacharie/seeding-planets
2
2
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'musique_et_son_3' of https://git.zacharie-guet.fr/zacharie/seeding-planets into musique_et_son_3

Browse Source
This commit is contained in:
Nilou
2026-06-16 15:46:28 +02:00
parent 99f804b6e9 f7f1d2be2c
commit 9ab67f2b98
502 changed files with 11724 additions and 2254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import
View File

@@ -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]

10
common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import
View File

@@ -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]