From a6efe8d4f6ee535b41720d677f7749c351e56906 Mon Sep 17 00:00:00 2001 From: osquallo Date: Mon, 1 Oct 2018 15:32:45 +0200 Subject: [PATCH] amelioration du login_theme --- assets/GUI/themes/login_theme.theme | Bin 1746 -> 2593 bytes gui_scene/GUI/login/login_menu.tscn | 30 +-- login_scene/character_creation_box.tscn | 231 +++++++++++----------- login_scene/character_selection_menu.tscn | 15 +- 4 files changed, 136 insertions(+), 140 deletions(-) diff --git a/assets/GUI/themes/login_theme.theme b/assets/GUI/themes/login_theme.theme index 00062b279cbb99b30ffcfba7cade50bf865dadd8..b4485254772690974aeac69925f73dda5a068d95 100644 GIT binary patch literal 2593 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 Duk~yA literal 1746 zcmV;@1}*tgQ$s@n000005C8x<7XScX1ONb60ssIgwJ-f(01vGq05)odK_IP$059Q& z%o-m89(aIfnFkMmqK4Mu_fGMr^u&>0exFHFm@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 diff --git a/gui_scene/GUI/login/login_menu.tscn b/gui_scene/GUI/login/login_menu.tscn index 73e6f21..061a697 100644 --- a/gui_scene/GUI/login/login_menu.tscn +++ b/gui_scene/GUI/login/login_menu.tscn @@ -43,7 +43,7 @@ use_filter = false font_data = ExtResource( 9 ) _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] -[node name="login_menu" type="Control" index="0"] +[node name="login_menu" type="Control"] material = SubResource( 1 ) anchor_left = 0.0 @@ -139,9 +139,9 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 384.0 -margin_top = 172.0 +margin_top = 157.0 margin_right = 640.0 -margin_bottom = 428.0 +margin_bottom = 442.0 rect_min_size = Vector2( 256, 256 ) rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -521,7 +521,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 65.0 margin_right = 510.0 -margin_bottom = 255.0 +margin_bottom = 285.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -543,7 +543,7 @@ anchor_bottom = 0.0 margin_left = 32.0 margin_top = 32.0 margin_right = 478.0 -margin_bottom = 190.0 +margin_bottom = 220.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -561,7 +561,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 446.0 -margin_bottom = 44.0 +margin_bottom = 58.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -646,7 +646,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 25.0 margin_right = 446.0 -margin_bottom = 44.0 +margin_bottom = 58.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -669,9 +669,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 60.0 +margin_top = 74.0 margin_right = 446.0 -margin_bottom = 104.0 +margin_bottom = 132.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -755,7 +755,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 25.0 margin_right = 446.0 -margin_bottom = 44.0 +margin_bottom = 58.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -779,9 +779,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 120.0 +margin_top = 148.0 margin_right = 446.0 -margin_bottom = 158.0 +margin_bottom = 188.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -797,7 +797,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 228.0 -margin_bottom = 38.0 +margin_bottom = 40.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -871,7 +871,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 318.0 margin_right = 446.0 -margin_bottom = 38.0 +margin_bottom = 40.0 rect_min_size = Vector2( 128, 0 ) rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -888,7 +888,7 @@ group = null text = "Jouer" flat = false align = 1 -_sections_unfolded = [ "Material", "Rect", "Size Flags", "Theme", "Visibility", "custom_colors", "custom_constants", "custom_fonts" ] +_sections_unfolded = [ "Margin", "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 8815d9c..a59f692 100644 --- a/login_scene/character_creation_box.tscn +++ b/login_scene/character_creation_box.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] -[ext_resource path="res://login_scene/character_creation_box.gd" type="Script" id=1] -[ext_resource path="res://assets/GUI/fonts/ryzom.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://assets/GUI/themes/login_theme.theme" type="Theme" id=1] +[ext_resource path="res://login_scene/character_creation_box.gd" type="Script" id=2] +[ext_resource path="res://assets/GUI/fonts/ryzom.ttf" type="DynamicFontData" id=3] [sub_resource type="Gradient" id=1] @@ -20,10 +21,10 @@ width = 2048 size = 18 use_mipmaps = false use_filter = true -font_data = ExtResource( 2 ) +font_data = ExtResource( 3 ) _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] -[node name="character_creation_box" type="MarginContainer"] +[node name="character_creation_box" type="MarginContainer" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -31,19 +32,16 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 220.0 margin_right = 1024.0 -margin_bottom = 380.0 +margin_bottom = 659.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 3 size_flags_vertical = 6 -custom_constants/margin_right = 8 -custom_constants/margin_top = 8 -custom_constants/margin_left = 8 -custom_constants/margin_bottom = 8 -script = ExtResource( 1 ) -_sections_unfolded = [ "Material", "Size Flags", "custom_constants" ] +theme = ExtResource( 1 ) +script = ExtResource( 2 ) +_sections_unfolded = [ "Material", "Size Flags", "Theme", "custom_constants" ] [node name="nine_patch_rect" type="NinePatchRect" parent="." index="0"] @@ -53,9 +51,8 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 8.0 -margin_top = 8.0 -margin_right = 1016.0 -margin_bottom = 252.0 +margin_right = 1024.0 +margin_bottom = 448.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -72,9 +69,8 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 8.0 -margin_top = 8.0 -margin_right = 1016.0 -margin_bottom = 252.0 +margin_right = 1024.0 +margin_bottom = 448.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -95,14 +91,15 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 8.0 margin_top = 8.0 -margin_right = 1000.0 -margin_bottom = 236.0 +margin_right = 1008.0 +margin_bottom = 440.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 7 size_flags_vertical = 6 +custom_constants/separation = 18 alignment = 0 _sections_unfolded = [ "Size Flags", "Theme", "custom_constants" ] @@ -112,7 +109,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 992.0 +margin_right = 1000.0 margin_bottom = 4.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -123,14 +120,13 @@ size_flags_vertical = 1 [node name="name_box" type="HBoxContainer" parent="margin_container/v_box_container" index="1"] -editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 8.0 -margin_right = 992.0 -margin_bottom = 32.0 +margin_top = 22.0 +margin_right = 1000.0 +margin_bottom = 55.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -138,6 +134,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 alignment = 0 +_sections_unfolded = [ "Size Flags" ] [node name="label" type="Label" parent="margin_container/v_box_container/name_box" index="0"] @@ -145,9 +142,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 5.0 -margin_right = 494.0 -margin_bottom = 19.0 +margin_top = 8.0 +margin_right = 498.0 +margin_bottom = 25.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -167,9 +164,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 498.0 -margin_right = 992.0 -margin_bottom = 24.0 +margin_left = 502.0 +margin_right = 1000.0 +margin_bottom = 33.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -185,18 +182,17 @@ placeholder_alpha = 0.6 caret_blink = false caret_blink_speed = 0.65 caret_position = 0 -_sections_unfolded = [ "Placeholder", "Size Flags" ] +_sections_unfolded = [ "Margin", "Placeholder", "Size Flags", "custom_constants" ] [node name="generate_name_box" type="HBoxContainer" parent="margin_container/v_box_container" index="2"] -editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 36.0 -margin_right = 992.0 -margin_bottom = 60.0 +margin_top = 73.0 +margin_right = 1000.0 +margin_bottom = 106.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -211,9 +207,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 5.0 -margin_right = 40.0 -margin_bottom = 19.0 +margin_top = 8.0 +margin_right = 46.0 +margin_bottom = 25.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -231,9 +227,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 44.0 -margin_right = 83.0 -margin_bottom = 24.0 +margin_left = 50.0 +margin_right = 62.0 +margin_bottom = 33.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -257,10 +253,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 87.0 -margin_top = 5.0 -margin_right = 165.0 -margin_bottom = 19.0 +margin_left = 66.0 +margin_top = 8.0 +margin_right = 152.0 +margin_bottom = 25.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -278,9 +274,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 169.0 -margin_right = 243.0 -margin_bottom = 24.0 +margin_left = 156.0 +margin_right = 236.0 +margin_bottom = 33.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -304,10 +300,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 247.0 -margin_top = 5.0 -margin_right = 311.0 -margin_bottom = 19.0 +margin_left = 240.0 +margin_top = 8.0 +margin_right = 307.0 +margin_bottom = 25.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -325,9 +321,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 315.0 -margin_right = 389.0 -margin_bottom = 24.0 +margin_left = 311.0 +margin_right = 391.0 +margin_bottom = 33.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -351,9 +347,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 875.0 -margin_right = 992.0 -margin_bottom = 24.0 +margin_left = 867.0 +margin_right = 1000.0 +margin_bottom = 33.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -368,7 +364,7 @@ group = null text = "Générer un nom" flat = false align = 1 -_sections_unfolded = [ "Focus", "Size Flags", "Theme" ] +_sections_unfolded = [ "Focus", "Margin", "Size Flags", "Theme" ] [node name="h_separator2" type="HSeparator" parent="margin_container/v_box_container" index="3"] @@ -376,9 +372,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 64.0 -margin_right = 992.0 -margin_bottom = 68.0 +margin_top = 124.0 +margin_right = 1000.0 +margin_bottom = 128.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -393,9 +389,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 72.0 -margin_right = 992.0 -margin_bottom = 86.0 +margin_top = 146.0 +margin_right = 1000.0 +margin_bottom = 163.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -410,8 +406,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 494.0 -margin_bottom = 14.0 +margin_right = 498.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -432,9 +428,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 498.0 -margin_right = 992.0 -margin_bottom = 14.0 +margin_left = 502.0 +margin_right = 1000.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -451,7 +447,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 12.0 -margin_bottom = 14.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -470,7 +466,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 16.0 -margin_right = 483.0 +margin_right = 486.0 margin_bottom = 12.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -494,9 +490,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 487.0 -margin_right = 494.0 -margin_bottom = 14.0 +margin_left = 490.0 +margin_right = 498.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -515,9 +511,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 90.0 -margin_right = 992.0 -margin_bottom = 104.0 +margin_top = 181.0 +margin_right = 1000.0 +margin_bottom = 198.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -532,8 +528,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 494.0 -margin_bottom = 14.0 +margin_right = 498.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -554,9 +550,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 498.0 -margin_right = 992.0 -margin_bottom = 14.0 +margin_left = 502.0 +margin_right = 1000.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -572,8 +568,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 30.0 -margin_bottom = 14.0 +margin_right = 31.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -591,8 +587,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 34.0 -margin_right = 452.0 +margin_left = 35.0 +margin_right = 450.0 margin_bottom = 12.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -616,9 +612,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 456.0 -margin_right = 494.0 -margin_bottom = 14.0 +margin_left = 454.0 +margin_right = 498.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -636,9 +632,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 108.0 -margin_right = 992.0 -margin_bottom = 122.0 +margin_top = 216.0 +margin_right = 1000.0 +margin_bottom = 233.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -653,8 +649,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 494.0 -margin_bottom = 14.0 +margin_right = 498.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -674,8 +670,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 498.0 -margin_right = 992.0 +margin_left = 502.0 +margin_right = 1000.0 margin_bottom = 12.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -699,9 +695,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 126.0 -margin_right = 992.0 -margin_bottom = 146.0 +margin_top = 251.0 +margin_right = 1000.0 +margin_bottom = 268.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -716,8 +712,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 3.0 -margin_right = 494.0 +margin_right = 498.0 margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -738,9 +733,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 498.0 -margin_right = 992.0 -margin_bottom = 20.0 +margin_left = 502.0 +margin_right = 1000.0 +margin_bottom = 17.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -764,9 +759,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 150.0 -margin_right = 992.0 -margin_bottom = 154.0 +margin_top = 286.0 +margin_right = 1000.0 +margin_bottom = 290.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -780,9 +775,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 158.0 -margin_right = 992.0 -margin_bottom = 180.0 +margin_top = 308.0 +margin_right = 1000.0 +margin_bottom = 330.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -804,9 +799,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 184.0 -margin_right = 992.0 -margin_bottom = 204.0 +margin_top = 348.0 +margin_right = 1000.0 +margin_bottom = 381.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -828,9 +823,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 208.0 -margin_right = 992.0 -margin_bottom = 228.0 +margin_top = 399.0 +margin_right = 1000.0 +margin_bottom = 432.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 diff --git a/login_scene/character_selection_menu.tscn b/login_scene/character_selection_menu.tscn index 882dbd4..e553120 100644 --- a/login_scene/character_selection_menu.tscn +++ b/login_scene/character_selection_menu.tscn @@ -192,9 +192,9 @@ _sections_unfolded = [ "Mouse", "Size Flags", "custom_constants" ] [node name="character_slots" parent="margin_container/character_box" index="0" instance=ExtResource( 5 )] -margin_top = 281.0 -margin_right = 52.0 -margin_bottom = 302.0 +margin_top = 275.0 +margin_right = 64.0 +margin_bottom = 308.0 size_flags_vertical = 6 custom_constants/separation = 8 _sections_unfolded = [ "Size Flags", "custom_constants" ] @@ -210,11 +210,12 @@ size_flags_vertical = 7 [node name="v_box_container" type="VBoxContainer" parent="margin_container/character_box" index="2"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 56.0 +margin_left = 68.0 margin_right = 1008.0 margin_bottom = 584.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -232,8 +233,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 388.0 -margin_right = 564.0 +margin_left = 382.0 +margin_right = 558.0 margin_bottom = 32.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -376,7 +377,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 36.0 -margin_right = 952.0 +margin_right = 940.0 margin_bottom = 584.0 rect_min_size = Vector2( 512, 512 ) rect_pivot_offset = Vector2( 0, 0 )