diff --git a/cmi2/scenes/Settings.tscn b/cmi2/scenes/Settings.tscn
index fd78da17b3d309889efbea79be7b19eff39cfec8..80c847cf209f3612cb361996057d52ee1c478563 100644
--- a/cmi2/scenes/Settings.tscn
+++ b/cmi2/scenes/Settings.tscn
@@ -1,77 +1,77 @@
-[gd_scene load_steps=24 format=2]
+[gd_scene load_steps=30 format=2]
[ext_resource path="res://scenes/settings.gd" type="Script" id=1]
-[ext_resource path="res://themes/mainTitleTheme.tres" type="Theme" id=2]
-[ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=3]
-[ext_resource path="res://themes/settings_sliders.tres" type="Theme" id=4]
-[ext_resource path="res://assets/anim/sceneFadeIn.tres" type="Animation" id=5]
-[ext_resource path="res://themes/buttonAsideTheme.tres" type="Theme" id=6]
-[ext_resource path="res://assets/fonts/montserrat/Montserrat-SemiBold.otf" type="DynamicFontData" id=7]
+[ext_resource path="res://assets/allPage/mainTitle.png" type="Texture" id=2]
+[ext_resource path="res://assets/allPage/backbutton.png" type="Texture" id=3]
+[ext_resource path="res://assets/allPage/backbuttonhover.png" type="Texture" id=4]
+[ext_resource path="res://themes/mainTitleTheme.tres" type="Theme" id=5]
+[ext_resource path="res://assets/allPage/options.png" type="Texture" id=6]
+[ext_resource path="res://assets/allPage/optionshover.png" type="Texture" id=7]
+[ext_resource path="res://themes/leftAsidePanel.tres" type="Theme" id=8]
+[ext_resource path="res://themes/buttonAsideTheme.tres" type="Theme" id=9]
+[ext_resource path="res://assets/fonts/montserrat/Montserrat-SemiBold.otf" type="DynamicFontData" id=10]
+[ext_resource path="res://themes/multiModeButton.tres" type="Theme" id=11]
+[ext_resource path="res://themes/rightPanel.tres" type="Theme" id=12]
+[ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=13]
+[ext_resource path="res://themes/settings_sliders.tres" type="Theme" id=14]
+[ext_resource path="res://assets/anim/sceneFadeIn.tres" type="Animation" id=15]
[sub_resource type="StreamTexture" id=1]
flags = 4
load_path = "res://.import/fondmain.png-5cacf097c29a602acc49f5cd5857be99.stex"
-[sub_resource type="StreamTexture" id=2]
-flags = 4
-load_path = "res://.import/backbutton.png-8fee6ad7734c1d3f863cd9a46768a3bb.stex"
-
-[sub_resource type="StreamTexture" id=3]
-flags = 4
-load_path = "res://.import/backbuttonhover.png-4209a77808e79ad7977c995e604658a6.stex"
-
-[sub_resource type="DynamicFont" id=4]
+[sub_resource type="DynamicFont" id=2]
size = 25
-font_data = ExtResource( 7 )
+font_data = ExtResource( 10 )
-[sub_resource type="Gradient" id=5]
+[sub_resource type="Gradient" id=3]
colors = PoolColorArray( 1, 0.0859375, 0.717015, 1, 0.990068, 0.849416, 0.251384, 1 )
-[sub_resource type="GradientTexture" id=6]
-gradient = SubResource( 5 )
+[sub_resource type="GradientTexture" id=4]
+gradient = SubResource( 3 )
-[sub_resource type="StyleBoxTexture" id=7]
-texture = SubResource( 6 )
+[sub_resource type="StyleBoxTexture" id=5]
+texture = SubResource( 4 )
region_rect = Rect2( 0, 0, 2048, 1 )
margin_left = 10.0
margin_right = 10.0
margin_top = 5.0
margin_bottom = 5.0
-[sub_resource type="DynamicFont" id=8]
+[sub_resource type="DynamicFont" id=6]
size = 22
-font_data = ExtResource( 3 )
+font_data = ExtResource( 13 )
-[sub_resource type="StreamTexture" id=9]
+[sub_resource type="StreamTexture" id=7]
flags = 4
load_path = "res://.import/speaker.png-5c3c8a0199ecad529758a0fe846cfe9b.stex"
-[sub_resource type="StreamTexture" id=10]
+[sub_resource type="StreamTexture" id=8]
flags = 4
load_path = "res://.import/speaker.png-5c3c8a0199ecad529758a0fe846cfe9b.stex"
-[sub_resource type="Gradient" id=11]
+[sub_resource type="Gradient" id=9]
colors = PoolColorArray( 1, 0.833374, 0.179688, 1, 0.664188, 0.148453, 0.808594, 1 )
-[sub_resource type="GradientTexture" id=12]
-gradient = SubResource( 11 )
+[sub_resource type="GradientTexture" id=10]
+gradient = SubResource( 9 )
-[sub_resource type="StyleBoxTexture" id=13]
-texture = SubResource( 12 )
+[sub_resource type="StyleBoxTexture" id=11]
+texture = SubResource( 10 )
region_rect = Rect2( 0, 0, 2048, 1 )
margin_left = 10.0
margin_right = 10.0
margin_top = 5.0
margin_bottom = 5.0
-[sub_resource type="Gradient" id=14]
+[sub_resource type="Gradient" id=12]
colors = PoolColorArray( 0.519372, 0.035553, 0.568848, 1, 0.994629, 0.345789, 0.786797, 1 )
-[sub_resource type="GradientTexture" id=15]
-gradient = SubResource( 14 )
+[sub_resource type="GradientTexture" id=13]
+gradient = SubResource( 12 )
-[sub_resource type="StyleBoxTexture" id=16]
-texture = SubResource( 15 )
+[sub_resource type="StyleBoxTexture" id=14]
+texture = SubResource( 13 )
region_rect = Rect2( 0, 0, 2048, 1 )
margin_left = 10.0
margin_right = 10.0
@@ -95,246 +95,339 @@ expand = true
[node name="SettingsFullWindow" type="MarginContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
+custom_constants/margin_right = 0
+custom_constants/margin_top = 0
+custom_constants/margin_left = 0
+custom_constants/margin_bottom = 0
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SettingsFullWindow"]
+margin_right = 1024.0
+margin_bottom = 600.0
+custom_constants/separation = 120
+
+[node name="header" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer"]
+editor/display_folded = true
+margin_right = 1024.0
+size_flags_horizontal = 11
+custom_constants/separation = 0
+
+[node name="Control" type="Control" parent="SettingsFullWindow/VBoxContainer/header"]
+margin_right = 1024.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+
+[node name="TextureRect" type="TextureRect" parent="SettingsFullWindow/VBoxContainer/header/Control"]
+anchor_right = 1.0
+margin_bottom = 120.0
+texture = ExtResource( 2 )
+expand = true
+stretch_mode = 1
+
+[node name="headerContainer" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/header/Control"]
+editor/display_folded = true
+anchor_right = 1.0
+anchor_bottom = 1.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
custom_constants/margin_right = 20
custom_constants/margin_top = 20
custom_constants/margin_left = 20
custom_constants/margin_bottom = 20
-[node name="VBoxContainer" type="VBoxContainer" parent="SettingsFullWindow"]
+[node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/header/Control/headerContainer"]
+editor/display_folded = true
margin_left = 20.0
margin_top = 20.0
margin_right = 1004.0
-margin_bottom = 580.0
+margin_bottom = 85.0
+custom_constants/separation = 50
-[node name="Header" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer"]
+[node name="back" type="TextureButton" parent="SettingsFullWindow/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+margin_right = 80.0
+margin_bottom = 65.0
+grow_horizontal = 0
+rect_min_size = Vector2( 80, 65 )
+size_flags_vertical = 3
+size_flags_stretch_ratio = 0.2
+texture_normal = ExtResource( 3 )
+texture_hover = ExtResource( 4 )
+expand = true
+stretch_mode = 4
+
+[node name="Settings" type="Label" parent="SettingsFullWindow/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+margin_left = 130.0
margin_right = 984.0
margin_bottom = 65.0
-rect_pivot_offset = Vector2( -280, 80 )
size_flags_horizontal = 3
-alignment = 1
+size_flags_vertical = 3
+theme = ExtResource( 5 )
+text = "Settings"
+align = 1
+valign = 1
+uppercase = true
-[node name="MarginContainer" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/Header"]
-margin_right = 984.0
+[node name="titleMargins" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+visible = false
+margin_left = 699.0
+margin_right = 999.0
margin_bottom = 65.0
size_flags_horizontal = 3
+size_flags_vertical = 3
+custom_constants/margin_right = 150
+custom_constants/margin_left = 150
-[node name="back" type="TextureButton" parent="SettingsFullWindow/VBoxContainer/Header/MarginContainer"]
-margin_right = 984.0
+[node name="options" type="TextureButton" parent="SettingsFullWindow/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+visible = false
+margin_left = 864.0
+margin_right = 944.0
margin_bottom = 65.0
rect_min_size = Vector2( 80, 65 )
-mouse_default_cursor_shape = 2
-texture_normal = SubResource( 2 )
-texture_hover = SubResource( 3 )
+size_flags_horizontal = 9
+size_flags_vertical = 3
+size_flags_stretch_ratio = 0.3
+texture_normal = ExtResource( 6 )
+texture_hover = ExtResource( 7 )
expand = true
-stretch_mode = 4
-
-[node name="Titre" type="Label" parent="SettingsFullWindow/VBoxContainer/Header/MarginContainer"]
-margin_top = 4.0
-margin_right = 984.0
-margin_bottom = 60.0
-size_flags_horizontal = 3
-theme = ExtResource( 2 )
-text = "Options"
-align = 1
+stretch_mode = 5
[node name="main" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer"]
-margin_top = 69.0
-margin_right = 984.0
-margin_bottom = 560.0
+margin_top = 120.0
+margin_right = 1024.0
+margin_bottom = 600.0
size_flags_horizontal = 3
size_flags_vertical = 3
+custom_constants/margin_right = 20
+custom_constants/margin_top = 20
+custom_constants/margin_left = 20
+custom_constants/margin_bottom = 20
-[node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main"]
-margin_right = 984.0
-margin_bottom = 491.0
+[node name="old" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main"]
+editor/display_folded = true
+visible = false
+margin_left = 20.0
+margin_top = 20.0
+margin_right = 1004.0
+margin_bottom = 460.0
size_flags_vertical = 3
-[node name="AsideMenu" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer"]
+[node name="AsideMenu" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/old"]
margin_right = 221.0
-margin_bottom = 491.0
+margin_bottom = 440.0
size_flags_vertical = 3
custom_constants/margin_right = 20
custom_constants/margin_top = 20
custom_constants/margin_left = 20
custom_constants/margin_bottom = 20
-[node name="VBoxContainer" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu"]
+[node name="AsideDetails" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/old"]
+margin_left = 225.0
+margin_right = 984.0
+margin_bottom = 440.0
+size_flags_horizontal = 3
+custom_constants/margin_right = 20
+custom_constants/margin_top = 20
+custom_constants/margin_left = 20
+custom_constants/margin_bottom = 20
+
+[node name="settingsContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main"]
margin_left = 20.0
margin_top = 20.0
-margin_right = 201.0
-margin_bottom = 471.0
+margin_right = 1004.0
+margin_bottom = 460.0
+
+[node name="AsideMenu" type="Panel" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer"]
+margin_right = 180.0
+margin_bottom = 440.0
+rect_min_size = Vector2( 180, 0 )
+theme = ExtResource( 8 )
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu"]
+anchor_right = 1.0
+anchor_bottom = 1.0
size_flags_vertical = 3
-[node name="listButton" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer"]
+[node name="listButton" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer"]
+editor/display_folded = true
margin_right = 181.0
-margin_bottom = 395.0
+margin_bottom = 390.0
size_flags_horizontal = 3
size_flags_vertical = 3
-[node name="Audio" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/listButton"]
+[node name="Audio" type="Button" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer/listButton"]
margin_right = 181.0
margin_bottom = 52.0
mouse_default_cursor_shape = 2
-theme = ExtResource( 6 )
-custom_fonts/font = SubResource( 4 )
+theme = ExtResource( 9 )
+custom_fonts/font = SubResource( 2 )
text = "AUDIO"
-[node name="Jeu" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/listButton"]
+[node name="Jeu" type="Button" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer/listButton"]
margin_top = 56.0
margin_right = 181.0
margin_bottom = 108.0
mouse_default_cursor_shape = 2
-theme = ExtResource( 6 )
-custom_fonts/font = SubResource( 4 )
+theme = ExtResource( 9 )
+custom_fonts/font = SubResource( 2 )
text = "JEU"
-[node name="Controle" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/listButton"]
+[node name="Controle" type="Button" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer/listButton"]
margin_top = 112.0
margin_right = 181.0
margin_bottom = 164.0
mouse_default_cursor_shape = 2
-theme = ExtResource( 6 )
-custom_fonts/font = SubResource( 4 )
+theme = ExtResource( 9 )
+custom_fonts/font = SubResource( 2 )
text = "CONTRÔLES"
-[node name="resetButton" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer"]
-margin_top = 399.0
+[node name="resetButton" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer"]
+margin_top = 394.0
margin_right = 181.0
-margin_bottom = 451.0
+margin_bottom = 440.0
-[node name="button" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/resetButton"]
+[node name="button" type="Button" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer/resetButton"]
margin_right = 181.0
-margin_bottom = 52.0
+margin_bottom = 46.0
mouse_default_cursor_shape = 2
size_flags_horizontal = 3
-theme = ExtResource( 6 )
-custom_fonts/font = SubResource( 4 )
+theme = ExtResource( 11 )
text = "RESET"
-[node name="AsideDetails" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer"]
-margin_left = 225.0
+[node name="AsideDetails" type="Panel" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer"]
+margin_left = 184.0
margin_right = 984.0
-margin_bottom = 491.0
+margin_bottom = 440.0
size_flags_horizontal = 3
-custom_constants/margin_right = 20
-custom_constants/margin_top = 20
-custom_constants/margin_left = 20
-custom_constants/margin_bottom = 20
+size_flags_vertical = 3
+theme = ExtResource( 12 )
-[node name="content" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails"]
-margin_left = 20.0
-margin_top = 20.0
-margin_right = 739.0
-margin_bottom = 471.0
+[node name="MarginContainer" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+custom_constants/margin_right = 40
+custom_constants/margin_top = 40
+custom_constants/margin_left = 40
+custom_constants/margin_bottom = 40
+
+[node name="content" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer"]
+margin_left = 40.0
+margin_top = 40.0
+margin_right = 760.0
+margin_bottom = 400.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
-[node name="scrollContainer" type="ScrollContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content"]
-margin_right = 719.0
-margin_bottom = 395.0
+[node name="scrollContainer" type="ScrollContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content"]
+margin_right = 720.0
+margin_bottom = 310.0
size_flags_horizontal = 3
size_flags_vertical = 3
-[node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer"]
-margin_right = 719.0
-margin_bottom = 395.0
+[node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer"]
+margin_right = 720.0
+margin_bottom = 310.0
size_flags_horizontal = 3
size_flags_vertical = 3
-[node name="listMenu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer"]
-margin_right = 719.0
-margin_bottom = 395.0
+[node name="listMenu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer"]
+editor/display_folded = true
+margin_right = 720.0
+margin_bottom = 310.0
size_flags_horizontal = 3
-[node name="son" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"]
-margin_right = 719.0
-margin_bottom = 395.0
+[node name="son" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu"]
+editor/display_folded = true
+margin_right = 720.0
+margin_bottom = 310.0
size_flags_vertical = 3
custom_constants/separation = 10
-[node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
-margin_right = 719.0
+[node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son"]
+margin_right = 720.0
margin_bottom = 37.0
-custom_styles/normal = SubResource( 7 )
-custom_fonts/font = SubResource( 8 )
+custom_styles/normal = SubResource( 5 )
+custom_fonts/font = SubResource( 6 )
text = "Réglage du volume"
uppercase = true
-[node name="son" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
+[node name="son" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son"]
margin_top = 47.0
-margin_right = 719.0
+margin_right = 720.0
margin_bottom = 74.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Effets sonors"
-[node name="son_slider" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
+[node name="son_slider" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son"]
margin_top = 84.0
-margin_right = 719.0
+margin_right = 720.0
margin_bottom = 114.0
-[node name="textureound" type="TextureRect" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
+[node name="textureound" type="TextureRect" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
margin_right = 30.0
margin_bottom = 30.0
rect_min_size = Vector2( 30, 30 )
-texture = SubResource( 9 )
+texture = SubResource( 7 )
expand = true
stretch_mode = 6
-[node name="sound" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
+[node name="sound" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
margin_left = 34.0
margin_top = 7.0
-margin_right = 666.0
+margin_right = 667.0
margin_bottom = 23.0
size_flags_horizontal = 3
size_flags_vertical = 4
-theme = ExtResource( 4 )
+theme = ExtResource( 14 )
ticks_on_borders = true
-[node name="percent" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
-margin_left = 670.0
+[node name="percent" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
+margin_left = 671.0
margin_top = 1.0
-margin_right = 719.0
+margin_right = 720.0
margin_bottom = 28.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "100%"
-[node name="music" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
+[node name="music" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son"]
margin_top = 124.0
-margin_right = 719.0
+margin_right = 720.0
margin_bottom = 151.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Musique"
-[node name="son_music" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
+[node name="son_music" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son"]
margin_top = 161.0
-margin_right = 719.0
+margin_right = 720.0
margin_bottom = 191.0
-[node name="texturemusic" type="TextureRect" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
+[node name="texturemusic" type="TextureRect" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
margin_right = 30.0
margin_bottom = 30.0
rect_min_size = Vector2( 30, 30 )
-texture = SubResource( 10 )
+texture = SubResource( 8 )
expand = true
stretch_mode = 6
-[node name="music" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
+[node name="music" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
margin_left = 34.0
margin_top = 7.0
-margin_right = 666.0
+margin_right = 667.0
margin_bottom = 23.0
size_flags_horizontal = 3
size_flags_vertical = 4
-theme = ExtResource( 4 )
+theme = ExtResource( 14 )
ticks_on_borders = true
-[node name="percent" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
-margin_left = 670.0
+[node name="percent" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
+margin_left = 671.0
margin_top = 1.0
-margin_right = 719.0
+margin_right = 720.0
margin_bottom = 28.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "100%"
-[node name="controles" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"]
+[node name="controles" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu"]
visible = false
margin_top = 195.0
margin_right = 707.0
@@ -342,130 +435,130 @@ margin_bottom = 491.0
size_flags_vertical = 3
custom_constants/separation = 10
-[node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
+[node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"]
margin_right = 707.0
margin_bottom = 37.0
-custom_styles/normal = SubResource( 13 )
-custom_fonts/font = SubResource( 8 )
+custom_styles/normal = SubResource( 11 )
+custom_fonts/font = SubResource( 6 )
text = "Réglage des contrôles"
uppercase = true
-[node name="music" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
+[node name="music" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"]
margin_top = 47.0
margin_right = 707.0
margin_bottom = 74.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Touches"
-[node name="touches" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
+[node name="touches" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"]
margin_top = 84.0
margin_right = 707.0
margin_bottom = 111.0
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches"]
+[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches"]
margin_right = 148.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Aller à gauche :"
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches"]
+[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches"]
margin_left = 152.0
margin_right = 166.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Q"
-[node name="touches2" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
+[node name="touches2" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"]
margin_top = 121.0
margin_right = 707.0
margin_bottom = 148.0
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches2"]
+[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches2"]
margin_right = 137.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Aller à Droite :"
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches2"]
+[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches2"]
margin_left = 141.0
margin_right = 156.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "D"
-[node name="touches3" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
+[node name="touches3" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"]
margin_top = 158.0
margin_right = 707.0
margin_bottom = 185.0
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches3"]
+[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches3"]
margin_right = 75.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Sauter :"
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches3"]
+[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches3"]
margin_left = 79.0
margin_right = 150.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Espace"
-[node name="touches4" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
+[node name="touches4" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"]
margin_top = 195.0
margin_right = 707.0
margin_bottom = 222.0
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches4"]
+[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches4"]
margin_right = 96.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Attaquer :"
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches4"]
+[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches4"]
margin_left = 100.0
margin_right = 113.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "A"
-[node name="touches6" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
+[node name="touches6" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"]
margin_top = 232.0
margin_right = 707.0
margin_bottom = 259.0
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches6"]
+[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches6"]
margin_right = 74.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Emote :"
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches6"]
+[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches6"]
margin_left = 78.0
margin_right = 134.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Alt F4"
-[node name="touches5" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
+[node name="touches5" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"]
margin_top = 269.0
margin_right = 707.0
margin_bottom = 296.0
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches5"]
+[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches5"]
margin_right = 139.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Coup de pied :"
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches5"]
+[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches5"]
margin_left = 143.0
margin_right = 157.0
margin_bottom = 27.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "B"
-[node name="jeu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"]
+[node name="jeu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu"]
visible = false
margin_top = 195.0
margin_right = 707.0
@@ -473,56 +566,55 @@ margin_bottom = 406.0
size_flags_vertical = 3
custom_constants/separation = 10
-[node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
+[node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/jeu"]
margin_right = 707.0
margin_bottom = 37.0
-custom_styles/normal = SubResource( 16 )
-custom_fonts/font = SubResource( 8 )
+custom_styles/normal = SubResource( 14 )
+custom_fonts/font = SubResource( 6 )
text = "Réglages du jeu"
uppercase = true
-[node name="anim" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
+[node name="anim" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/jeu"]
margin_top = 47.0
margin_right = 707.0
margin_bottom = 74.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Désactiver les animations"
-[node name="animToggle" type="CheckButton" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
+[node name="animToggle" type="CheckButton" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/jeu"]
margin_top = 84.0
margin_right = 76.0
margin_bottom = 124.0
size_flags_horizontal = 2
custom_constants/check_vadjust = 0
-[node name="pleinecran" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
+[node name="pleinecran" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/jeu"]
margin_top = 134.0
margin_right = 707.0
margin_bottom = 161.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
text = "Mode plein écran"
-[node name="ecranToggle" type="CheckButton" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
+[node name="ecranToggle" type="CheckButton" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/jeu"]
margin_top = 171.0
margin_right = 76.0
margin_bottom = 211.0
size_flags_horizontal = 2
-[node name="BottomButtons" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content"]
-margin_top = 399.0
-margin_right = 719.0
-margin_bottom = 451.0
+[node name="BottomButtons" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content"]
+margin_top = 314.0
+margin_right = 720.0
+margin_bottom = 360.0
alignment = 2
-[node name="apply" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/BottomButtons"]
-margin_left = 545.0
-margin_right = 719.0
-margin_bottom = 52.0
+[node name="apply" type="Button" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/BottomButtons"]
+margin_left = 572.0
+margin_right = 720.0
+margin_bottom = 46.0
mouse_default_cursor_shape = 2
-theme = ExtResource( 6 )
-custom_fonts/font = SubResource( 4 )
-text = "APPLIQUER"
+theme = ExtResource( 11 )
+text = " APPLIQUER "
[node name="AnimationPlayer" type="AnimationPlayer" parent="SettingsFullWindow"]
autoplay = "fade in"
-"anims/fade in" = ExtResource( 5 )
+"anims/fade in" = ExtResource( 15 )
diff --git a/cmi2/scenes/settings.gd b/cmi2/scenes/settings.gd
index dfc680ac6cf8f91558389401e1913c7873c21de8..3763da7c1cfd94d301d4086a2f62d78f7fc1b7d9 100644
--- a/cmi2/scenes/settings.gd
+++ b/cmi2/scenes/settings.gd
@@ -52,29 +52,29 @@ var _settings = {
func _ready():
var globals = get_node("/root/Globals")
- backButton = $SettingsFullWindow/VBoxContainer/Header/MarginContainer/back
+ backButton = $SettingsFullWindow/VBoxContainer/header/Control/headerContainer/HBoxContainer/back
- audioButton = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/listButton/Audio
- gameButton = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/listButton/Jeu
- controlButton = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/listButton/Controle
+ audioButton = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer/listButton/Audio
+ gameButton = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer/listButton/Jeu
+ controlButton = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer/listButton/Controle
- audioPage = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son
- gamePage = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu
- controlPage = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles
+ audioPage = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son
+ gamePage = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/jeu
+ controlPage = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles
- sound = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider/sound
- soundlabel = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider/percent
- soundimage = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider/textureound
+ sound = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_slider/sound
+ soundlabel = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_slider/percent
+ soundimage = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_slider/textureound
- music = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music/music
- musiclabel = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music/percent
- musicimage = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music/texturemusic
+ music = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_music/music
+ musiclabel = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_music/percent
+ musicimage = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/son/son_music/texturemusic
- saveButton = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/BottomButtons/apply
- resetButton = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/resetButton/button
+ saveButton = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/BottomButtons/apply
+ resetButton = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer/resetButton/button
- toggleFullscreen = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/ecranToggle
- animtoggle = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/animToggle
+ toggleFullscreen = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/jeu/ecranToggle
+ animtoggle = $SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/jeu/animToggle
sound.connect("value_changed", self, "on_sound_slider_slided")
music.connect("value_changed", self, "on_music_slider_slided")