From 2911841dafe6470a2f434870a762fcb4e53177f2 Mon Sep 17 00:00:00 2001 From: osquallo Date: Sun, 30 Sep 2018 16:22:07 +0200 Subject: [PATCH] typos --- .../Login-Khanat-background-loading.png | Bin 0 -> 7869 bytes assets/GUI/themes/login_theme.theme | Bin 0 -> 1746 bytes .../background_loader.tscn | 8 +- game_scene/game_scene.gd | 2 + global.gd | 4 +- global.tscn | 9 ++ gui_scene/GUI/login/login_menu.tscn | 115 ++++++++++-------- login_scene/character_creation_box.tscn | 5 +- login_scene/character_selection_menu.tscn | 69 ++++++----- login_scene/login_scene.gd | 3 + 10 files changed, 122 insertions(+), 93 deletions(-) create mode 100644 assets/GUI/images/Login-Khanat-background-loading.png create mode 100644 assets/GUI/themes/login_theme.theme diff --git a/assets/GUI/images/Login-Khanat-background-loading.png b/assets/GUI/images/Login-Khanat-background-loading.png new file mode 100644 index 0000000000000000000000000000000000000000..fe993168d9edd6b9e8015e9fa5533628304e034a GIT binary patch literal 7869 zcmeH}`8Sk(+{dqEt0dYOmElH8B1HBPvc_~{3dJac8;L0U46RgS-)>E)+d2kg-)BZ8 zYi7zCV=P(5WEnAxZOk)0=RE(x^P~55uJgXm=Q`(mzTekpIp0?|Y|RfJlsX6iz+p=Z zQ#$|<;C=Fa6Bgtd1xdTfGr@b-=B5Dm&-0#8n8J%32(WMp0ss}cKkvTKd`K`aDD=qE z=97mJ_`+KD6M`TBG92ZbW9C#z5t}g%d+6DfzMq-JM zfxteC+ULjkK^;%>pR{)DJCJlO`gx*qV#h}@N8g*-v@`4O1x>gm9sat;i16Uxe?fS5 zE=ONe(*;b=4x(Uh(+2S5hAiF&_q0b~kH8**Jpy|K_6Y0|*dwqij^95W}CyA??kcb`a8PZOT{~(Gq?F-+HyUWV{+HM#k*Nw7d8ssV>8BXig z!H|tP_TmeQVNP||<+|!YyHZi`WAipiP_81#X}w9gJ2_t!L;xF#-%_%Kb$ex?I`e(nlUjZQvM4-$Ca3g%R%GafHtA?~Thq_LY&xMbIDE{jXn;md+B3Qv(IKoOQ5zvs$I_bcyK_O*Tip2?eQqYb zmu+1TW(CWKl~w^14Bi1_*Jlxz#l?y8$8}Wr0Zkjj+Q& zGjn%WkE^!`g=XIlC$Z<@8~s$X>B^k#FVK8vyHY#*{DLIzZaXsv!ezj>uq;kTB|4I; zR|h$YZ2bMo3T_t9Y=$f%SLl#zZw+wza#_`e3VE|mg|mpXWOj$!ws;s^xd)zKAYz>h zw7h(Re5#eLDX2OGX`za`sJ_*)6j!*hjC}Mk0xe&7T9fPE7tJt9WH1aj>N7ljX2Y^TIqono-j9Uc(QAyvfiMN8O-16E;k zjMSVgzsaJ*E#TqnA?&ctao6ohh_GSEhTJi>3x)4})iQmh#tx=Kq~+9?vIE!0p~L`p zTE<}SNa`&(%By&zD~gy7MJ;Wj|MpFEw(PA`$t+zpti1`!?WJrH;Tim@Ui2^Xau?^p z!kM#H&fO@6Q(JPQj`~=5B@(RIaC+IG`diZ|kvkcplQV7~X6izZYMB=IOFb_DEPtT4 zYXXt2gpHqX$T32|o%3}MXvw!)B06{{tLG!`Q0qkafB=QawRu%3{?G(XUQ6O2-=szCt;sCIZ=MxA2Gz0*&oHz^c^E~>(pQ_|_^&ElKE75(f zrBD2S|APgpWC4F^V54Gf08jcy42Z@(z#zONCpvlSOvo(_mflYPyi;CAgFKhhL0M$x zZa>IrUS)V?L%J?QGwJ91`g;q`%gMpg#xi&VYAl0QfnXR|Gh+soU};)5nRFd$kCwT) zd1i6GStWIGbr$14vqYFuZpvnr_-ZS82UQN+4!e%eZb9#KuWy~jQ*iHh5_mO9SKp-b|GpM?{8Dx|^*^pOL1NNQi)V?zmKBxyv zyJj5^(%&% z;rcyoG0sW`*rYHGkE%>{=tX;9%Wx$*&E&9=yn(a+vXUXyLN!7*jHKG(rPz-XhyW>X!8kwxnNeh8Y``E{Pz_R*KjD}i*W1hWN z`}F>$sOkHvIsKATAB9wgG*m=inj{?I;xp2%JS_9+p-igqa_(ct-H6m_zubLLTVB#` zePix^%;|@7X21#TO7b|jtFE{wi1Q@_RSIAHj?-5T(1CuD78Xj#rg~OoY4{g>?MwB3 zkXevk+*QdN6$o_Fn0b1BAv@b}5brKeP%O0pSwrFLjP9);o?{5Tp5d>U(dICX0cYE# zGhR`RP^Pcg05m0qliZgQF}#>@I_rMWBhERhufb|Cd3HprG>+xm>to5BC!$&X+J|Zf zZ}@Yr^d3>8NZFK~0qZnR%f+lbmP~lughsF`1Yi1^rT+c6V_7A}3U(2xoJma{On0c! z1WI&Dot=HX?X7+7le;{r>Mm4I-O}nl#E8xC9gMxbN56K|!?wzjC-V+iH8Ort%)!Qw zyyi<~<Ko;Wa6yeu@{zqyfPl^ui-|kg$ zov8WDAWrfzGtS$(3qo!Fq@cxG6NTt?5NM_N@O*R=ZL0{V)cNj?^%1SU zYRek$!~5H%I^!w?J&`3E^(wP+(r0%EoQxdim)}w5aENMj$t0yiYG=*lgQkQ&w2j^w4BnN^z^uayZ6!G>A&_yXEWF`NEr zV?&Ij0iUe2jM_0us??Ph9_zURUGp@q1IX8>t1CQrA69a)SToWO)jStdJ|KD)AbGHTrIB z`$EO+={c97lw^`t#gB((f|AN9F`vFEyj*MvuA1x(iYZ|aSqR4-Jo^6Mu!sweNeB1& z@g=)EE>8o;Pd>o&>1LN)JuDC$+W=s!Zw>PS@pnHJ7@yaYy?l(BF!Mw#^`A^fUE^3$ zz5x?l)3?n7K99#79= zhL;4rfjX&}Hca@H^yD{+!OHIxnn(XdT#WHiysX_snW+Y6kJj9n9+z~(DLNo3{C6I8 zd=`0a!xOhg1-|*#0af9b`@O#!BL&>|`J?dHYgurjB4m5;^9SmT1pf8a%dcsnQ`>qb zjlPgD=$Nw+5l>nd`rZ6cfyDW&I;;Viz;GuFPDqwD8cC!{$`pyWP9`+X|8fWEU)J=p zB0H)aGx~mL)KskXbxhXVXhh)Cr^zs3S+}#X3imGEyJ2-c&*53%VT&8d9}~-ElgQ-6 z)QUyJ4+*UV&5;n%-pg*s17F&;Ud?Wp@)PCq`$(I7y^DE|4)}KI`th&lj{9FZYIOTk zPp9o%v+bFeaqqt)9=*+sF_VxjL^F&IR2UmYp^LlaUrcrETdEbg#}6Ak%Fz5zFs#Z$ zn-<6(6mMt8H*8am43BCEMS19c6{$0`&%U@m;3vXKd&5}$b-H6tv|3>2*tvVDGh8vZ zgzc6pMYl?q?4d8X$c2AhP9LOD&moNWNAqAN&}|i}`DA#7i2J`nEOfx%;a24>4x5aJ zYppbPS2}OCpYDk4FAg&AJ^or%)o}FTIR>dyot*u!arP<6g;Qk{`f-uZE;K?3cXW$vhE>+H(vIA((_f|*!8Nu~?D z+wST2Cjg??mY%T}KCP@DC@n5bm{@rYZKL5f^cIP&Vdq&(}h|M(8Wwp@jkG_M*(-UYWu zMERpo)tPX;#v_1!B+5B9AmCd>k&nbHH5nh*nL3139J(hfu@yJ&saCSPV)sJw)3nQK zSDn_AO0`JsH-%nJ+G?`GNJU2xR@Obw>35wb!9WqwFWG$Fs?+vpUvz=#f?hbRQF89f zg`IQ+Wnb1xSd&H$CH1D?ZSv68nPid8Pt$aME=*nYK166K&S|=* zMX%Cu5^EM{=H2lI4|chSkbB7gomY-_dvedXb2h%`(|?>4SNmIO-t`SXF8;f^GcY%g zE#;ectq<{8oTc&T%`L%j*01SY-z%7cf-?hvoBbd4+2@UOXTUxRzGQ6VrbZ4*W@mfs z6tgR_)Ff8wr&!|vc}5#g+8KsUANd8|`T4SWcM+$TvwcW4(kFa(cRNatJ+i@WV3S{7 zQ90xKm#I*+tYG3(r?N1v{%NiJ=@&XLO|2Skb_twND7r}>SxBx@Z=6*6hWlbNYkbUh z-GLvb&=xP*9KKXOtS<7(?se0`)5Na_-Usiqzl$uV{Bp}#+kH!TX3%J;J6h%Zq#hA6 zK2r%qyIw*R+-9Fz(s>@@wBa6Et}ESVY%7qa!yih%(sA5uAtvRTX~kF1>i5r8dLI+~ z)s9}SbS-tl-z*Zw^ngsHv|UOaGanX3Ow*q?uiaC=+T2xMc0exFHFm@uqAzwM5)96CGeE`*gJ2py8h)~nGF zItsp$ksfFOZvb=vl2$WoJZbE=+!~AZ5x9b>!*e1jUFF)r){|EMGrpTwXFZT#w3~`T zj?r$T8K1+rx!R=t|M9vlV`bosxeJR|Th9J#d_hG1FW`H*srk-*+-NuH9+hoh%_wjE z@A)6|z1GU`f50#PJV_3hc`J7Ex*woCA6ytPJ?VrOFE>jt|2zI$yd)=W&}|jzaQ4csIO8>GgxhcB za#I2fwO+0&YVyu#W7kl=Gs*^%D{>b+9nNQFphn}SIpYA`hxSfV zPE<%V)Zwl5!nt%;r89)HN2|@mD@)C;I&9gRxTotHiXu^h(r^L=29uW!CL5s(3j``D z)F*@pl>a3dBnLink$*hYOotP)S@|ufnVB=nOO}yg`PCJ5ccj)8z7Fyy|ATD2P&>*n$QM z6ZbN^X>#GM0f7{#!9{`*kpTb%AOR5thDgYuEFKa7BQ;J_2r5IEAtFEk0stUG3lxAD z5?dMBK+tFo0=%I%6isN1uFN43b+r#UJ(cTnI_2U#K&e|H02@6|g}BxSzJBB24QlRAco6I9+syFX%B{+kbtq9?;8kd6eazVITu%0 z?srX;S-&U7p+~Tn;2)+n4)U#WzIiG9vF&v9jt_3m4oY&-NyGmOW zXMYuw{rNKEr=p-s!6u*IX#U&qq9uGq@@39&W69`YGmTQu@V!zC5jDD@wQV*38M&@BXPsU{LSGMOCx4pGrI5adp|+ z6jdexL;)zZFa2OS25k}m6ccZFMQw0&c>o0f000dD000C4fWHn85DWkS03HAU00961 zLvL<$Wo~pJO<{6pX>I^hba`xLLJdZ2VRQf*5dZ)H6h9IG0006L0000e6crX1fIk=+ z8XFuP2p#}I9{@oh06`%lnwc3tBP1mQ2LJ#7LT_?pWpW@_X=HS0MR;&wZe#`k002~I zWo=~uE&u=kCIA2cCn$k{06!@zD*`Mn1ONapFflSSW@ctT&CEJHZgg`@X>MgjWNCC0ZgX^D4-isi zb8mHWV`TtRQ&K~Ko2Wr;K@AZQfFb~}f`J;c4HBSp5Z0oQ$pr8Mz}Wte0ysoTSq~mW zHrq1LvZM9IW3k__4ufo<6I#Yw)jKeamlAz=C|0qRD6stz&D#WQYOsn zc<{E}Owiw?XheR=EsPsh-pY!moh#&Eos{~>2HK487$3-v@DKFtfn}UiFqxeXr|il< z@O5()gGa)!vdTlG#Lx(GCX~V(RT&U9;0F8)kxs!o0PMhq9(CjC7~sS?&Hu^NGV}CI o#NZ>$;Qb9dT(>-eNfD?~w}V-ZQYsgSHUyjU|01cE2U1f*L&^T`IRF3v literal 0 HcmV?d00001 diff --git a/background_loader_scene/background_loader.tscn b/background_loader_scene/background_loader.tscn index 8bd065f..ca9cb59 100644 --- a/background_loader_scene/background_loader.tscn +++ b/background_loader_scene/background_loader.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://background_loader_scene/new_loading_bg_0.tga" type="Texture" id=1] -[ext_resource path="res://background_loader_scene/new_loading_bg_1.tga" type="Texture" id=2] +[ext_resource path="res://assets/GUI/images/Login-Khanat-background.png" type="Texture" id=1] +[ext_resource path="res://assets/GUI/images/Login-Khanat-background-loading.png" type="Texture" id=2] [node name="background_loader" type="Panel"] @@ -49,11 +49,11 @@ mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 3 size_flags_vertical = 3 -min_value = 0.0 +min_value = 42.0 max_value = 100.0 step = 1.0 page = 0.0 -value = 0.0 +value = 42.0 exp_edit = false rounded = false texture_under = ExtResource( 1 ) diff --git a/game_scene/game_scene.gd b/game_scene/game_scene.gd index 7953681..08d3bac 100644 --- a/game_scene/game_scene.gd +++ b/game_scene/game_scene.gd @@ -14,6 +14,8 @@ func _ready(): character.show_third_person_camera() character.get_node( "infos_spatial" ).show() + global.get_node( "audio_stream_player" ).stop() + func _process(delta): pass diff --git a/global.gd b/global.gd index 12688e1..38103c5 100644 --- a/global.gd +++ b/global.gd @@ -143,9 +143,9 @@ func _input( event ): func update_progress(): - var progress = (float(loader.get_stage()) / loader.get_stage_count()) * progress_texture.max_value + var progress = (float(loader.get_stage()) / loader.get_stage_count()) * (progress_texture.max_value-progress_texture.min_value) - progress_texture.value = progress + progress_texture.value = progress_texture.min_value+progress func set_new_scene( scene_resource ): diff --git a/global.tscn b/global.tscn index 218073e..901e6c5 100644 --- a/global.tscn +++ b/global.tscn @@ -16,4 +16,13 @@ _sections_unfolded = [ "Pause" ] visible = false +[node name="audio_stream_player" type="AudioStreamPlayer" parent="." index="2"] + +stream = null +volume_db = 0.0 +pitch_scale = 1.0 +autoplay = false +mix_target = 0 +bus = "Master" + diff --git a/gui_scene/GUI/login/login_menu.tscn b/gui_scene/GUI/login/login_menu.tscn index 699d323..73e6f21 100644 --- a/gui_scene/GUI/login/login_menu.tscn +++ b/gui_scene/GUI/login/login_menu.tscn @@ -1,13 +1,14 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=15 format=2] -[ext_resource path="res://gui_scene/GUI/login/login_menu.gd" type="Script" id=1] -[ext_resource path="res://assets/GUI/images/Login-Khanat-background.png" type="Texture" id=2] -[ext_resource path="res://assets/GUI/images/Login-Khanat-background-buttons.png" type="Texture" id=3] -[ext_resource path="res://gui_scene/GUI/login/quit_button.gd" type="Script" id=4] -[ext_resource path="res://assets/GUI/images/Login-Khanat-help-button.png" type="Texture" id=5] -[ext_resource path="res://assets/GUI/images/Login-Khanat-settings-button.png" type="Texture" id=6] -[ext_resource path="res://assets/GUI/images/Login-Khanat-quit-button.png" type="Texture" id=7] -[ext_resource path="res://assets/GUI/fonts/ryzom.ttf" type="DynamicFontData" id=8] +[ext_resource path="res://assets/GUI/themes/login_theme.theme" type="Theme" id=1] +[ext_resource path="res://gui_scene/GUI/login/login_menu.gd" type="Script" id=2] +[ext_resource path="res://assets/GUI/images/Login-Khanat-background.png" type="Texture" id=3] +[ext_resource path="res://assets/GUI/images/Login-Khanat-background-buttons.png" type="Texture" id=4] +[ext_resource path="res://gui_scene/GUI/login/quit_button.gd" type="Script" id=5] +[ext_resource path="res://assets/GUI/images/Login-Khanat-help-button.png" type="Texture" id=6] +[ext_resource path="res://assets/GUI/images/Login-Khanat-settings-button.png" type="Texture" id=7] +[ext_resource path="res://assets/GUI/images/Login-Khanat-quit-button.png" type="Texture" id=8] +[ext_resource path="res://assets/GUI/fonts/ryzom.ttf" type="DynamicFontData" id=9] [sub_resource type="CanvasItemMaterial" id=1] @@ -31,9 +32,17 @@ width = 2048 size = 10 use_mipmaps = false use_filter = false -font_data = ExtResource( 8 ) +font_data = ExtResource( 9 ) _sections_unfolded = [ "Font", "Settings" ] +[sub_resource type="DynamicFont" id=5] + +size = 20 +use_mipmaps = false +use_filter = false +font_data = ExtResource( 9 ) +_sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] + [node name="login_menu" type="Control" index="0"] material = SubResource( 1 ) @@ -47,7 +56,8 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -script = ExtResource( 1 ) +theme = ExtResource( 1 ) +script = ExtResource( 2 ) _sections_unfolded = [ "Material", "Theme", "Visibility", "custom_styles" ] [node name="background" type="TextureRect" parent="." index="0"] @@ -62,7 +72,7 @@ mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -texture = ExtResource( 2 ) +texture = ExtResource( 3 ) expand = true stretch_mode = 7 _sections_unfolded = [ "Visibility" ] @@ -81,7 +91,7 @@ mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 10 size_flags_vertical = 1 -texture = ExtResource( 3 ) +texture = ExtResource( 4 ) stretch_mode = 0 _sections_unfolded = [ "Size Flags" ] @@ -345,7 +355,7 @@ group = null text = "Quitter" flat = false align = 1 -script = ExtResource( 4 ) +script = ExtResource( 5 ) [node name="error_label" type="Label" parent="center_container/v_box_container" index="5"] @@ -454,7 +464,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 5 ) +texture_normal = ExtResource( 6 ) _sections_unfolded = [ "Size Flags", "Textures" ] [node name="settings_button" type="TextureButton" parent="h_box_container/v_box_container/h_box_container" index="1"] @@ -477,7 +487,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 6 ) +texture_normal = ExtResource( 7 ) _sections_unfolded = [ "Size Flags", "Textures" ] [node name="quit_button" type="TextureButton" parent="h_box_container/v_box_container/h_box_container" index="2"] @@ -500,7 +510,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 7 ) +texture_normal = ExtResource( 8 ) _sections_unfolded = [ "Size Flags", "Textures" ] [node name="margin_container" type="MarginContainer" parent="h_box_container/v_box_container" index="1"] @@ -511,7 +521,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 65.0 margin_right = 510.0 -margin_bottom = 265.0 +margin_bottom = 255.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -533,7 +543,7 @@ anchor_bottom = 0.0 margin_left = 32.0 margin_top = 32.0 margin_right = 478.0 -margin_bottom = 200.0 +margin_bottom = 190.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -546,20 +556,21 @@ _sections_unfolded = [ "Margin", "custom_constants" ] [node name="email_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box" index="0"] -editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 446.0 -margin_bottom = 42.0 +margin_bottom = 44.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 +custom_constants/separation = 8 alignment = 0 +_sections_unfolded = [ "custom_constants" ] [node name="email_label_box" type="HBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box/email_box" index="0"] @@ -569,7 +580,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 446.0 -margin_bottom = 14.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -585,8 +596,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 141.0 -margin_bottom = 14.0 +margin_right = 158.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -608,7 +619,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 400.0 margin_right = 446.0 -margin_bottom = 14.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -633,9 +644,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 18.0 +margin_top = 25.0 margin_right = 446.0 -margin_bottom = 42.0 +margin_bottom = 44.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -654,31 +665,31 @@ _sections_unfolded = [ "Material", "Placeholder", "Visibility", "custom_colors", [node name="password_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box" index="1"] -editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 58.0 +margin_top = 60.0 margin_right = 446.0 -margin_bottom = 100.0 +margin_bottom = 104.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 +custom_constants/separation = 8 alignment = 0 +_sections_unfolded = [ "custom_constants" ] [node name="password_label_box" type="HBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box/password_box" index="0"] -editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 446.0 -margin_bottom = 14.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -694,8 +705,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 87.0 -margin_bottom = 14.0 +margin_right = 93.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -703,7 +714,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 4 custom_colors/font_color = Color( 0, 0, 0, 1 ) -text = "mot de passe" +text = "Mot de passe" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 @@ -717,7 +728,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 348.0 margin_right = 446.0 -margin_bottom = 14.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -742,9 +753,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 18.0 +margin_top = 25.0 margin_right = 446.0 -margin_bottom = 42.0 +margin_bottom = 44.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -755,7 +766,7 @@ size_flags_vertical = 1 secret = true focus_mode = 2 context_menu_enabled = true -placeholder_text = "Entrez votre adresse email ici." +placeholder_text = "Entrez votre mot de passe ici." placeholder_alpha = 0.6 caret_blink = false caret_blink_speed = 0.65 @@ -768,9 +779,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 116.0 +margin_top = 120.0 margin_right = 446.0 -margin_bottom = 168.0 +margin_bottom = 158.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -781,13 +792,12 @@ alignment = 0 [node name="checkboxs_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container" index="0"] -editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 217.0 -margin_bottom = 52.0 +margin_right = 228.0 +margin_bottom = 38.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -802,8 +812,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 217.0 -margin_bottom = 24.0 +margin_right = 228.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -819,7 +829,7 @@ toggle_mode = true enabled_focus_mode = 2 shortcut = null group = null -text = "Se souvenir de l'e-mail." +text = "Se souvenir du login." flat = false align = 0 _sections_unfolded = [ "custom_colors" ] @@ -830,9 +840,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 28.0 -margin_right = 217.0 -margin_bottom = 52.0 +margin_top = 21.0 +margin_right = 228.0 +margin_bottom = 38.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -861,7 +871,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 318.0 margin_right = 446.0 -margin_bottom = 52.0 +margin_bottom = 38.0 rect_min_size = Vector2( 128, 0 ) rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -870,6 +880,7 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 10 size_flags_vertical = 1 +custom_fonts/font = SubResource( 5 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null @@ -877,7 +888,7 @@ group = null text = "Jouer" flat = false align = 1 -_sections_unfolded = [ "Material", "Rect", "Size Flags", "Theme", "Visibility", "custom_colors", "custom_constants" ] +_sections_unfolded = [ "Material", "Rect", "Size Flags", "Theme", "Visibility", "custom_colors", "custom_constants", "custom_fonts" ] [connection signal="pressed" from="center_container/v_box_container/login_button" to="." method="_on_login_button_pressed"] diff --git a/login_scene/character_creation_box.tscn b/login_scene/character_creation_box.tscn index 765b67e..8815d9c 100644 --- a/login_scene/character_creation_box.tscn +++ b/login_scene/character_creation_box.tscn @@ -6,7 +6,8 @@ [sub_resource type="Gradient" id=1] offsets = PoolRealArray( 0 ) -colors = PoolColorArray( 0, 0, 0, 1 ) +colors = PoolColorArray( 1, 1, 1, 1 ) +_sections_unfolded = [ "Resource" ] [sub_resource type="GradientTexture" id=2] @@ -62,7 +63,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 texture = SubResource( 2 ) -_sections_unfolded = [ "Material", "Size Flags", "Visibility" ] +_sections_unfolded = [ "Material", "Size Flags", "Theme", "Visibility" ] [node name="margin_container" type="MarginContainer" parent="." index="1"] diff --git a/login_scene/character_selection_menu.tscn b/login_scene/character_selection_menu.tscn index e7e1e20..882dbd4 100644 --- a/login_scene/character_selection_menu.tscn +++ b/login_scene/character_selection_menu.tscn @@ -1,18 +1,19 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=16 format=2] -[ext_resource path="res://login_scene/character_selection_menu.gd" type="Script" id=1] -[ext_resource path="res://game_scene/Game/Character/Character.tscn" type="PackedScene" id=2] -[ext_resource path="res://assets/GUI/images/new_launcher_bg_0-1.png" type="Texture" id=3] -[ext_resource path="res://login_scene/character_slots.tscn" type="PackedScene" id=4] -[ext_resource path="res://login_scene/character_creation_box.tscn" type="PackedScene" id=5] -[ext_resource path="res://assets/GUI/images/button_turn_left_up.png" type="Texture" id=6] -[ext_resource path="res://assets/GUI/images/button_turn_left.png" type="Texture" id=7] -[ext_resource path="res://assets/GUI/images/button_zoom_out.png" type="Texture" id=8] -[ext_resource path="res://assets/GUI/images/button_zoom_in.png" type="Texture" id=9] -[ext_resource path="res://assets/GUI/images/button_turn_right_up.png" type="Texture" id=10] -[ext_resource path="res://assets/GUI/images/button_turn_right.png" type="Texture" id=11] -[ext_resource path="res://assets/GUI/images/button_light_off.png" type="Texture" id=12] -[ext_resource path="res://assets/GUI/images/button_light_on.png" type="Texture" id=13] +[ext_resource path="res://assets/GUI/themes/login_theme.theme" type="Theme" id=1] +[ext_resource path="res://login_scene/character_selection_menu.gd" type="Script" id=2] +[ext_resource path="res://game_scene/Game/Character/Character.tscn" type="PackedScene" id=3] +[ext_resource path="res://assets/GUI/images/Login-Khanat-background.png" type="Texture" id=4] +[ext_resource path="res://login_scene/character_slots.tscn" type="PackedScene" id=5] +[ext_resource path="res://login_scene/character_creation_box.tscn" type="PackedScene" id=6] +[ext_resource path="res://assets/GUI/images/button_turn_left_up.png" type="Texture" id=7] +[ext_resource path="res://assets/GUI/images/button_turn_left.png" type="Texture" id=8] +[ext_resource path="res://assets/GUI/images/button_zoom_out.png" type="Texture" id=9] +[ext_resource path="res://assets/GUI/images/button_zoom_in.png" type="Texture" id=10] +[ext_resource path="res://assets/GUI/images/button_turn_right_up.png" type="Texture" id=11] +[ext_resource path="res://assets/GUI/images/button_turn_right.png" type="Texture" id=12] +[ext_resource path="res://assets/GUI/images/button_light_off.png" type="Texture" id=13] +[ext_resource path="res://assets/GUI/images/button_light_on.png" type="Texture" id=14] [sub_resource type="ViewportTexture" id=1] @@ -32,7 +33,9 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -script = ExtResource( 1 ) +theme = ExtResource( 1 ) +script = ExtResource( 2 ) +_sections_unfolded = [ "Theme" ] [node name="viewport" type="Viewport" parent="." index="0"] @@ -61,10 +64,9 @@ shadow_atlas_quad_2 = 3 shadow_atlas_quad_3 = 4 _sections_unfolded = [ "Render Target", "Rendering" ] -[node name="character" parent="viewport" index="0" instance=ExtResource( 2 )] +[node name="character" parent="viewport" index="0" instance=ExtResource( 3 )] transform = Transform( 0.371345, 0, 0, 0, 0.218854, 0, 0, 0, 0.371345, 0.000610344, -0.00217155, 6.02408 ) -visible = true [node name="face_camera" type="Camera" parent="viewport/character" index="4"] @@ -146,7 +148,7 @@ mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -texture = ExtResource( 3 ) +texture = ExtResource( 4 ) expand = true stretch_mode = 7 _sections_unfolded = [ "Size Flags" ] @@ -188,15 +190,16 @@ size_flags_vertical = 3 alignment = 0 _sections_unfolded = [ "Mouse", "Size Flags", "custom_constants" ] -[node name="character_slots" parent="margin_container/character_box" index="0" instance=ExtResource( 4 )] +[node name="character_slots" parent="margin_container/character_box" index="0" instance=ExtResource( 5 )] -margin_top = 282.0 +margin_top = 281.0 +margin_right = 52.0 margin_bottom = 302.0 size_flags_vertical = 6 custom_constants/separation = 8 _sections_unfolded = [ "Size Flags", "custom_constants" ] -[node name="character_creation_box" parent="margin_container/character_box" index="1" instance=ExtResource( 5 )] +[node name="character_creation_box" parent="margin_container/character_box" index="1" instance=ExtResource( 6 )] visible = false margin_top = 0.0 @@ -211,7 +214,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 58.0 +margin_left = 56.0 margin_right = 1008.0 margin_bottom = 584.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -229,8 +232,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 387.0 -margin_right = 563.0 +margin_left = 388.0 +margin_right = 564.0 margin_bottom = 32.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -262,8 +265,8 @@ action_mode = 0 enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 6 ) -texture_pressed = ExtResource( 7 ) +texture_normal = ExtResource( 7 ) +texture_pressed = ExtResource( 8 ) _sections_unfolded = [ "Hint", "Rect", "Textures" ] [node name="zoom_out" type="TextureButton" parent="margin_container/character_box/v_box_container/h_box_container" index="1"] @@ -287,7 +290,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 8 ) +texture_normal = ExtResource( 9 ) _sections_unfolded = [ "Hint", "Textures" ] [node name="zoom_in" type="TextureButton" parent="margin_container/character_box/v_box_container/h_box_container" index="2"] @@ -311,7 +314,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 9 ) +texture_normal = ExtResource( 10 ) _sections_unfolded = [ "Hint", "Textures" ] [node name="turn_right" type="TextureButton" parent="margin_container/character_box/v_box_container/h_box_container" index="3"] @@ -336,8 +339,8 @@ action_mode = 0 enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 10 ) -texture_pressed = ExtResource( 11 ) +texture_normal = ExtResource( 11 ) +texture_pressed = ExtResource( 12 ) _sections_unfolded = [ "Hint", "Textures" ] [node name="lights" type="TextureButton" parent="margin_container/character_box/v_box_container/h_box_container" index="4"] @@ -362,8 +365,8 @@ pressed = true enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 12 ) -texture_pressed = ExtResource( 13 ) +texture_normal = ExtResource( 13 ) +texture_pressed = ExtResource( 14 ) _sections_unfolded = [ "Hint", "Textures" ] [node name="character_preview_image" type="TextureRect" parent="margin_container/character_box/v_box_container" index="1"] @@ -373,7 +376,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 36.0 -margin_right = 950.0 +margin_right = 952.0 margin_bottom = 584.0 rect_min_size = Vector2( 512, 512 ) rect_pivot_offset = Vector2( 0, 0 ) diff --git a/login_scene/login_scene.gd b/login_scene/login_scene.gd index feffccd..01d7c32 100644 --- a/login_scene/login_scene.gd +++ b/login_scene/login_scene.gd @@ -8,6 +8,9 @@ func _ready(): self.connect( "character_creation_finished", global, "_on_login_scene_character_creation_finished" ) + global.get_node( "audio_stream_player" ).stream = load( "res://assets/test/musiques/pre-mix_khanat_main_theme_2018-07-23.ogg" ) + global.get_node( "audio_stream_player" ).play() + func _on_login_menu_login_button_pressed(): $login_menu.hide() $character_selection_menu.show()