diff --git a/cmi2/SaveSettings.gd b/cmi2/SaveSettings.gd
index ce0a32463de04a2d11ca0428e8d28a89b7f9cc43..b6029a3918c8b9b220c636d23e0a980f51648ffb 100644
--- a/cmi2/SaveSettings.gd
+++ b/cmi2/SaveSettings.gd
@@ -1,6 +1,21 @@
extends Node
-var soundValue = 0
+var _settings = {
+ "audio":{
+ "son": null ,
+ "musique": null
+ },
+ "controles":{
+ "gauche": null,
+ "droite": null,
+ "saut": null
+ },
+ "jeu":{
+ "anim":null ,
+ "fullscreen":null
+
+ }
+}
var defaultSavePath = "res://defaultSettingsFile.cfg"
var defaultConfig = ConfigFile.new()
@@ -14,14 +29,42 @@ var loadResponse = config.load(savePath)
func _ready():
pass
-func saveValue(section, key):
- config.set_value(section, key, soundValue)
+func saveValue( _settings):
+ for section in _settings.keys():
+ for key in _settings[section]:
+ config.set_value(section,key, _settings[section][key])
+
config.save(savePath)
+
-func loadValue(section, key ):
- soundValue = defaultConfig.get_value(section, key, soundValue)
- return soundValue
+func loadValue():
+ #soundValue = defaultConfig.get_value(section, key, soundValue)
+ #return soundValue
+ var error = defaultConfig.load(defaultSavePath)
+
+ if error != OK:
+ print("Erreur lors du chargement de %s" % error)
+ return null
+
+ for section in _settings.keys():
+ for key in _settings[section]:
+ _settings[section][key] = defaultConfig.get_value(section,key, null)
+
+ return _settings
+
+
+
+
+func loadDefaultValue():
+ var error = config.load(savePath)
+
+ if error != OK:
+ print("Erreur lors du chargement de %s" % error)
+ return []
+
+ for section in _settings.keys():
+ for key in _settings[section]:
+ _settings[section][key] = config.get_value(section,key, null)
+
+ return _settings
-func loadDefaultValue(section, key ):
- soundValue = config.get_value(section, key, soundValue)
- return soundValue
diff --git a/cmi2/assets/settings/speaker.png b/cmi2/assets/settings/speaker.png
index bd1988d9a48ee08f56be0471cd4b1417424210bf..d0537dfecbe9d13ceaa97a4a46e8cb9644627a09 100644
Binary files a/cmi2/assets/settings/speaker.png and b/cmi2/assets/settings/speaker.png differ
diff --git a/cmi2/assets/settings/speaker2.png b/cmi2/assets/settings/speaker2.png
index c8d5d0e3eef65bd12098cbb289b0e3b179a005d0..47094850cf599f28f26c3022a74d9bef73a8e5c0 100644
Binary files a/cmi2/assets/settings/speaker2.png and b/cmi2/assets/settings/speaker2.png differ
diff --git a/cmi2/assets/settings/speaker3.png b/cmi2/assets/settings/speaker3.png
index 7142412c346ae2f016a05f0c2767108dc7cc1959..e630e070033cda9b609140a17d233d1b3e93e1cc 100644
Binary files a/cmi2/assets/settings/speaker3.png and b/cmi2/assets/settings/speaker3.png differ
diff --git a/cmi2/defaultSettingsFile.cfg b/cmi2/defaultSettingsFile.cfg
index cccd5a6de136464f9a24063c8920eafbedba6386..0be383a2e3fc1acc601cccedfc6249ea1eebf774 100644
--- a/cmi2/defaultSettingsFile.cfg
+++ b/cmi2/defaultSettingsFile.cfg
@@ -1,3 +1,15 @@
-[Values]
+[audio]
-Son=42.0
+son=42.0
+musique=42.0
+
+[controles]
+
+gauche=1
+droite=1
+saut=1
+
+[jeu]
+
+anim=1
+fullscreen=0
diff --git a/cmi2/saveFile.cfg b/cmi2/saveFile.cfg
index dee9d6b38688a7887ffcc7cb93bdfed3ffd90b87..dc36f0e6b8cac63fe2ebeaeaac652203a710460d 100644
--- a/cmi2/saveFile.cfg
+++ b/cmi2/saveFile.cfg
@@ -1,3 +1,15 @@
-[Values]
+[audio]
-Son=90.0
+son=78.0
+musique=42.0
+
+[controles]
+
+gauche=1
+droite=1
+saut=1
+
+[jeu]
+
+anim=true
+fullscreen=true
diff --git a/cmi2/scenes/MainMenu.tscn b/cmi2/scenes/MainMenu.tscn
index ef5bf61625932169002cd4136bbb99f0fe8d61ea..c8b40dbbb961e9a28e680a7b0cceeaa6de90f741 100644
--- a/cmi2/scenes/MainMenu.tscn
+++ b/cmi2/scenes/MainMenu.tscn
@@ -11675,6 +11675,9 @@ tracks/0/keys = {
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
[node name="TextureRect2" type="TextureRect" parent="."]
anchor_right = 1.0
diff --git a/cmi2/scenes/Settings.tscn b/cmi2/scenes/Settings.tscn
index ee6e630897ab96104fcfeca8cfaf9cc3527db662..bac60cff8e50b800854ff6a0d5474e8c88e8383c 100644
--- a/cmi2/scenes/Settings.tscn
+++ b/cmi2/scenes/Settings.tscn
@@ -38,6 +38,9 @@ load_path = "res://.import/speaker.png-5c3c8a0199ecad529758a0fe846cfe9b.stex"
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
[node name="fond" type="TextureRect" parent="."]
anchor_right = 1.0
@@ -119,7 +122,6 @@ margin_bottom = 471.0
size_flags_vertical = 3
[node name="listButton" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer"]
-editor/display_folded = true
margin_right = 141.0
margin_bottom = 405.0
size_flags_horizontal = 3
@@ -158,7 +160,6 @@ custom_fonts/font = SubResource( 4 )
text = "Reset"
[node name="AsideDetails" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer"]
-editor/display_folded = true
margin_left = 185.0
margin_right = 984.0
margin_bottom = 491.0
@@ -181,41 +182,39 @@ size_flags_horizontal = 3
size_flags_vertical = 3
[node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer"]
-margin_right = 747.0
-margin_bottom = 891.0
+margin_right = 759.0
+margin_bottom = 405.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 = 747.0
-margin_bottom = 891.0
+margin_right = 759.0
+margin_bottom = 405.0
size_flags_horizontal = 3
[node name="son" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"]
-editor/display_folded = true
visible = false
-margin_right = 747.0
-margin_bottom = 181.0
+margin_right = 759.0
+margin_bottom = 200.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 = 747.0
+margin_right = 759.0
margin_bottom = 27.0
custom_fonts/font = SubResource( 5 )
text = "Réglage du volume"
[node name="son" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
margin_top = 37.0
-margin_right = 747.0
+margin_right = 759.0
margin_bottom = 64.0
custom_fonts/font = SubResource( 5 )
text = "Effets sonors"
[node name="son_slider" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
-editor/display_folded = true
margin_top = 74.0
-margin_right = 747.0
+margin_right = 759.0
margin_bottom = 104.0
[node name="textureound" type="TextureRect" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
@@ -229,7 +228,7 @@ stretch_mode = 6
[node name="sound" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
margin_left = 34.0
margin_top = 7.0
-margin_right = 694.0
+margin_right = 706.0
margin_bottom = 23.0
size_flags_horizontal = 3
size_flags_vertical = 4
@@ -237,24 +236,23 @@ theme = ExtResource( 4 )
ticks_on_borders = true
[node name="percent" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
-margin_left = 698.0
+margin_left = 710.0
margin_top = 1.0
-margin_right = 747.0
+margin_right = 759.0
margin_bottom = 28.0
custom_fonts/font = SubResource( 5 )
text = "100%"
[node name="music" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
margin_top = 114.0
-margin_right = 747.0
+margin_right = 759.0
margin_bottom = 141.0
custom_fonts/font = SubResource( 5 )
text = "Musique"
[node name="son_music" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
-editor/display_folded = true
margin_top = 151.0
-margin_right = 747.0
+margin_right = 759.0
margin_bottom = 181.0
[node name="texturemusic" type="TextureRect" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
@@ -268,7 +266,7 @@ stretch_mode = 6
[node name="music" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
margin_left = 34.0
margin_top = 7.0
-margin_right = 694.0
+margin_right = 706.0
margin_bottom = 23.0
size_flags_horizontal = 3
size_flags_vertical = 4
@@ -276,15 +274,14 @@ theme = ExtResource( 4 )
ticks_on_borders = true
[node name="percent" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
-margin_left = 698.0
+margin_left = 710.0
margin_top = 1.0
-margin_right = 747.0
+margin_right = 759.0
margin_bottom = 28.0
custom_fonts/font = SubResource( 5 )
text = "100%"
[node name="controles" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"]
-editor/display_folded = true
visible = false
margin_right = 759.0
margin_bottom = 405.0
@@ -297,52 +294,17 @@ margin_bottom = 27.0
custom_fonts/font = SubResource( 5 )
text = "Réglage des contrôles"
-[node name="son" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-margin_top = 31.0
-margin_right = 759.0
-margin_bottom = 58.0
-custom_fonts/font = SubResource( 5 )
-text = "Sensibilité de la souris"
-
-[node name="slider" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-margin_top = 62.0
-margin_right = 759.0
-margin_bottom = 89.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/slider"]
-margin_right = 61.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "Faible"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/slider"]
-margin_left = 65.0
-margin_right = 693.0
-margin_bottom = 27.0
-size_flags_horizontal = 3
-size_flags_vertical = 1
-theme = ExtResource( 4 )
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/slider"]
-margin_left = 697.0
-margin_right = 759.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "Elevée"
-
[node name="music" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-margin_top = 93.0
+margin_top = 37.0
margin_right = 759.0
-margin_bottom = 120.0
+margin_bottom = 64.0
custom_fonts/font = SubResource( 5 )
text = "Touches"
[node name="touches" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-editor/display_folded = true
-margin_top = 124.0
+margin_top = 74.0
margin_right = 759.0
-margin_bottom = 151.0
+margin_bottom = 101.0
[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches"]
margin_right = 148.0
@@ -358,10 +320,9 @@ custom_fonts/font = SubResource( 5 )
text = "Q"
[node name="touches2" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-editor/display_folded = true
-margin_top = 155.0
+margin_top = 111.0
margin_right = 759.0
-margin_bottom = 182.0
+margin_bottom = 138.0
[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches2"]
margin_right = 137.0
@@ -377,10 +338,9 @@ custom_fonts/font = SubResource( 5 )
text = "D"
[node name="touches3" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-editor/display_folded = true
-margin_top = 186.0
+margin_top = 148.0
margin_right = 759.0
-margin_bottom = 213.0
+margin_bottom = 175.0
[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches3"]
margin_right = 75.0
@@ -396,10 +356,9 @@ custom_fonts/font = SubResource( 5 )
text = "Espace"
[node name="touches4" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-editor/display_folded = true
-margin_top = 217.0
+margin_top = 185.0
margin_right = 759.0
-margin_bottom = 244.0
+margin_bottom = 212.0
[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches4"]
margin_right = 96.0
@@ -415,9 +374,9 @@ custom_fonts/font = SubResource( 5 )
text = "A"
[node name="touches6" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-margin_top = 248.0
+margin_top = 222.0
margin_right = 759.0
-margin_bottom = 275.0
+margin_bottom = 249.0
[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches6"]
margin_right = 74.0
@@ -433,10 +392,9 @@ custom_fonts/font = SubResource( 5 )
text = "Alt F4"
[node name="touches5" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-editor/display_folded = true
-margin_top = 279.0
+margin_top = 259.0
margin_right = 759.0
-margin_bottom = 306.0
+margin_bottom = 286.0
[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles/touches5"]
margin_right = 139.0
@@ -452,516 +410,43 @@ custom_fonts/font = SubResource( 5 )
text = "B"
[node name="jeu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"]
-margin_right = 747.0
-margin_bottom = 891.0
+margin_right = 759.0
+margin_bottom = 405.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"]
-margin_right = 747.0
+margin_right = 759.0
margin_bottom = 27.0
custom_fonts/font = SubResource( 5 )
-text = "Réglage du jeu"
+text = "Réglages du jeu"
-[node name="son" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
+[node name="anim" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
margin_top = 37.0
-margin_right = 747.0
+margin_right = 759.0
margin_bottom = 64.0
custom_fonts/font = SubResource( 5 )
text = "Désactiver les animations"
-[node name="CheckButton" type="CheckButton" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
+[node name="animToggle" type="CheckButton" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
margin_top = 74.0
-margin_right = 747.0
+margin_right = 76.0
margin_bottom = 114.0
-size_flags_horizontal = 3
+size_flags_horizontal = 2
+custom_constants/check_vadjust = 0
-[node name="music" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
+[node name="pleinecran" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
margin_top = 124.0
-margin_right = 747.0
+margin_right = 759.0
margin_bottom = 151.0
custom_fonts/font = SubResource( 5 )
-text = "Luminosité"
+text = "Mode plein écran"
-[node name="slider2" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
+[node name="ecranToggle" type="CheckButton" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
margin_top = 161.0
-margin_right = 747.0
-margin_bottom = 188.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider2"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider2"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-theme = ExtResource( 4 )
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider2"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="music2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-margin_top = 198.0
-margin_right = 747.0
-margin_bottom = 225.0
-custom_fonts/font = SubResource( 5 )
-text = "Graphismes"
-
-[node name="slider3" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-margin_top = 235.0
-margin_right = 747.0
-margin_bottom = 262.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider3"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider3"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-theme = ExtResource( 4 )
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider3"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="music3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-margin_top = 272.0
-margin_right = 747.0
-margin_bottom = 299.0
-custom_fonts/font = SubResource( 5 )
-text = "Résolution"
-
-[node name="slider4" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 309.0
-margin_right = 747.0
-margin_bottom = 336.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider4"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider4"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider4"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider5" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 346.0
-margin_right = 747.0
-margin_bottom = 373.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider5"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider5"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider5"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider6" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 383.0
-margin_right = 747.0
-margin_bottom = 410.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider6"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider6"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider6"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider7" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 420.0
-margin_right = 747.0
-margin_bottom = 447.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider7"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider7"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider7"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider8" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 457.0
-margin_right = 747.0
-margin_bottom = 484.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider8"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider8"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider8"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider9" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 494.0
-margin_right = 747.0
-margin_bottom = 521.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider9"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider9"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider9"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider10" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 531.0
-margin_right = 747.0
-margin_bottom = 558.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider10"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider10"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider10"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider11" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 568.0
-margin_right = 747.0
-margin_bottom = 595.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider11"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider11"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider11"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider12" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 605.0
-margin_right = 747.0
-margin_bottom = 632.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider12"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider12"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider12"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider13" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 642.0
-margin_right = 747.0
-margin_bottom = 669.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider13"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider13"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider13"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider14" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-margin_top = 679.0
-margin_right = 747.0
-margin_bottom = 706.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider14"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider14"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider14"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider15" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 716.0
-margin_right = 747.0
-margin_bottom = 743.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider15"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider15"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider15"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider16" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 753.0
-margin_right = 747.0
-margin_bottom = 780.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider16"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider16"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider16"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider17" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 790.0
-margin_right = 747.0
-margin_bottom = 817.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider17"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider17"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider17"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider18" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-margin_top = 827.0
-margin_right = 747.0
-margin_bottom = 854.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider18"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider18"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider18"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
-
-[node name="slider19" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
-margin_top = 864.0
-margin_right = 747.0
-margin_bottom = 891.0
-
-[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider19"]
-margin_right = 29.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "0%"
-
-[node name="HSlider" type="HSlider" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider19"]
-margin_left = 33.0
-margin_right = 694.0
-margin_bottom = 16.0
-size_flags_horizontal = 3
-ticks_on_borders = true
-
-[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/slider19"]
-margin_left = 698.0
-margin_right = 747.0
-margin_bottom = 27.0
-custom_fonts/font = SubResource( 5 )
-text = "100%"
+margin_right = 76.0
+margin_bottom = 201.0
+size_flags_horizontal = 2
[node name="BottomButtons" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content"]
margin_top = 409.0
diff --git a/cmi2/scenes/settings.gd b/cmi2/scenes/settings.gd
index ee2a36be8e6b3d7ae778066730ffec004dc6a5e8..dfc680ac6cf8f91558389401e1913c7873c21de8 100644
--- a/cmi2/scenes/settings.gd
+++ b/cmi2/scenes/settings.gd
@@ -21,6 +21,9 @@ var music
var musiclabel
var musicimage
+var toggleFullscreen
+var animtoggle
+
#sauvegarde
var saveButton
@@ -28,7 +31,22 @@ var resetButton
var settings
-
+var _settings = {
+ "audio":{
+ "son": null ,
+ "musique": null
+ },
+ "controles":{
+ "gauche": null,
+ "droite": null,
+ "saut": null
+ },
+ "jeu":{
+ "anim":null ,
+ "fullscreen":null
+
+ }
+}
# Called when the node enters the scene tree for the first time.
func _ready():
@@ -54,6 +72,9 @@ func _ready():
saveButton = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/BottomButtons/apply
resetButton = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/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
sound.connect("value_changed", self, "on_sound_slider_slided")
music.connect("value_changed", self, "on_music_slider_slided")
@@ -67,17 +88,37 @@ func _ready():
saveButton.connect("pressed", self, "savePressed")
resetButton.connect("pressed", self, "loadPressed")
+ toggleFullscreen.connect("toggled",self, "fullScreenOn")
+
#valeurs par defaut
- sound.value = get_node("/root/SaveSettings").loadDefaultValue("Values", "Son")
+ _settings = get_node("/root/SaveSettings").loadDefaultValue()
+
+ sound.value = _settings.audio.son
+ music.value = _settings.audio.musique
+ animtoggle.pressed = _settings.jeu.anim
+ toggleFullscreen.pressed = _settings.jeu.fullscreen
+
+
func savePressed():
- get_node("/root/SaveSettings").soundValue = sound.value
- get_node("/root/SaveSettings").saveValue("Values", "Son")
+ _settings.audio.son = sound.value
+ _settings.audio.musique = music.value
+ _settings.jeu.anim = animtoggle.pressed
+ _settings.jeu.fullscreen = toggleFullscreen.pressed
+
+ get_node("/root/SaveSettings").saveValue(_settings)
print("ok")
func loadPressed():
- sound.value = get_node("/root/SaveSettings").loadValue("Values", "Son")
+ _settings = get_node("/root/SaveSettings").loadValue()
+
+ sound.value = _settings.audio.son
+ music.value = _settings.audio.musique
+ animtoggle.pressed = _settings.jeu.anim
+ toggleFullscreen.pressed = _settings.jeu.fullscreen
+ #toggleFullscreen.pressed = get_node("/root/SaveSettings").loadValue("Values", "FullScreen")
+
func settings_menu_button_pressed(button_name):
var globals = get_node("/root/Globals")
@@ -141,3 +182,7 @@ func on_sound_slider_slided(value):
func on_music_slider_slided(value):
on_slider_slided("music")
+func fullScreenOn(_value):
+ print(toggleFullscreen.pressed)
+ OS.window_fullscreen = !OS.window_fullscreen
+