diff --git a/cmi2/assets/selectChar/jauge.png b/cmi2/assets/selectChar/jauge.png
new file mode 100644
index 0000000000000000000000000000000000000000..c39362cf517f1749af48e1bf536c158e66a3e3b9
Binary files /dev/null and b/cmi2/assets/selectChar/jauge.png differ
diff --git a/cmi2/assets/selectChar/jauge.png.import b/cmi2/assets/selectChar/jauge.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..d2460a4ec1b407fc28c6e4534f55876af1e766eb
--- /dev/null
+++ b/cmi2/assets/selectChar/jauge.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/jauge.png-477ef0a718c7500ab2165f2860713745.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/selectChar/jauge.png"
+dest_files=[ "res://.import/jauge.png-477ef0a718c7500ab2165f2860713745.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/cmi2/assets/selectChar/jaugefill.png b/cmi2/assets/selectChar/jaugefill.png
new file mode 100644
index 0000000000000000000000000000000000000000..31d91c1e68e3c5782297d015f95d84e21d186fcd
Binary files /dev/null and b/cmi2/assets/selectChar/jaugefill.png differ
diff --git a/cmi2/assets/selectChar/jaugefill.png.import b/cmi2/assets/selectChar/jaugefill.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..e5ec111a305cbbbed1975c531666985c7387daaa
--- /dev/null
+++ b/cmi2/assets/selectChar/jaugefill.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/jaugefill.png-33a5a2af0a62aa48138f0817703b8864.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/selectChar/jaugefill.png"
+dest_files=[ "res://.import/jaugefill.png-33a5a2af0a62aa48138f0817703b8864.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/cmi2/labelSkillFont.tres b/cmi2/labelSkillFont.tres
new file mode 100644
index 0000000000000000000000000000000000000000..f5c9f20e6bb1fba344030a0023b63c7fc536729c
--- /dev/null
+++ b/cmi2/labelSkillFont.tres
@@ -0,0 +1,11 @@
+[gd_resource type="Theme" load_steps=3 format=2]
+
+[ext_resource path="res://assets/fonts/montserrat/Montserrat-SemiBold.otf" type="DynamicFontData" id=1]
+
+[sub_resource type="DynamicFont" id=1]
+size = 14
+extra_spacing_char = 1
+font_data = ExtResource( 1 )
+
+[resource]
+default_font = SubResource( 1 )
diff --git a/cmi2/project.godot b/cmi2/project.godot
index 8e989ef489b7f6eca37e86cb3c3eee199ad7a7c6..1ac25d3358be4412a3349ce5c82640cbe544678d 100644
--- a/cmi2/project.godot
+++ b/cmi2/project.godot
@@ -22,7 +22,6 @@ config/icon="res://img/icon.png"
[autoload]
Globals="*res://Globals.gd"
-SaveSettings="*res://SaveSettings.gd"
[rendering]
diff --git a/cmi2/scenes/GridContainer.gd b/cmi2/scenes/GridContainer.gd
index 5119a8b934d3245f30854e1336b0577f8f33064a..67cc8e304990f83e2fdea93fd55f16d3d642f2b1 100644
--- a/cmi2/scenes/GridContainer.gd
+++ b/cmi2/scenes/GridContainer.gd
@@ -18,7 +18,7 @@ func _ready():
#blank_button.set_normal_texture(charPic)
#blank_button.set_expand(true)
blank_button.set_custom_minimum_size(Vector2(x/ROW,x/ROW))
- self.add_child(blank_button)
+ #self.add_child(blank_button)
get_tree().get_root().connect("size_changed", self, "myfunc")
func myfunc():
diff --git a/cmi2/scenes/Login.tscn b/cmi2/scenes/Login.tscn
index 33114c70e4eea3a2f176eb1d3fcfd6b0acd22d20..82a3cf1b5d8bcc649fb9f3ac914a1896b53aab18 100644
--- a/cmi2/scenes/Login.tscn
+++ b/cmi2/scenes/Login.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=8 format=2]
-[ext_resource path="res://assets/Login/fond_test.jpg" type="Texture" id=1]
+[ext_resource path="res://scenes/login.gd" type="Script" id=1]
[ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=2]
[sub_resource type="DynamicFont" id=1]
@@ -26,12 +26,12 @@ font_data = ExtResource( 2 )
[node name="Control" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
+script = ExtResource( 1 )
[node name="TextureRect" type="TextureRect" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
margin_bottom = 4.0
-texture = ExtResource( 1 )
expand = true
stretch_mode = 7
@@ -45,7 +45,7 @@ custom_constants/margin_top = 20
custom_constants/margin_left = 20
custom_constants/margin_bottom = 60
-[node name="VBoxContainer" type="VBoxContainer" parent="TextureRect/MarginContainer"]
+[node name="pageLogin" type="VBoxContainer" parent="TextureRect/MarginContainer"]
margin_left = 20.0
margin_top = 20.0
margin_right = 1004.0
@@ -54,14 +54,14 @@ size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/separation = 9
-[node name="title" type="Label" parent="TextureRect/MarginContainer/VBoxContainer"]
+[node name="title" type="Label" parent="TextureRect/MarginContainer/pageLogin"]
margin_right = 984.0
margin_bottom = 59.0
custom_fonts/font = SubResource( 1 )
text = "Musicarena"
align = 1
-[node name="login" type="Label" parent="TextureRect/MarginContainer/VBoxContainer"]
+[node name="login" type="Label" parent="TextureRect/MarginContainer/pageLogin"]
margin_top = 68.0
margin_right = 984.0
margin_bottom = 127.0
@@ -69,7 +69,7 @@ custom_fonts/font = SubResource( 1 )
text = "Connexion"
align = 1
-[node name="TextureRect" type="TextureRect" parent="TextureRect/MarginContainer/VBoxContainer"]
+[node name="textureZone" type="TextureRect" parent="TextureRect/MarginContainer/pageLogin"]
margin_left = 242.0
margin_top = 136.0
margin_right = 742.0
@@ -79,7 +79,7 @@ size_flags_vertical = 3
texture = SubResource( 3 )
stretch_mode = 1
-[node name="MarginContainer" type="MarginContainer" parent="TextureRect/MarginContainer/VBoxContainer/TextureRect"]
+[node name="loginZone" type="MarginContainer" parent="TextureRect/MarginContainer/pageLogin/textureZone"]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
@@ -95,40 +95,40 @@ custom_constants/margin_top = 30
custom_constants/margin_left = 50
custom_constants/margin_bottom = 30
-[node name="VBoxContainer" type="VBoxContainer" parent="TextureRect/MarginContainer/VBoxContainer/TextureRect/MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="TextureRect/MarginContainer/pageLogin/textureZone/loginZone"]
margin_left = 50.0
margin_top = 30.0
margin_right = 450.0
margin_bottom = 358.0
custom_constants/separation = 17
-[node name="username" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/TextureRect/MarginContainer/VBoxContainer"]
+[node name="username" type="Label" parent="TextureRect/MarginContainer/pageLogin/textureZone/loginZone/VBoxContainer"]
margin_right = 400.0
margin_bottom = 25.0
custom_fonts/font = SubResource( 4 )
text = "Nom d'utilisateur"
-[node name="name" type="LineEdit" parent="TextureRect/MarginContainer/VBoxContainer/TextureRect/MarginContainer/VBoxContainer"]
+[node name="usernameArea" type="LineEdit" parent="TextureRect/MarginContainer/pageLogin/textureZone/loginZone/VBoxContainer"]
margin_top = 42.0
margin_right = 400.0
margin_bottom = 66.0
placeholder_text = "Ecrire pseudo ici ..."
-[node name="password" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/TextureRect/MarginContainer/VBoxContainer"]
+[node name="password" type="Label" parent="TextureRect/MarginContainer/pageLogin/textureZone/loginZone/VBoxContainer"]
margin_top = 83.0
margin_right = 400.0
margin_bottom = 108.0
custom_fonts/font = SubResource( 4 )
text = "Mot de passe"
-[node name="name2" type="LineEdit" parent="TextureRect/MarginContainer/VBoxContainer/TextureRect/MarginContainer/VBoxContainer"]
+[node name="passwordArea" type="LineEdit" parent="TextureRect/MarginContainer/pageLogin/textureZone/loginZone/VBoxContainer"]
margin_top = 125.0
margin_right = 400.0
margin_bottom = 149.0
secret = true
placeholder_text = "Ecrire mot de passe ici ..."
-[node name="Button" type="Button" parent="TextureRect/MarginContainer/VBoxContainer/TextureRect/MarginContainer/VBoxContainer"]
+[node name="loginButton" type="Button" parent="TextureRect/MarginContainer/pageLogin/textureZone/loginZone/VBoxContainer"]
margin_left = 141.0
margin_top = 166.0
margin_right = 258.0
@@ -137,14 +137,14 @@ size_flags_horizontal = 4
custom_fonts/font = SubResource( 5 )
text = "Connexion"
-[node name="passwordforgot" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/TextureRect/MarginContainer/VBoxContainer"]
+[node name="passwordforgot" type="Label" parent="TextureRect/MarginContainer/pageLogin/textureZone/loginZone/VBoxContainer"]
margin_top = 216.0
margin_right = 400.0
margin_bottom = 241.0
custom_fonts/font = SubResource( 4 )
text = "Mot de passe oublié ?"
-[node name="suscribe" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/TextureRect/MarginContainer/VBoxContainer"]
+[node name="suscribe" type="Label" parent="TextureRect/MarginContainer/pageLogin/textureZone/loginZone/VBoxContainer"]
margin_top = 258.0
margin_right = 400.0
margin_bottom = 283.0
diff --git a/cmi2/scenes/MultiSelectMenu.tscn b/cmi2/scenes/MultiSelectMenu.tscn
index be9a12a94f759a70194d953d2183285165f0dd2f..7a680bca7d29002a72f5beda19d3e7e9ecbdd772 100644
--- a/cmi2/scenes/MultiSelectMenu.tscn
+++ b/cmi2/scenes/MultiSelectMenu.tscn
@@ -98,9 +98,9 @@ uppercase = true
[node name="titleMargins" type="MarginContainer" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
visible = false
-margin_left = 535.0
-margin_right = 854.0
-margin_bottom = 80.0
+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
diff --git a/cmi2/scenes/characterSelection.gd b/cmi2/scenes/characterSelection.gd
index 88ec7a9457c1b103f9d2dbb82b4671ebf80ef88b..284e6b23976cb90de7f38c3e718c90401192472b 100644
--- a/cmi2/scenes/characterSelection.gd
+++ b/cmi2/scenes/characterSelection.gd
@@ -36,10 +36,10 @@ func _ready():
CHAR2 = $MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer/char2
CHAR3 = $MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer/char3
CHAR4 = $MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer/char4
- BACK = $MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer/back
- OPTIONS = $MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer/options
+ BACK = $MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer/back
+ OPTIONS = $MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer/options
- # Connect all of the start menu buttons
+ # Connect all the buttons
CHAR1.connect("pressed", self, "characterSelected", ["char1"])
CHAR2.connect("pressed", self, "characterSelected", ["char2"])
CHAR3.connect("pressed", self, "characterSelected", ["char3"])
@@ -70,14 +70,15 @@ func _process(delta):
#anim_player.set_size(Vector2(y,y))
#anim_player.scale = y
+
-#set new skills value for the character
+# Set new skills value for the character
func _setTextureProgress(skill, value):
#print("Old value = ",skill.value)
skill.value = value
#print("New value = ",skill.value)
-#set the pic of the selected character
+# Set the pic of the selected character
func _setTextureCharacter(character):
var charSprite = $MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/VBoxContainer/character
#charSprite.texture = character
diff --git a/cmi2/scenes/characterSelection.tscn b/cmi2/scenes/characterSelection.tscn
index ada4d329cd01fba3616379cfa7f67d108a6fcd7b..65158b2daa2762b26f96fb9d45b6af12d4bdbe97 100644
--- a/cmi2/scenes/characterSelection.tscn
+++ b/cmi2/scenes/characterSelection.tscn
@@ -1,68 +1,45 @@
+<<<<<<< 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://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"
+[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]
[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="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="DynamicFont" id=4]
+size = 19
+font_data = ExtResource( 9 )
-[sub_resource type="StreamTexture" id=10]
+[sub_resource type="StreamTexture" id=3]
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="fond" type="TextureRect" parent="."]
+[node name="TextureRect" type="TextureRect" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
-texture = SubResource( 1 )
-expand = true
+texture = ExtResource( 2 )
[node name="MarginContainer" type="MarginContainer" parent="."]
anchor_right = 1.0
@@ -75,17 +52,31 @@ margin_right = 1024.0
margin_bottom = 600.0
size_flags_horizontal = 3
size_flags_vertical = 3
-custom_constants/separation = 30
+custom_constants/separation = 100
alignment = 1
[node name="header" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
margin_right = 1024.0
-margin_bottom = 105.0
size_flags_horizontal = 11
-[node name="headerContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer/header"]
+[node name="Control" type="Control" parent="MarginContainer/VBoxContainer/header"]
margin_right = 1024.0
-margin_bottom = 105.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
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/margin_right = 20
@@ -93,38 +84,42 @@ custom_constants/margin_top = 20
custom_constants/margin_left = 20
custom_constants/margin_bottom = 20
-[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/header/headerContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/header/Control/headerContainer"]
margin_left = 20.0
margin_top = 20.0
margin_right = 1004.0
-margin_bottom = 85.0
+margin_bottom = 100.0
custom_constants/separation = 50
-[node name="back" type="TextureButton" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"]
+[node name="back" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
margin_right = 80.0
-margin_bottom = 65.0
+margin_bottom = 80.0
grow_horizontal = 0
rect_min_size = Vector2( 80, 65 )
size_flags_vertical = 3
size_flags_stretch_ratio = 0.2
-texture_normal = SubResource( 2 )
-texture_hover = SubResource( 3 )
+texture_normal = ExtResource( 4 )
+texture_hover = ExtResource( 5 )
expand = true
stretch_mode = 4
-[node name="Multiplayer Selection" type="Label" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"]
+[node name="Multiplayer Selection" type="Label" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
margin_left = 130.0
margin_right = 854.0
-margin_bottom = 65.0
+margin_bottom = 80.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/headerContainer/HBoxContainer"]
+[node name="titleMargins" type="MarginContainer" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
visible = false
margin_left = 535.0
margin_right = 854.0
@@ -134,21 +129,26 @@ size_flags_vertical = 3
custom_constants/margin_right = 150
custom_constants/margin_left = 150
-[node name="options" type="TextureButton" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"]
+[node name="options" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
margin_left = 904.0
margin_right = 984.0
-margin_bottom = 65.0
+margin_bottom = 80.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 = 135.0
+margin_top = 100.0
margin_right = 1024.0
margin_bottom = 600.0
size_flags_horizontal = 3
@@ -162,44 +162,48 @@ custom_constants/margin_bottom = 40
margin_left = 40.0
margin_top = 20.0
margin_right = 984.0
-margin_bottom = 425.0
+margin_bottom = 460.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 = 476.0
-margin_bottom = 405.0
+margin_right = 462.0
+margin_bottom = 440.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="marginCharRight" type="MarginContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character"]
-margin_right = 476.0
-margin_bottom = 405.0
+margin_right = 462.0
+margin_bottom = 440.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 = 396.0
-margin_bottom = 405.0
+margin_right = 382.0
+margin_bottom = 440.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 = 396.0
-margin_bottom = 103.0
+margin_right = 382.0
+margin_bottom = 220.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 = 396.0
-margin_bottom = 103.0
+margin_right = 382.0
+margin_bottom = 220.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
@@ -209,162 +213,229 @@ 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 = 113.0
-margin_right = 396.0
-margin_bottom = 138.0
+margin_top = 230.0
+margin_right = 382.0
+margin_bottom = 254.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 = 148.0
-margin_right = 396.0
-margin_bottom = 405.0
+margin_top = 264.0
+margin_right = 382.0
+margin_bottom = 430.0
[node name="skills" type="VBoxContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment/CenterContainer"]
-margin_right = 396.0
-margin_bottom = 257.0
+margin_left = 41.0
+margin_right = 341.0
+margin_bottom = 166.0
size_flags_horizontal = 3
size_flags_vertical = 3
-custom_constants/separation = -5
+custom_constants/separation = 2
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 = 15.0
-margin_right = 396.0
-margin_bottom = 68.0
-size_flags_horizontal = 3
+margin_top = 20.0
+margin_right = 300.0
+margin_bottom = 40.0
+rect_min_size = Vector2( 300, 0 )
value = 50.0
-texture_under = ExtResource( 5 )
-texture_progress = ExtResource( 6 )
+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="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 = 78.0
-margin_right = 396.0
-margin_bottom = 131.0
+margin_top = 62.0
+margin_right = 300.0
+margin_bottom = 82.0
size_flags_horizontal = 3
value = 20.0
-texture_under = ExtResource( 5 )
-texture_progress = ExtResource( 6 )
+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="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 = 141.0
-margin_right = 396.0
-margin_bottom = 194.0
+margin_top = 104.0
+margin_right = 300.0
+margin_bottom = 124.0
size_flags_horizontal = 3
value = 20.0
-texture_under = ExtResource( 5 )
-texture_progress = ExtResource( 6 )
+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="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 = 204.0
-margin_right = 396.0
-margin_bottom = 257.0
+margin_top = 146.0
+margin_right = 300.0
+margin_bottom = 166.0
size_flags_horizontal = 3
value = 20.0
-texture_under = ExtResource( 5 )
-texture_progress = ExtResource( 6 )
+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
[node name="selection" type="VBoxContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container"]
-margin_left = 496.0
+margin_left = 482.0
margin_right = 944.0
-margin_bottom = 405.0
+margin_bottom = 440.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="charListContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection"]
-margin_right = 448.0
-margin_bottom = 405.0
+margin_right = 462.0
+margin_bottom = 440.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 = 448.0
-margin_bottom = 283.0
+margin_right = 462.0
+margin_bottom = 360.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 = 448.0
-margin_bottom = 283.0
+margin_right = 462.0
+margin_bottom = 360.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/vseparation = 10
custom_constants/hseparation = 10
columns = 4
-script = ExtResource( 7 )
+script = ExtResource( 13 )
[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( 8 )
+texture_normal = ExtResource( 14 )
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( 8 )
+texture_normal = ExtResource( 14 )
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( 8 )
+texture_normal = ExtResource( 14 )
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( 8 )
+texture_normal = ExtResource( 14 )
expand = true
stretch_mode = 4
@@ -373,7 +444,7 @@ margin_left = 10.0
margin_top = 10.0
margin_right = 10.0
margin_bottom = 10.0
-texture_normal = ExtResource( 8 )
+texture_normal = ExtResource( 14 )
expand = true
stretch_mode = 4
@@ -382,7 +453,7 @@ margin_left = 20.0
margin_top = 10.0
margin_right = 20.0
margin_bottom = 10.0
-texture_normal = ExtResource( 8 )
+texture_normal = ExtResource( 14 )
expand = true
stretch_mode = 4
@@ -391,14 +462,14 @@ margin_left = 30.0
margin_top = 10.0
margin_right = 30.0
margin_bottom = 10.0
-texture_normal = ExtResource( 8 )
+texture_normal = ExtResource( 14 )
expand = true
stretch_mode = 4
[node name="buttonPlayMargin" type="MarginContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer"]
-margin_top = 303.0
-margin_right = 448.0
-margin_bottom = 405.0
+margin_top = 380.0
+margin_right = 462.0
+margin_bottom = 440.0
custom_constants/margin_right = 80
custom_constants/margin_top = 20
custom_constants/margin_left = 80
@@ -407,7 +478,12 @@ 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"