diff --git a/cmi2/project.godot b/cmi2/project.godot
index 1ac25d3358be4412a3349ce5c82640cbe544678d..8e989ef489b7f6eca37e86cb3c3eee199ad7a7c6 100644
--- a/cmi2/project.godot
+++ b/cmi2/project.godot
@@ -22,6 +22,7 @@ config/icon="res://img/icon.png"
[autoload]
Globals="*res://Globals.gd"
+SaveSettings="*res://SaveSettings.gd"
[rendering]
diff --git a/cmi2/saveFile.cfg b/cmi2/saveFile.cfg
index 228947e4f8a65ef22983708e15d2453b84197f42..0bba7dbc197da95565c2268a91518bf64a3f4689 100644
--- a/cmi2/saveFile.cfg
+++ b/cmi2/saveFile.cfg
@@ -1,3 +1,3 @@
[Values]
-Son=15.0
+Son=30.0
diff --git a/cmi2/scenes/Settings.tscn b/cmi2/scenes/Settings.tscn
index c3436243f70d26e0ebb9baab562b9b85e83c2ef7..5134ed1b06d6fd3daa867287d6c09b32e00e834e 100644
--- a/cmi2/scenes/Settings.tscn
+++ b/cmi2/scenes/Settings.tscn
@@ -1,8 +1,13 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=13 format=2]
[ext_resource path="res://scenes/Settings.gd" type="Script" id=1]
[ext_resource path="res://scenes/mainTitleTheme.tres" type="Theme" id=2]
[ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=3]
+[ext_resource path="res://settings_sliders.tres" type="Theme" id=4]
+
+[sub_resource type="StreamTexture" id=7]
+flags = 4
+load_path = "res://.import/fondmain.png-5cacf097c29a602acc49f5cd5857be99.stex"
[sub_resource type="StreamTexture" id=1]
flags = 4
@@ -28,11 +33,44 @@ load_path = "res://.import/speaker.png-5c3c8a0199ecad529758a0fe846cfe9b.stex"
flags = 4
load_path = "res://.import/speaker.png-5c3c8a0199ecad529758a0fe846cfe9b.stex"
+[sub_resource type="Animation" id=8]
+resource_name = "fade in"
+tracks/0/type = "value"
+tracks/0/path = NodePath(".:rect_position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 1 ),
+"transitions": PoolRealArray( 0.203063, 1 ),
+"update": 0,
+"values": [ Vector2( 0, 100 ), Vector2( 0, 0 ) ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath(".:modulate")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0, 1 ),
+"transitions": PoolRealArray( 0.31864, 1 ),
+"update": 0,
+"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
+}
+
[node name="Control" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
+[node name="fond" type="TextureRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+texture = SubResource( 7 )
+expand = true
+
[node name="SettingsFullWindow" type="MarginContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
@@ -63,6 +101,7 @@ size_flags_horizontal = 3
margin_right = 984.0
margin_bottom = 65.0
rect_min_size = Vector2( 80, 65 )
+mouse_default_cursor_shape = 2
texture_normal = SubResource( 1 )
texture_hover = SubResource( 2 )
expand = true
@@ -161,46 +200,47 @@ margin_right = 779.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 = 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 = 405.0
+margin_right = 747.0
+margin_bottom = 753.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 = 405.0
+margin_right = 747.0
+margin_bottom = 753.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 = 405.0
+editor/display_folded = true
+visible = false
+margin_right = 747.0
+margin_bottom = 181.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 = 759.0
+margin_right = 747.0
margin_bottom = 27.0
custom_fonts/font = SubResource( 4 )
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 = 759.0
+margin_right = 747.0
margin_bottom = 64.0
custom_fonts/font = SubResource( 4 )
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 = 759.0
+margin_right = 747.0
margin_bottom = 104.0
[node name="textureound" type="TextureRect" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_slider"]
@@ -214,30 +254,32 @@ 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 = 706.0
+margin_right = 694.0
margin_bottom = 23.0
size_flags_horizontal = 3
size_flags_vertical = 4
+theme = ExtResource( 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
+margin_left = 698.0
margin_top = 1.0
-margin_right = 759.0
+margin_right = 747.0
margin_bottom = 28.0
custom_fonts/font = SubResource( 4 )
text = "100%"
[node name="music" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son"]
margin_top = 114.0
-margin_right = 759.0
+margin_right = 747.0
margin_bottom = 141.0
custom_fonts/font = SubResource( 4 )
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 = 759.0
+margin_right = 747.0
margin_bottom = 181.0
[node name="texturemusic" type="TextureRect" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/son/son_music"]
@@ -251,16 +293,17 @@ 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 = 706.0
+margin_right = 694.0
margin_bottom = 23.0
size_flags_horizontal = 3
size_flags_vertical = 4
+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 = 710.0
+margin_left = 698.0
margin_top = 1.0
-margin_right = 759.0
+margin_right = 747.0
margin_bottom = 28.0
custom_fonts/font = SubResource( 4 )
text = "100%"
@@ -269,7 +312,7 @@ text = "100%"
editor/display_folded = true
visible = false
margin_right = 759.0
-margin_bottom = 411.0
+margin_bottom = 405.0
size_flags_vertical = 3
[node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
@@ -286,7 +329,6 @@ custom_fonts/font = SubResource( 4 )
text = "Sensibilité de la souris"
[node name="slider" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/controles"]
-editor/display_folded = true
margin_top = 62.0
margin_right = 759.0
margin_bottom = 89.0
@@ -303,6 +345,7 @@ 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"]
@@ -433,11 +476,8 @@ custom_fonts/font = SubResource( 4 )
text = "B"
[node name="jeu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu"]
-editor/display_folded = true
-visible = false
-margin_top = 155.0
margin_right = 747.0
-margin_bottom = 908.0
+margin_bottom = 753.0
size_flags_vertical = 3
[node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
@@ -467,7 +507,6 @@ custom_fonts/font = SubResource( 4 )
text = "Luminosité"
[node name="slider2" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
margin_top = 137.0
margin_right = 747.0
margin_bottom = 164.0
@@ -483,6 +522,7 @@ 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"]
@@ -500,7 +540,6 @@ custom_fonts/font = SubResource( 4 )
text = "Graphismes"
[node name="slider3" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu"]
-editor/display_folded = true
margin_top = 199.0
margin_right = 747.0
margin_bottom = 226.0
@@ -516,6 +555,7 @@ 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"]
@@ -965,3 +1005,7 @@ margin_right = 759.0
margin_bottom = 42.0
custom_fonts/font = SubResource( 3 )
text = "Sortir"
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="SettingsFullWindow"]
+autoplay = "fade in"
+"anims/fade in" = SubResource( 8 )
diff --git a/cmi2/scenes/characterSelection.tscn b/cmi2/scenes/characterSelection.tscn
index 65158b2daa2762b26f96fb9d45b6af12d4bdbe97..ada4d329cd01fba3616379cfa7f67d108a6fcd7b 100644
--- a/cmi2/scenes/characterSelection.tscn
+++ b/cmi2/scenes/characterSelection.tscn
@@ -1,45 +1,68 @@
-<<<<<<< HEAD
[gd_scene load_steps=20 format=2]
-=======
-[gd_scene load_steps=19 format=2]
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
[ext_resource path="res://scenes/characterSelection.gd" type="Script" id=1]
-[ext_resource path="res://assets/allPage/fondmain.png" type="Texture" id=2]
-[ext_resource path="res://assets/allPage/mainTitle.png" type="Texture" id=3]
-[ext_resource path="res://assets/allPage/backbutton.png" type="Texture" id=4]
-[ext_resource path="res://assets/allPage/backbuttonhover.png" type="Texture" id=5]
-[ext_resource path="res://scenes/mainTitleTheme.tres" type="Theme" id=6]
-[ext_resource path="res://assets/allPage/options.png" type="Texture" id=7]
-[ext_resource path="res://assets/allPage/optionshover.png" type="Texture" id=8]
-[ext_resource path="res://assets/fonts/montserrat/Montserrat-SemiBold.otf" type="DynamicFontData" id=9]
-[ext_resource path="res://labelSkillFont.tres" type="Theme" id=10]
-[ext_resource path="res://assets/selectChar/jauge.png" type="Texture" id=11]
-[ext_resource path="res://assets/selectChar/jaugefill.png" type="Texture" id=12]
-[ext_resource path="res://scenes/GridContainer.gd" type="Script" id=13]
-[ext_resource path="res://assets/selectChar/charPic.jpg" type="Texture" id=14]
-
-[sub_resource type="AnimatedTexture" id=1]
+[ext_resource path="res://scenes/mainTitleTheme.tres" type="Theme" id=2]
+[ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=3]
+[ext_resource path="res://assets/Karla-Bold.ttf" type="DynamicFontData" id=4]
+[ext_resource path="res://assets/allPage/lifebar_bg.png" type="Texture" id=5]
+[ext_resource path="res://assets/allPage/lifebar_fill.png" type="Texture" id=6]
+[ext_resource path="res://scenes/GridContainer.gd" type="Script" id=7]
+[ext_resource path="res://assets/selectChar/charPic.jpg" type="Texture" id=8]
+
+[sub_resource type="StreamTexture" id=1]
+flags = 4
+load_path = "res://.import/fondmain.png-5cacf097c29a602acc49f5cd5857be99.stex"
[sub_resource type="StreamTexture" id=2]
-
-[sub_resource type="DynamicFont" id=4]
-size = 19
-font_data = ExtResource( 9 )
+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="StreamTexture" id=4]
+flags = 4
+load_path = "res://.import/options.png-ae787eb8f1df22f4117d7280b562ce34.stex"
+
+[sub_resource type="StreamTexture" id=5]
+flags = 4
+load_path = "res://.import/optionshover.png-6642514d8113ff531a0e90b39628f1c8.stex"
+
+[sub_resource type="AnimatedTexture" id=6]
+
+[sub_resource type="StreamTexture" id=7]
+
+[sub_resource type="DynamicFont" id=8]
+size = 20
+extra_spacing_char = 1
+font_data = ExtResource( 3 )
+
+[sub_resource type="DynamicFont" id=9]
+extra_spacing_char = 2
+font_data = ExtResource( 4 )
+
+[sub_resource type="StreamTexture" id=10]
+flags = 4
load_path = "res://.import/lullaby.png-7de0196c3f1b74e8aee0908a03011796.stex"
+[sub_resource type="DynamicFont" id=11]
+size = 30
+extra_spacing_top = 10
+extra_spacing_bottom = 10
+extra_spacing_char = 2
+font_data = ExtResource( 4 )
+
[node name="Control" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
-[node name="TextureRect" type="TextureRect" parent="."]
+[node name="fond" type="TextureRect" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
-texture = ExtResource( 2 )
+texture = SubResource( 1 )
+expand = true
[node name="MarginContainer" type="MarginContainer" parent="."]
anchor_right = 1.0
@@ -52,31 +75,17 @@ margin_right = 1024.0
margin_bottom = 600.0
size_flags_horizontal = 3
size_flags_vertical = 3
-custom_constants/separation = 100
+custom_constants/separation = 30
alignment = 1
[node name="header" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
margin_right = 1024.0
+margin_bottom = 105.0
size_flags_horizontal = 11
-[node name="Control" type="Control" parent="MarginContainer/VBoxContainer/header"]
+[node name="headerContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer/header"]
margin_right = 1024.0
-size_flags_horizontal = 3
-size_flags_vertical = 3
-
-[node name="TextureRect" type="TextureRect" parent="MarginContainer/VBoxContainer/header/Control"]
-anchor_right = 1.0
-margin_bottom = 120.0
-size_flags_horizontal = 3
-size_flags_vertical = 3
-texture = ExtResource( 3 )
-expand = true
-stretch_mode = 1
-
-[node name="headerContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer/header/Control"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_bottom = 120.0
+margin_bottom = 105.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/margin_right = 20
@@ -84,42 +93,38 @@ custom_constants/margin_top = 20
custom_constants/margin_left = 20
custom_constants/margin_bottom = 20
-[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/header/Control/headerContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/header/headerContainer"]
margin_left = 20.0
margin_top = 20.0
margin_right = 1004.0
-margin_bottom = 100.0
+margin_bottom = 85.0
custom_constants/separation = 50
-[node name="back" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+[node name="back" type="TextureButton" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"]
margin_right = 80.0
-margin_bottom = 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( 4 )
-texture_hover = ExtResource( 5 )
+texture_normal = SubResource( 2 )
+texture_hover = SubResource( 3 )
expand = true
stretch_mode = 4
-[node name="Multiplayer Selection" type="Label" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+[node name="Multiplayer Selection" type="Label" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"]
margin_left = 130.0
margin_right = 854.0
-margin_bottom = 80.0
+margin_bottom = 65.0
size_flags_horizontal = 3
size_flags_vertical = 3
-<<<<<<< HEAD
theme = ExtResource( 2 )
-=======
-theme = ExtResource( 6 )
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
text = "Character Selection"
align = 1
valign = 1
uppercase = true
-[node name="titleMargins" type="MarginContainer" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+[node name="titleMargins" type="MarginContainer" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"]
visible = false
margin_left = 535.0
margin_right = 854.0
@@ -129,26 +134,21 @@ size_flags_vertical = 3
custom_constants/margin_right = 150
custom_constants/margin_left = 150
-[node name="options" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+[node name="options" type="TextureButton" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"]
margin_left = 904.0
margin_right = 984.0
-margin_bottom = 80.0
+margin_bottom = 65.0
rect_min_size = Vector2( 80, 65 )
size_flags_horizontal = 9
size_flags_vertical = 3
size_flags_stretch_ratio = 0.3
-<<<<<<< HEAD
texture_normal = SubResource( 4 )
texture_hover = SubResource( 5 )
-=======
-texture_normal = ExtResource( 7 )
-texture_hover = ExtResource( 8 )
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
expand = true
stretch_mode = 5
[node name="marginSelectContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer"]
-margin_top = 100.0
+margin_top = 135.0
margin_right = 1024.0
margin_bottom = 600.0
size_flags_horizontal = 3
@@ -162,48 +162,44 @@ custom_constants/margin_bottom = 40
margin_left = 40.0
margin_top = 20.0
margin_right = 984.0
-margin_bottom = 460.0
+margin_bottom = 425.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/separation = 20
[node name="character" type="VBoxContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container"]
-margin_right = 462.0
-margin_bottom = 440.0
+margin_right = 476.0
+margin_bottom = 405.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="marginCharRight" type="MarginContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character"]
-margin_right = 462.0
-margin_bottom = 440.0
+margin_right = 476.0
+margin_bottom = 405.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/margin_right = 80
[node name="verticalAlignment" type="VBoxContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight"]
-margin_right = 382.0
-margin_bottom = 440.0
+margin_right = 396.0
+margin_bottom = 405.0
size_flags_vertical = 3
custom_constants/separation = 10
alignment = 1
[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment"]
-margin_right = 382.0
-margin_bottom = 220.0
+margin_right = 396.0
+margin_bottom = 103.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="character" type="TextureRect" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/VBoxContainer"]
-margin_right = 382.0
-margin_bottom = 220.0
+margin_right = 396.0
+margin_bottom = 103.0
rect_min_size = Vector2( 300, 0 )
size_flags_horizontal = 7
size_flags_vertical = 3
-<<<<<<< HEAD
texture = SubResource( 6 )
-=======
-texture = SubResource( 1 )
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
expand = true
stretch_mode = 6
@@ -213,229 +209,162 @@ margin_right = 396.0
margin_bottom = 310.0
size_flags_horizontal = 3
size_flags_vertical = 3
-<<<<<<< HEAD
texture = SubResource( 7 )
-=======
-texture = SubResource( 2 )
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
expand = true
stretch_mode = 6
[node name="charaName" type="Label" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment"]
-margin_top = 230.0
-margin_right = 382.0
-margin_bottom = 254.0
+margin_top = 113.0
+margin_right = 396.0
+margin_bottom = 138.0
size_flags_horizontal = 3
-<<<<<<< HEAD
custom_fonts/font = SubResource( 8 )
-=======
-custom_fonts/font = SubResource( 4 )
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
text = "Character Name"
align = 1
valign = 1
uppercase = true
[node name="CenterContainer" type="CenterContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment"]
-margin_top = 264.0
-margin_right = 382.0
-margin_bottom = 430.0
+margin_top = 148.0
+margin_right = 396.0
+margin_bottom = 405.0
[node name="skills" type="VBoxContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer"]
-margin_left = 41.0
-margin_right = 341.0
-margin_bottom = 166.0
+margin_right = 396.0
+margin_bottom = 257.0
size_flags_horizontal = 3
size_flags_vertical = 3
-custom_constants/separation = 2
+custom_constants/separation = -5
alignment = 1
[node name="skill1" type="Label" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer/skills"]
-<<<<<<< HEAD
margin_right = 396.0
margin_bottom = 20.0
custom_fonts/font = SubResource( 9 )
text = "skill 1"
-=======
-margin_right = 300.0
-margin_bottom = 18.0
-size_flags_vertical = 6
-theme = ExtResource( 10 )
-text = "skill 1cv b"
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
uppercase = true
[node name="skillBar1" type="TextureProgress" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer/skills"]
-margin_top = 20.0
-margin_right = 300.0
-margin_bottom = 40.0
-rect_min_size = Vector2( 300, 0 )
+margin_top = 15.0
+margin_right = 396.0
+margin_bottom = 68.0
+size_flags_horizontal = 3
value = 50.0
-texture_under = ExtResource( 11 )
-texture_progress = ExtResource( 12 )
-nine_patch_stretch = true
-stretch_margin_left = 10
-stretch_margin_top = 10
-stretch_margin_right = 10
-stretch_margin_bottom = 10
+texture_under = ExtResource( 5 )
+texture_progress = ExtResource( 6 )
[node name="skill2" type="Label" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer/skills"]
-<<<<<<< HEAD
margin_top = 63.0
margin_right = 396.0
margin_bottom = 83.0
custom_fonts/font = SubResource( 9 )
-=======
-margin_top = 42.0
-margin_right = 300.0
-margin_bottom = 60.0
-theme = ExtResource( 10 )
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
text = "skill 2"
uppercase = true
[node name="skillBar2" type="TextureProgress" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer/skills"]
-margin_top = 62.0
-margin_right = 300.0
-margin_bottom = 82.0
+margin_top = 78.0
+margin_right = 396.0
+margin_bottom = 131.0
size_flags_horizontal = 3
value = 20.0
-texture_under = ExtResource( 11 )
-texture_progress = ExtResource( 12 )
-nine_patch_stretch = true
-stretch_margin_left = 10
-stretch_margin_top = 10
-stretch_margin_right = 10
-stretch_margin_bottom = 10
+texture_under = ExtResource( 5 )
+texture_progress = ExtResource( 6 )
[node name="skill3" type="Label" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer/skills"]
-<<<<<<< HEAD
margin_top = 126.0
margin_right = 396.0
margin_bottom = 146.0
custom_fonts/font = SubResource( 9 )
-=======
-margin_top = 84.0
-margin_right = 300.0
-margin_bottom = 102.0
-theme = ExtResource( 10 )
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
text = "skill 3"
uppercase = true
[node name="skillBar3" type="TextureProgress" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer/skills"]
-margin_top = 104.0
-margin_right = 300.0
-margin_bottom = 124.0
+margin_top = 141.0
+margin_right = 396.0
+margin_bottom = 194.0
size_flags_horizontal = 3
value = 20.0
-texture_under = ExtResource( 11 )
-texture_progress = ExtResource( 12 )
-nine_patch_stretch = true
-stretch_margin_left = 10
-stretch_margin_top = 10
-stretch_margin_right = 10
-stretch_margin_bottom = 10
+texture_under = ExtResource( 5 )
+texture_progress = ExtResource( 6 )
[node name="skill4" type="Label" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer/skills"]
-<<<<<<< HEAD
margin_top = 189.0
margin_right = 396.0
margin_bottom = 209.0
custom_fonts/font = SubResource( 9 )
-=======
-margin_top = 126.0
-margin_right = 300.0
-margin_bottom = 144.0
-theme = ExtResource( 10 )
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
text = "skill 4"
uppercase = true
[node name="skillBar4" type="TextureProgress" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer/skills"]
-margin_top = 146.0
-margin_right = 300.0
-margin_bottom = 166.0
+margin_top = 204.0
+margin_right = 396.0
+margin_bottom = 257.0
size_flags_horizontal = 3
value = 20.0
-texture_under = ExtResource( 11 )
-texture_progress = ExtResource( 12 )
-nine_patch_stretch = true
-stretch_margin_left = 10
-stretch_margin_top = 10
-stretch_margin_right = 10
-stretch_margin_bottom = 10
-
-[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment"]
-margin_top = 440.0
-margin_right = 382.0
-margin_bottom = 440.0
+texture_under = ExtResource( 5 )
+texture_progress = ExtResource( 6 )
[node name="selection" type="VBoxContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container"]
-margin_left = 482.0
+margin_left = 496.0
margin_right = 944.0
-margin_bottom = 440.0
+margin_bottom = 405.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="charListContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection"]
-margin_right = 462.0
-margin_bottom = 440.0
+margin_right = 448.0
+margin_bottom = 405.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/separation = 20
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer"]
-margin_right = 462.0
-margin_bottom = 360.0
+margin_right = 448.0
+margin_bottom = 283.0
size_flags_horizontal = 3
size_flags_vertical = 3
scroll_horizontal_enabled = false
[node name="GridContainer" type="GridContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer"]
-margin_right = 462.0
-margin_bottom = 360.0
+margin_right = 448.0
+margin_bottom = 283.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/vseparation = 10
custom_constants/hseparation = 10
columns = 4
-script = ExtResource( 13 )
+script = ExtResource( 7 )
[node name="char1" type="TextureButton" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer"]
-<<<<<<< HEAD
texture_normal = SubResource( 10 )
-=======
-texture_normal = SubResource( 3 )
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
expand = true
stretch_mode = 4
[node name="char2" type="TextureButton" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer"]
margin_left = 10.0
margin_right = 10.0
-texture_normal = ExtResource( 14 )
+texture_normal = ExtResource( 8 )
expand = true
stretch_mode = 4
[node name="char3" type="TextureButton" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer"]
margin_left = 20.0
margin_right = 20.0
-texture_normal = ExtResource( 14 )
+texture_normal = ExtResource( 8 )
expand = true
stretch_mode = 4
[node name="char4" type="TextureButton" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer"]
margin_left = 30.0
margin_right = 30.0
-texture_normal = ExtResource( 14 )
+texture_normal = ExtResource( 8 )
expand = true
stretch_mode = 4
[node name="TextureButton5" type="TextureButton" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer"]
margin_top = 10.0
margin_bottom = 10.0
-texture_normal = ExtResource( 14 )
+texture_normal = ExtResource( 8 )
expand = true
stretch_mode = 4
@@ -444,7 +373,7 @@ margin_left = 10.0
margin_top = 10.0
margin_right = 10.0
margin_bottom = 10.0
-texture_normal = ExtResource( 14 )
+texture_normal = ExtResource( 8 )
expand = true
stretch_mode = 4
@@ -453,7 +382,7 @@ margin_left = 20.0
margin_top = 10.0
margin_right = 20.0
margin_bottom = 10.0
-texture_normal = ExtResource( 14 )
+texture_normal = ExtResource( 8 )
expand = true
stretch_mode = 4
@@ -462,14 +391,14 @@ margin_left = 30.0
margin_top = 10.0
margin_right = 30.0
margin_bottom = 10.0
-texture_normal = ExtResource( 14 )
+texture_normal = ExtResource( 8 )
expand = true
stretch_mode = 4
[node name="buttonPlayMargin" type="MarginContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer"]
-margin_top = 380.0
-margin_right = 462.0
-margin_bottom = 440.0
+margin_top = 303.0
+margin_right = 448.0
+margin_bottom = 405.0
custom_constants/margin_right = 80
custom_constants/margin_top = 20
custom_constants/margin_left = 80
@@ -478,12 +407,7 @@ custom_constants/margin_bottom = 20
[node name="playButton" type="Button" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/buttonPlayMargin"]
margin_left = 80.0
margin_top = 20.0
-<<<<<<< HEAD
margin_right = 368.0
margin_bottom = 82.0
custom_fonts/font = SubResource( 11 )
-=======
-margin_right = 382.0
-margin_bottom = 40.0
->>>>>>> c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb
text = "PLAY"
diff --git a/cmi2/settings_sliders.tres b/cmi2/settings_sliders.tres
index 8a4462943c49bcb9510628f3004658ad99cc7a2c..93f667e48aa411c45905499ecf5b722e179bfbc1 100644
--- a/cmi2/settings_sliders.tres
+++ b/cmi2/settings_sliders.tres
@@ -1,3 +1,27 @@
-[gd_resource type="Theme" format=2]
+[gd_resource type="Theme" load_steps=5 format=2]
+
+[sub_resource type="StreamTexture" id=2]
+
+[sub_resource type="StreamTexture" id=3]
+
+[sub_resource type="StreamTexture" id=4]
+
+[sub_resource type="StyleBoxFlat" id=1]
+bg_color = Color( 0.686275, 0.14902, 0.780392, 1 )
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+shadow_color = Color( 0.368627, 0.113725, 0.611765, 0.6 )
+shadow_size = 5
[resource]
+HSlider/icons/grabber = SubResource( 2 )
+HSlider/icons/grabber_disabled = SubResource( 3 )
+HSlider/icons/grabber_highlight = SubResource( 4 )
+HSlider/icons/tick = null
+HSlider/styles/focus = null
+HSlider/styles/grabber_area = SubResource( 1 )
+HSlider/styles/grabber_disabled = null
+HSlider/styles/grabber_highlight = null
+HSlider/styles/slider = null