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

2026-02-21 14:40:56 +01:00
parent dbceb3e684 65645d976a
commit e7e2d5ec1e
322 changed files with 8631 additions and 2761 deletions
--- a/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import
+++ b/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import
@@ -12,8 +12,14 @@ dest_files=["res://.godot/imported/ship_music.ogg-a35a322e3a6a4adafae0f2adcaf212

 [params]

+<<<<<<< HEAD
 loop=true
 loop_offset=0.0
 bpm=0.0
+=======
+loop=false
+loop_offset=0
+bpm=0
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 beat_count=0
 bar_beats=4