diff --git a/cmi2/saveFile.cfg b/cmi2/saveFile.cfg index 068be45c0a0ffdba43eae3da65be42d5dd13a049..228947e4f8a65ef22983708e15d2453b84197f42 100644 --- a/cmi2/saveFile.cfg +++ b/cmi2/saveFile.cfg @@ -1,3 +1,3 @@ [Values] -Son=12.0 +Son=15.0 diff --git a/cmi2/scenes/Settings.tscn b/cmi2/scenes/Settings.tscn index 0bb107a76b016fe0b4ae708698660a73344867a0..c3436243f70d26e0ebb9baab562b9b85e83c2ef7 100644 --- a/cmi2/scenes/Settings.tscn +++ b/cmi2/scenes/Settings.tscn @@ -1,23 +1,24 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://scenes/Settings.gd" type="Script" id=1] -[ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://scenes/mainTitleTheme.tres" type="Theme" id=2] +[ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=3] [sub_resource type="StreamTexture" id=1] flags = 4 -load_path = "res://.import/arrow.png-7519fe79a6743637868621fce1bfb66c.stex" +load_path = "res://.import/backbutton.png-8fee6ad7734c1d3f863cd9a46768a3bb.stex" -[sub_resource type="DynamicFont" id=2] -size = 50 -font_data = ExtResource( 2 ) +[sub_resource type="StreamTexture" id=2] +flags = 4 +load_path = "res://.import/backbuttonhover.png-4209a77808e79ad7977c995e604658a6.stex" [sub_resource type="DynamicFont" id=3] size = 30 -font_data = ExtResource( 2 ) +font_data = ExtResource( 3 ) [sub_resource type="DynamicFont" id=4] size = 22 -font_data = ExtResource( 2 ) +font_data = ExtResource( 3 ) [sub_resource type="StreamTexture" id=5] flags = 4 @@ -47,37 +48,37 @@ margin_right = 1004.0 margin_bottom = 580.0 [node name="Header" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer"] -editor/display_folded = true margin_right = 984.0 -margin_bottom = 59.0 +margin_bottom = 65.0 rect_pivot_offset = Vector2( -280, 80 ) size_flags_horizontal = 3 alignment = 1 [node name="MarginContainer" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/Header"] -editor/display_folded = true margin_right = 984.0 -margin_bottom = 59.0 +margin_bottom = 65.0 size_flags_horizontal = 3 [node name="back" type="TextureButton" parent="SettingsFullWindow/VBoxContainer/Header/MarginContainer"] margin_right = 984.0 -margin_bottom = 59.0 -rect_min_size = Vector2( 50, 50 ) +margin_bottom = 65.0 +rect_min_size = Vector2( 80, 65 ) texture_normal = SubResource( 1 ) +texture_hover = SubResource( 2 ) 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 = 59.0 +margin_bottom = 60.0 size_flags_horizontal = 3 -custom_fonts/font = SubResource( 2 ) +theme = ExtResource( 2 ) text = "Options" align = 1 [node name="main" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer"] -margin_top = 63.0 +margin_top = 69.0 margin_right = 984.0 margin_bottom = 560.0 size_flags_horizontal = 3 @@ -85,12 +86,12 @@ size_flags_vertical = 3 [node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main"] margin_right = 984.0 -margin_bottom = 497.0 +margin_bottom = 491.0 size_flags_vertical = 3 [node name="AsideMenu" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer"] margin_right = 181.0 -margin_bottom = 497.0 +margin_bottom = 491.0 size_flags_vertical = 3 custom_constants/margin_right = 20 custom_constants/margin_top = 20 @@ -101,13 +102,13 @@ custom_constants/margin_bottom = 20 margin_left = 20.0 margin_top = 20.0 margin_right = 161.0 -margin_bottom = 477.0 +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 = 411.0 +margin_bottom = 405.0 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -132,9 +133,9 @@ custom_fonts/font = SubResource( 3 ) text = "Contrôles" [node name="resetButton" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer"] -margin_top = 415.0 +margin_top = 409.0 margin_right = 141.0 -margin_bottom = 457.0 +margin_bottom = 451.0 [node name="button" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/resetButton"] margin_right = 141.0 @@ -146,7 +147,7 @@ text = "Reset" [node name="AsideDetails" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer"] margin_left = 185.0 margin_right = 984.0 -margin_bottom = 497.0 +margin_bottom = 491.0 size_flags_horizontal = 3 custom_constants/margin_right = 20 custom_constants/margin_top = 20 @@ -157,30 +158,30 @@ custom_constants/margin_bottom = 20 margin_left = 20.0 margin_top = 20.0 margin_right = 779.0 -margin_bottom = 477.0 +margin_bottom = 471.0 [node name="scrollContainer" type="ScrollContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content"] editor/display_folded = true margin_right = 759.0 -margin_bottom = 411.0 +margin_bottom = 405.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer"] editor/display_folded = true margin_right = 759.0 -margin_bottom = 411.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 = 759.0 -margin_bottom = 411.0 +margin_bottom = 405.0 size_flags_horizontal = 3 [node name="son" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"] margin_right = 759.0 -margin_bottom = 411.0 +margin_bottom = 405.0 size_flags_vertical = 3 custom_constants/separation = 10 @@ -217,6 +218,7 @@ margin_right = 706.0 margin_bottom = 23.0 size_flags_horizontal = 3 size_flags_vertical = 4 +ticks_on_borders = false [node name="percent" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"] margin_left = 710.0 @@ -945,9 +947,9 @@ custom_fonts/font = SubResource( 4 ) text = "100%" [node name="BottomButtons" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content"] -margin_top = 415.0 +margin_top = 409.0 margin_right = 759.0 -margin_bottom = 457.0 +margin_bottom = 451.0 alignment = 2 [node name="apply" type="Button" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/BottomButtons"] diff --git a/cmi2/settings_sliders.tres b/cmi2/settings_sliders.tres new file mode 100644 index 0000000000000000000000000000000000000000..8a4462943c49bcb9510628f3004658ad99cc7a2c --- /dev/null +++ b/cmi2/settings_sliders.tres @@ -0,0 +1,3 @@ +[gd_resource type="Theme" format=2] + +[resource]