From d5d7d3e6301bca593b9b8b4100f7eee334c6024a Mon Sep 17 00:00:00 2001
From: Elouan <elouan.danilo@it-automation.fr>
Date: Sat, 25 Jan 2025 08:20:06 +0100
Subject: [PATCH] merge main to initTambour

---
 ressources/images/melodie-2.png.png.import    | 34 +++++++++++++++++++
 ressources/images/melodie-4.png.png.import    | 34 +++++++++++++++++++
 .../images/melodie_cote-2.png.png.import      | 34 +++++++++++++++++++
 .../images/melodie_cote-4.png.png.import      | 34 +++++++++++++++++++
 .../images/melodie_dos-2.png.png.import       | 34 +++++++++++++++++++
 .../images/melodie_dos-4.png.png.import       | 34 +++++++++++++++++++
 ressources/sons/blob-bobo.mp3.import          | 19 +++++++++++
 ressources/sons/poulpe-bobo.mp3.import        | 19 +++++++++++
 ressources/sons/roby-bobo.mp3.import          | 19 +++++++++++
 scenes/ecran_mort.tscn                        |  2 +-
 10 files changed, 262 insertions(+), 1 deletion(-)
 create mode 100644 ressources/images/melodie-2.png.png.import
 create mode 100644 ressources/images/melodie-4.png.png.import
 create mode 100644 ressources/images/melodie_cote-2.png.png.import
 create mode 100644 ressources/images/melodie_cote-4.png.png.import
 create mode 100644 ressources/images/melodie_dos-2.png.png.import
 create mode 100644 ressources/images/melodie_dos-4.png.png.import
 create mode 100644 ressources/sons/blob-bobo.mp3.import
 create mode 100644 ressources/sons/poulpe-bobo.mp3.import
 create mode 100644 ressources/sons/roby-bobo.mp3.import

diff --git a/ressources/images/melodie-2.png.png.import b/ressources/images/melodie-2.png.png.import
new file mode 100644
index 0000000..a950577
--- /dev/null
+++ b/ressources/images/melodie-2.png.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dnpbiuxu41tqr"
+path="res://.godot/imported/melodie-2.png.png-1e7ec568d7b7e533e118b9283b70a243.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/images/melodie-2.png.png"
+dest_files=["res://.godot/imported/melodie-2.png.png-1e7ec568d7b7e533e118b9283b70a243.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/ressources/images/melodie-4.png.png.import b/ressources/images/melodie-4.png.png.import
new file mode 100644
index 0000000..efdc52e
--- /dev/null
+++ b/ressources/images/melodie-4.png.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bnh6qj2mr7ni2"
+path="res://.godot/imported/melodie-4.png.png-42d7f34a3096af80d7b3a7d3a7b73e30.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/images/melodie-4.png.png"
+dest_files=["res://.godot/imported/melodie-4.png.png-42d7f34a3096af80d7b3a7d3a7b73e30.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/ressources/images/melodie_cote-2.png.png.import b/ressources/images/melodie_cote-2.png.png.import
new file mode 100644
index 0000000..9876145
--- /dev/null
+++ b/ressources/images/melodie_cote-2.png.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cm886u7l583eg"
+path="res://.godot/imported/melodie_cote-2.png.png-1fbf7de2f61b6cf29d5b1e195dc9a1b3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/images/melodie_cote-2.png.png"
+dest_files=["res://.godot/imported/melodie_cote-2.png.png-1fbf7de2f61b6cf29d5b1e195dc9a1b3.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/ressources/images/melodie_cote-4.png.png.import b/ressources/images/melodie_cote-4.png.png.import
new file mode 100644
index 0000000..0268265
--- /dev/null
+++ b/ressources/images/melodie_cote-4.png.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b4udql8psej1n"
+path="res://.godot/imported/melodie_cote-4.png.png-a7a6a259fd83bc3cb82e28583df75ead.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/images/melodie_cote-4.png.png"
+dest_files=["res://.godot/imported/melodie_cote-4.png.png-a7a6a259fd83bc3cb82e28583df75ead.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/ressources/images/melodie_dos-2.png.png.import b/ressources/images/melodie_dos-2.png.png.import
new file mode 100644
index 0000000..a05a80b
--- /dev/null
+++ b/ressources/images/melodie_dos-2.png.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dio8ciloxv6f"
+path="res://.godot/imported/melodie_dos-2.png.png-1a6d2dc47c396e3de82fda25bb80b34f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/images/melodie_dos-2.png.png"
+dest_files=["res://.godot/imported/melodie_dos-2.png.png-1a6d2dc47c396e3de82fda25bb80b34f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/ressources/images/melodie_dos-4.png.png.import b/ressources/images/melodie_dos-4.png.png.import
new file mode 100644
index 0000000..136b640
--- /dev/null
+++ b/ressources/images/melodie_dos-4.png.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b3848xxx4bumg"
+path="res://.godot/imported/melodie_dos-4.png.png-ca174ff4b410f929cf68409e5ffa0048.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/images/melodie_dos-4.png.png"
+dest_files=["res://.godot/imported/melodie_dos-4.png.png-ca174ff4b410f929cf68409e5ffa0048.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/ressources/sons/blob-bobo.mp3.import b/ressources/sons/blob-bobo.mp3.import
new file mode 100644
index 0000000..1f3d3ae
--- /dev/null
+++ b/ressources/sons/blob-bobo.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://5a1syiwvowk2"
+path="res://.godot/imported/blob-bobo.mp3-a17d23314def42dfb98b7e09aeeda943.mp3str"
+
+[deps]
+
+source_file="res://ressources/sons/blob-bobo.mp3"
+dest_files=["res://.godot/imported/blob-bobo.mp3-a17d23314def42dfb98b7e09aeeda943.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/ressources/sons/poulpe-bobo.mp3.import b/ressources/sons/poulpe-bobo.mp3.import
new file mode 100644
index 0000000..1a4f1c8
--- /dev/null
+++ b/ressources/sons/poulpe-bobo.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dp6xr1dkaab2u"
+path="res://.godot/imported/poulpe-bobo.mp3-ddbc62e50412213c95688398f4c2d8a6.mp3str"
+
+[deps]
+
+source_file="res://ressources/sons/poulpe-bobo.mp3"
+dest_files=["res://.godot/imported/poulpe-bobo.mp3-ddbc62e50412213c95688398f4c2d8a6.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/ressources/sons/roby-bobo.mp3.import b/ressources/sons/roby-bobo.mp3.import
new file mode 100644
index 0000000..2713b1f
--- /dev/null
+++ b/ressources/sons/roby-bobo.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://bduu3c4c05k6i"
+path="res://.godot/imported/roby-bobo.mp3-4c91f97263eb900e643d718eb309f330.mp3str"
+
+[deps]
+
+source_file="res://ressources/sons/roby-bobo.mp3"
+dest_files=["res://.godot/imported/roby-bobo.mp3-4c91f97263eb900e643d718eb309f330.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/scenes/ecran_mort.tscn b/scenes/ecran_mort.tscn
index 5b67c3e..8f3f87c 100644
--- a/scenes/ecran_mort.tscn
+++ b/scenes/ecran_mort.tscn
@@ -6,7 +6,7 @@
 [ext_resource type="Texture2D" uid="uid://dqfrqntx73do5" path="res://ressources/images/menu_jeu_button.svg" id="3_ecfx2"]
 [ext_resource type="Texture2D" uid="uid://kpss4kt07w8l" path="res://ressources/images/menu_jeu_button_survole.svg" id="4_jv24w"]
 
-[node name="Control" type="Control"]
+[node name="Control2" type="Control"]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0