From c67a3c7bb6400692c7e73f8ffef4001f7be0dfbb Mon Sep 17 00:00:00 2001
From: mschieber <morgane.schieber@etu.unistra.fr>
Date: Tue, 3 Mar 2020 11:54:31 +0100
Subject: [PATCH] #80 assets for the character selection page
---
cmi2/assets/selectChar/jauge.png | Bin 0 -> 551 bytes
cmi2/assets/selectChar/jauge.png.import | 34 ++++++++++++++++++++
cmi2/assets/selectChar/jaugefill.png | Bin 0 -> 742 bytes
cmi2/assets/selectChar/jaugefill.png.import | 34 ++++++++++++++++++++
cmi2/labelSkillFont.tres | 11 +++++++
cmi2/project.godot | 1 -
cmi2/scenes/GridContainer.gd | 2 +-
cmi2/scenes/Login.tscn | 30 ++++++++---------
8 files changed, 95 insertions(+), 17 deletions(-)
create mode 100644 cmi2/assets/selectChar/jauge.png
create mode 100644 cmi2/assets/selectChar/jauge.png.import
create mode 100644 cmi2/assets/selectChar/jaugefill.png
create mode 100644 cmi2/assets/selectChar/jaugefill.png.import
create mode 100644 cmi2/labelSkillFont.tres
diff --git a/cmi2/assets/selectChar/jauge.png b/cmi2/assets/selectChar/jauge.png
new file mode 100644
index 0000000000000000000000000000000000000000..c39362cf517f1749af48e1bf536c158e66a3e3b9
GIT binary patch
literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq00Hy>001Ni1^@s6f1k(^00009a7bBm001r{
z001r{0eGc9b^rhXAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-tw}^dRCwC#-N9`dK^O(#hn3qLoJL$h=mFYr0d^BEfHv$NpaL2RhyP42E6ZN*
zVk>gQZ1jE791tT8|K;&^S!Q)Up926a+l>(b!1De0>c-aEZIbn90RZ1`KU$~phN^n^
zdiB{Q_tx64B)cSc<_iE<aZGZb<S-ZLH=l(0!|=^Om;=D|+zomBFt=g0p|{qalWfco
z0J`#$Wc#ItJ~VS-4gmexOf~fn4Sl$0zBexb=-Rrf4woAG&Wr${d%M|&K0KQC+l&BU
z5q?(HX{w=nwj2PK<2APhIsgcC0HB9JAKycFQVReqNL8(-8ae>5Kmr{A1Udj9&;bB}
z4gd&r01)T^fItTT1Udk4DbSsR4gkxs7w7;W&;bB}4gmbSK(DG(lB4+mK=+PAZcjG!
zB)K;u0O;Pky#5gARdq=6Xifmot;Zp+U#-sP^W@If+H;bPnE^moUXpC9Di<62o2I_i
z)B&KcW}aj_^~S}2imR%pB<uL08~|L?ameGRxec?I+{apLx5J0MT>!xM+mF_1qICaV
ppaTH?aySbB{0II3009600|1;=b3L3(GOYjr002ovPDHLkV1h4M=E48~
literal 0
HcmV?d00001
diff --git a/cmi2/assets/selectChar/jauge.png.import b/cmi2/assets/selectChar/jauge.png.import
new file mode 100644
index 0000000..d2460a4
--- /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
GIT binary patch
literal 742
zcmV<C0vY{@P)<h;3K|Lk000e1NJLTq00Hy>001Ni1^@s6f1k(^00009a7bBm001r{
z001r{0eGc9b^rhXAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ;Y)M2xRCwC#-LX;QKokbx2g8t(Km~*h*8uJTdLSZn07XDRNJJ0NgQ>tnNCl8M
zb@B*oIBc}i`Zx~x=KE$uAg^TUt#^O#V9Z8l1^}?$HkAMX*56ib!{_02Cn5$5+tT7b
zKm2Tz(beL2)6PaYJ5Tr1727mFp3$+p`IOmmhHN>mt1kI|r`0ve!Ubl{y_BvsbG7#G
z*WUbuS$#j*xIf$OBMbeQ?f0Awol(B0<!i6+qs+pn$?n%@R`y3#UsU%)mang(4_2%H
z;*RRqNnxDSy>=?bMrnL!`+V@_G0`@bvwqI&92*s5xp-vf{M9zkXZ!s9)w#Q^MzwQ$
z?L7VmIk#A!Pe+WFw#jn2P9OJI3-ssV^e7^3BI3~d9{~6#-WJbq#u0HA5f7yUHao)n
zeE!Zrm;=DiIh^P5`O1O*GMwH;#HAVnKyO?|#9eiuzsy$V$La<Ey>r~OQr~O{^CK&B
z0O<Eh{r2GLsB49OqfP+OdpE^Ef0_Mhnh(GMK>r=y9z5-oR_Fuu0f4nJ5a<9P&;bB}
z4gh>>paTGFNT36NKnDN>IshQh0RVvx00JEV5a<AaKnDQY0)3<;0I)Vj0v!MZIshQh
z0f6rd^xf<2Nkoj*2LO6+eEPUQDXq{WBF@wZ0D5mBuRjI)?)COVL|mv70QA<y>Er%G
zYoO0V{VF2v)e8W6=RP8?mUkAvSZ4Qn`@~8e0Q$8ukBF0|2U@==Zf~|yAA}Fe0l-fh
z&-3`I)L^UY412TRssDN&PIu-f`?vuBf8S_nn{*wpk(tT{0Bg=aX90l!z$*X%0RR63
Y00!p+7Y3H=o&W#<07*qoM6N<$f@=&;)Bpeg
literal 0
HcmV?d00001
diff --git a/cmi2/assets/selectChar/jaugefill.png.import b/cmi2/assets/selectChar/jaugefill.png.import
new file mode 100644
index 0000000..e5ec111
--- /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 0000000..f5c9f20
--- /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 8e989ef..1ac25d3 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 5119a8b..67cc8e3 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 33114c7..82a3cf1 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
--
GitLab