From 2f998c8557addf95194bff22be93c8b7a3961b5a Mon Sep 17 00:00:00 2001
From: mschieber <morgane.schieber@etu.unistra.fr>
Date: Tue, 3 Mar 2020 11:02:53 +0100
Subject: [PATCH] git conflict
---
cmi2/scenes/MultiSelectMenu.tscn | 14 +-
cmi2/scenes/characterSelection.gd | 11 +-
cmi2/scenes/characterSelection.tscn | 310 ++++++++++++++++------------
cmi2/scenes/mainTitleTheme.tres | 4 +-
4 files changed, 190 insertions(+), 149 deletions(-)
diff --git a/cmi2/scenes/MultiSelectMenu.tscn b/cmi2/scenes/MultiSelectMenu.tscn
index 1950728..7a680bc 100644
--- a/cmi2/scenes/MultiSelectMenu.tscn
+++ b/cmi2/scenes/MultiSelectMenu.tscn
@@ -69,12 +69,12 @@ custom_constants/margin_bottom = 20
margin_left = 20.0
margin_top = 20.0
margin_right = 1004.0
-margin_bottom = 120.0
+margin_bottom = 85.0
custom_constants/separation = 50
[node name="back" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
margin_right = 80.0
-margin_bottom = 100.0
+margin_bottom = 65.0
grow_horizontal = 0
rect_min_size = Vector2( 80, 65 )
size_flags_vertical = 3
@@ -87,7 +87,7 @@ stretch_mode = 4
[node name="Multiplayer Selection" type="Label" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
margin_left = 130.0
margin_right = 854.0
-margin_bottom = 100.0
+margin_bottom = 65.0
size_flags_horizontal = 3
size_flags_vertical = 3
theme = ExtResource( 6 )
@@ -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
@@ -109,7 +109,7 @@ custom_constants/margin_left = 150
[node name="options" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
margin_left = 904.0
margin_right = 984.0
-margin_bottom = 100.0
+margin_bottom = 65.0
rect_min_size = Vector2( 80, 65 )
size_flags_horizontal = 9
size_flags_vertical = 3
diff --git a/cmi2/scenes/characterSelection.gd b/cmi2/scenes/characterSelection.gd
index ec63d43..9ffe8d8 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"])
@@ -67,14 +67,15 @@ func _process(delta):
if not video_player.is_playing():
video_player.play()
+
-#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/characterSprite
charSprite.texture = character
diff --git a/cmi2/scenes/characterSelection.tscn b/cmi2/scenes/characterSelection.tscn
index 0f0b8c7..184946c 100644
--- a/cmi2/scenes/characterSelection.tscn
+++ b/cmi2/scenes/characterSelection.tscn
@@ -1,52 +1,52 @@
-[gd_scene load_steps=17 format=2]
+[gd_scene load_steps=21 format=2]
[ext_resource path="res://scenes/characterSelection.gd" type="Script" id=1]
-[ext_resource path="res://assets/allPage/arrow.png" type="Texture" id=2]
-[ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=3]
-[ext_resource path="res://assets/allPage/option.png" type="Texture" id=4]
-[ext_resource path="res://assets/Karla-Bold.ttf" type="DynamicFontData" id=5]
-[ext_resource path="res://assets/allPage/lifebar_bg.png" type="Texture" id=6]
-[ext_resource path="res://assets/allPage/lifebar_fill.png" type="Texture" id=7]
-[ext_resource path="res://scenes/GridContainer.gd" type="Script" id=8]
-[ext_resource path="res://assets/selectChar/charPic.jpg" type="Texture" id=9]
-
-[sub_resource type="DynamicFont" id=1]
-size = 30
-extra_spacing_top = 10
-extra_spacing_bottom = 10
-extra_spacing_char = 1
-font_data = ExtResource( 3 )
-
-[sub_resource type="VideoStreamWebm" id=7]
+[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-Bold.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]
+[ext_resource path="res://assets/Karla-Bold.ttf" type="DynamicFontData" id=15]
+
+[sub_resource type="VideoStreamWebm" id=1]
file = "res://assets/selectChar/testvideo.webm"
[sub_resource type="StreamTexture" id=2]
-[sub_resource type="DynamicFont" id=3]
+[sub_resource type="DynamicFont" id=7]
size = 20
extra_spacing_char = 1
-font_data = ExtResource( 3 )
-
-[sub_resource type="DynamicFont" id=4]
-extra_spacing_char = 2
-font_data = ExtResource( 5 )
+font_data = ExtResource( 9 )
-[sub_resource type="StreamTexture" id=6]
+[sub_resource type="StreamTexture" id=5]
flags = 4
load_path = "res://.import/lullaby.png-7de0196c3f1b74e8aee0908a03011796.stex"
-[sub_resource type="DynamicFont" id=5]
+[sub_resource type="DynamicFont" id=6]
size = 30
extra_spacing_top = 10
extra_spacing_bottom = 10
extra_spacing_char = 2
-font_data = ExtResource( 5 )
+font_data = ExtResource( 15 )
[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
+texture = ExtResource( 2 )
+
[node name="MarginContainer" type="MarginContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
@@ -58,19 +58,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"]
-editor/display_folded = true
margin_right = 1024.0
-margin_bottom = 96.0
size_flags_horizontal = 11
-[node name="headerContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer/header"]
-editor/display_folded = true
+[node name="Control" type="Control" parent="MarginContainer/VBoxContainer/header"]
margin_right = 1024.0
-margin_bottom = 96.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
@@ -78,37 +90,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/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 = 76.0
+margin_bottom = 100.0
custom_constants/separation = 50
-[node name="back" type="TextureButton" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"]
-margin_right = 50.0
-margin_bottom = 56.0
+[node name="back" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+margin_right = 80.0
+margin_bottom = 80.0
grow_horizontal = 0
-rect_min_size = Vector2( 50, 50 )
+rect_min_size = Vector2( 80, 65 )
size_flags_vertical = 3
size_flags_stretch_ratio = 0.2
-texture_normal = ExtResource( 2 )
+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"]
-margin_left = 100.0
-margin_right = 884.0
-margin_bottom = 56.0
+[node name="Multiplayer Selection" type="Label" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+margin_left = 130.0
+margin_right = 854.0
+margin_bottom = 80.0
size_flags_horizontal = 3
size_flags_vertical = 3
-custom_fonts/font = SubResource( 1 )
+theme = ExtResource( 6 )
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
@@ -118,20 +131,21 @@ 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"]
-margin_left = 934.0
+[node name="options" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"]
+margin_left = 904.0
margin_right = 984.0
-margin_bottom = 56.0
-rect_min_size = Vector2( 50, 50 )
+margin_bottom = 80.0
+rect_min_size = Vector2( 80, 65 )
size_flags_horizontal = 9
size_flags_vertical = 3
size_flags_stretch_ratio = 0.3
-texture_normal = ExtResource( 4 )
+texture_normal = ExtResource( 7 )
+texture_hover = ExtResource( 8 )
expand = true
stretch_mode = 5
[node name="marginSelectContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer"]
-margin_top = 126.0
+margin_top = 100.0
margin_right = 1024.0
margin_bottom = 600.0
size_flags_horizontal = 3
@@ -145,38 +159,38 @@ custom_constants/margin_bottom = 40
margin_left = 40.0
margin_top = 40.0
margin_right = 984.0
-margin_bottom = 434.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 = 394.0
+margin_right = 462.0
+margin_bottom = 420.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 = 394.0
+margin_right = 462.0
+margin_bottom = 420.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 = 394.0
+margin_right = 382.0
+margin_bottom = 420.0
size_flags_vertical = 3
-custom_constants/separation = 10
+custom_constants/separation = 0
alignment = 1
[node name="VideoPlayer" type="VideoPlayer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment"]
-margin_left = 198.0
-margin_right = 198.0
-margin_bottom = 92.0
+margin_left = 191.0
+margin_right = 191.0
+margin_bottom = 228.0
size_flags_horizontal = 6
size_flags_vertical = 3
-stream = SubResource( 7 )
+stream = SubResource( 1 )
autoplay = true
[node name="characterSprite" type="TextureRect" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment"]
@@ -190,157 +204,184 @@ expand = true
stretch_mode = 6
[node name="charaName" type="Label" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment"]
-margin_top = 102.0
-margin_right = 396.0
-margin_bottom = 127.0
+margin_top = 228.0
+margin_right = 382.0
+margin_bottom = 254.0
size_flags_horizontal = 3
-custom_fonts/font = SubResource( 3 )
+custom_fonts/font = SubResource( 7 )
text = "Character Name"
align = 1
valign = 1
uppercase = true
[node name="CenterContainer" type="CenterContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/character/marginCharRight/verticalAlignment"]
-margin_top = 137.0
-margin_right = 396.0
-margin_bottom = 394.0
+margin_top = 254.0
+margin_right = 382.0
+margin_bottom = 420.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"]
-margin_right = 396.0
-margin_bottom = 20.0
-custom_fonts/font = SubResource( 4 )
-text = "skill 1"
+margin_right = 300.0
+margin_bottom = 18.0
+size_flags_vertical = 6
+theme = ExtResource( 10 )
+text = "skill 1cv b"
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( 6 )
-texture_progress = ExtResource( 7 )
+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"]
-margin_top = 63.0
-margin_right = 396.0
-margin_bottom = 83.0
-custom_fonts/font = SubResource( 4 )
+margin_top = 42.0
+margin_right = 300.0
+margin_bottom = 60.0
+theme = ExtResource( 10 )
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( 6 )
-texture_progress = ExtResource( 7 )
+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"]
-margin_top = 126.0
-margin_right = 396.0
-margin_bottom = 146.0
-custom_fonts/font = SubResource( 4 )
+margin_top = 84.0
+margin_right = 300.0
+margin_bottom = 102.0
+theme = ExtResource( 10 )
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( 6 )
-texture_progress = ExtResource( 7 )
+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"]
-margin_top = 189.0
-margin_right = 396.0
-margin_bottom = 209.0
-custom_fonts/font = SubResource( 4 )
+margin_top = 126.0
+margin_right = 300.0
+margin_bottom = 144.0
+theme = ExtResource( 10 )
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( 6 )
-texture_progress = ExtResource( 7 )
+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 = 420.0
+margin_right = 382.0
+margin_bottom = 420.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 = 394.0
+margin_bottom = 420.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 = 394.0
+margin_right = 462.0
+margin_bottom = 420.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 = 272.0
+margin_right = 462.0
+margin_bottom = 332.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 = 272.0
+margin_right = 462.0
+margin_bottom = 332.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/vseparation = 10
custom_constants/hseparation = 10
columns = 4
-script = ExtResource( 8 )
+script = ExtResource( 13 )
[node name="char1" type="TextureButton" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer"]
-texture_normal = SubResource( 6 )
+texture_normal = SubResource( 5 )
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( 9 )
+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( 9 )
+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( 9 )
+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( 9 )
+texture_normal = ExtResource( 14 )
expand = true
stretch_mode = 4
@@ -349,7 +390,7 @@ margin_left = 10.0
margin_top = 10.0
margin_right = 10.0
margin_bottom = 10.0
-texture_normal = ExtResource( 9 )
+texture_normal = ExtResource( 14 )
expand = true
stretch_mode = 4
@@ -358,7 +399,7 @@ margin_left = 20.0
margin_top = 10.0
margin_right = 20.0
margin_bottom = 10.0
-texture_normal = ExtResource( 9 )
+texture_normal = ExtResource( 14 )
expand = true
stretch_mode = 4
@@ -367,15 +408,14 @@ margin_left = 30.0
margin_top = 10.0
margin_right = 30.0
margin_bottom = 10.0
-texture_normal = ExtResource( 9 )
+texture_normal = ExtResource( 14 )
expand = true
stretch_mode = 4
[node name="buttonPlayMargin" type="MarginContainer" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer"]
-editor/display_folded = true
-margin_top = 292.0
-margin_right = 448.0
-margin_bottom = 394.0
+margin_top = 352.0
+margin_right = 462.0
+margin_bottom = 420.0
custom_constants/margin_right = 80
custom_constants/margin_top = 20
custom_constants/margin_left = 80
@@ -384,7 +424,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
-margin_right = 368.0
-margin_bottom = 82.0
-custom_fonts/font = SubResource( 5 )
+margin_right = 382.0
+margin_bottom = 48.0
+custom_fonts/font = SubResource( 6 )
text = "PLAY"
diff --git a/cmi2/scenes/mainTitleTheme.tres b/cmi2/scenes/mainTitleTheme.tres
index f3d22a0..25387ea 100644
--- a/cmi2/scenes/mainTitleTheme.tres
+++ b/cmi2/scenes/mainTitleTheme.tres
@@ -2,10 +2,10 @@
[ext_resource path="res://assets/fonts/fibre-font.otf" type="DynamicFontData" id=1]
-[sub_resource type="DynamicFont" id=3]
+[sub_resource type="DynamicFont" id=1]
size = 55
extra_spacing_char = 2
font_data = ExtResource( 1 )
[resource]
-default_font = SubResource( 3 )
+default_font = SubResource( 1 )
--
GitLab