diff --git a/default_env.tres b/default_env.tres index dec3642..a3557cc 100644 --- a/default_env.tres +++ b/default_env.tres @@ -18,4 +18,3 @@ ss_reflections_enabled = true ssao_enabled = true ssao_quality = 1 glow_bloom = 0.2 - diff --git a/gui_scene/GUI/login/login_menu.gd b/gui_scene/GUI/login/login_menu.gd index e2eb5c5..4c89b21 100644 --- a/gui_scene/GUI/login/login_menu.gd +++ b/gui_scene/GUI/login/login_menu.gd @@ -13,10 +13,15 @@ func _on_play_button_pressed(): if username != null and username != "" and password != null and password != "": do_request(username, password) +func _on_play_without_connexion_pressed(): + emit_signal( "login_button_pressed" ) + func do_request(username, password): - var message = load("res://assets/Scripts/Models/nel_login_message.gd").nel_login_message.new("https-login", username, password, "Lirria", "2", "en"); + var message = load("res://assets/Scripts/Models/nel_login_message.gd") + if message: + message = message.nel_login_message.new("https-login", username, password, "Lirria", "2", "en"); # $HTTPRequest.request("http://lirria.khaganat.net/login/r2_login.php?" + message.get_request_string()); - $HTTPRequest.request("http://149.91.80.160/login/r2_login.php?" + message.get_request_string()); + $HTTPRequest.request("http://149.91.80.160/login/r2_login.php?" + message.get_request_string()); func _on_HTTPRequest_request_completed(result, response_code, headers, body): if response_code != 200 || ProjectSettings.get_setting("kaghanat/debug_mode"): @@ -38,3 +43,5 @@ func _make_post_request(url, data_to_send, use_ssl): func _on_register_button_pressed(): emit_signal( "register_button_pressed" ) + + diff --git a/gui_scene/GUI/login/login_menu.tscn b/gui_scene/GUI/login/login_menu.tscn index 894587e..2963078 100644 --- a/gui_scene/GUI/login/login_menu.tscn +++ b/gui_scene/GUI/login/login_menu.tscn @@ -7,517 +7,185 @@ [sub_resource type="CanvasItemMaterial" id=1] -render_priority = 0 -blend_mode = 0 -light_mode = 0 - [sub_resource type="DynamicFont" id=2] - size = 10 -use_mipmaps = false -use_filter = false font_data = ExtResource( 4 ) -_sections_unfolded = [ "Font", "Settings" ] [sub_resource type="DynamicFont" id=3] - size = 20 -use_mipmaps = false -use_filter = false font_data = ExtResource( 4 ) -_sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] [node name="login_menu" type="Control"] - material = SubResource( 1 ) -anchor_left = 0.0 -anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 theme = ExtResource( 1 ) script = ExtResource( 2 ) -_sections_unfolded = [ "Material", "Theme", "Visibility", "custom_styles" ] -[node name="HTTPRequest" type="HTTPRequest" parent="." index="0"] +[node name="HTTPRequest" type="HTTPRequest" parent="."] -download_file = "" -use_threads = false -body_size_limit = -1 -max_redirects = 8 -_sections_unfolded = [ "Pause" ] - -[node name="background" type="TextureRect" parent="." index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 +[node name="background" type="TextureRect" parent="."] anchor_right = 1.0 anchor_bottom = 1.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 texture = ExtResource( 3 ) expand = true stretch_mode = 7 -_sections_unfolded = [ "Visibility" ] -[node name="h_box_container" type="HBoxContainer" parent="." index="2"] - -anchor_left = 0.0 -anchor_top = 0.0 +[node name="h_box_container" type="HBoxContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.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 -alignment = 0 -[node name="container" type="Container" parent="h_box_container" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_right = 638.0 +[node name="container" type="Container" parent="h_box_container"] +margin_right = 585.0 margin_bottom = 720.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 = 1 -_sections_unfolded = [ "Size Flags" ] -[node name="v_box_container" type="VBoxContainer" parent="h_box_container" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 642.0 +[node name="v_box_container" type="VBoxContainer" parent="h_box_container"] +margin_left = 589.0 margin_right = 1280.0 margin_bottom = 720.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 1 -mouse_default_cursor_shape = 0 size_flags_horizontal = 3 -size_flags_vertical = 1 -alignment = 0 -_sections_unfolded = [ "Margin", "Size Flags", "custom_constants" ] -[node name="buttons_box" type="HBoxContainer" parent="h_box_container/v_box_container" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 638.0 -margin_right = 638.0 +[node name="buttons_box" type="HBoxContainer" parent="h_box_container/v_box_container"] +margin_left = 691.0 +margin_right = 691.0 margin_bottom = 61.0 rect_min_size = Vector2( 0, 61 ) -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 1 -mouse_default_cursor_shape = 0 size_flags_horizontal = 10 -size_flags_vertical = 1 custom_constants/separation = 0 alignment = 2 -_sections_unfolded = [ "Rect", "Size Flags", "custom_constants" ] -[node name="margin_container" type="MarginContainer" parent="h_box_container/v_box_container" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="margin_container" type="MarginContainer" parent="h_box_container/v_box_container"] margin_top = 65.0 -margin_right = 638.0 +margin_right = 691.0 margin_bottom = 285.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 custom_constants/margin_right = 32 custom_constants/margin_top = 32 custom_constants/margin_left = 32 custom_constants/margin_bottom = 0 -_sections_unfolded = [ "Size Flags", "custom_constants" ] -[node name="login_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="login_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container"] margin_left = 32.0 margin_top = 32.0 -margin_right = 606.0 +margin_right = 659.0 margin_bottom = 220.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 = 16 -alignment = 0 -_sections_unfolded = [ "Margin", "custom_constants" ] -[node name="email_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_right = 574.0 +[node name="email_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box"] +margin_right = 627.0 margin_bottom = 58.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"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_right = 574.0 +[node name="email_label_box" type="HBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box/email_box"] +margin_right = 627.0 margin_bottom = 17.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 -alignment = 0 -_sections_unfolded = [ "Margin", "custom_constants" ] -[node name="label" type="Label" parent="h_box_container/v_box_container/margin_container/login_box/email_box/email_label_box" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="label" type="Label" parent="h_box_container/v_box_container/margin_container/login_box/email_box/email_label_box"] margin_right = 39.0 margin_bottom = 17.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 2 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 4 custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "Login" -percent_visible = 1.0 -lines_skipped = 0 -max_lines_visible = -1 -_sections_unfolded = [ "custom_colors" ] -[node name="register_button" type="LinkButton" parent="h_box_container/v_box_container/margin_container/login_box/email_box/email_label_box" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 528.0 -margin_right = 574.0 +[node name="register_button" type="LinkButton" parent="h_box_container/v_box_container/margin_container/login_box/email_box/email_label_box"] +margin_left = 581.0 +margin_right = 627.0 margin_bottom = 17.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 2 size_flags_horizontal = 10 -size_flags_vertical = 1 custom_fonts/font = SubResource( 2 ) custom_colors/font_color = Color( 0.0627451, 0.0313726, 0.45098, 1 ) custom_colors/font_color_hover = Color( 0.329412, 0.317647, 0.466667, 1 ) custom_colors/font_color_pressed = Color( 0.0627451, 0.0313726, 0.45098, 1 ) -toggle_mode = false -enabled_focus_mode = 0 -shortcut = null -group = null text = "S'inscrire" underline = 2 -_sections_unfolded = [ "Size Flags", "custom_colors", "custom_constants", "custom_fonts" ] -[node name="email_edit" type="LineEdit" parent="h_box_container/v_box_container/margin_container/login_box/email_box" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="email_edit" type="LineEdit" parent="h_box_container/v_box_container/margin_container/login_box/email_box"] margin_top = 25.0 -margin_right = 574.0 +margin_right = 627.0 margin_bottom = 58.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 1 -size_flags_horizontal = 1 -size_flags_vertical = 1 -focus_mode = 2 -context_menu_enabled = true placeholder_text = "Entrez votre login ici." -placeholder_alpha = 0.6 -caret_blink = false -caret_blink_speed = 0.65 -caret_position = 0 -_sections_unfolded = [ "Material", "Placeholder", "Visibility", "custom_colors", "custom_styles" ] -[node name="password_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="password_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box"] margin_top = 74.0 -margin_right = 574.0 +margin_right = 627.0 margin_bottom = 132.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"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_right = 574.0 +[node name="password_label_box" type="HBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box/password_box"] +margin_right = 627.0 margin_bottom = 17.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 -alignment = 0 -_sections_unfolded = [ "Margin", "custom_constants" ] -[node name="label" type="Label" parent="h_box_container/v_box_container/margin_container/login_box/password_box/password_label_box" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="label" type="Label" parent="h_box_container/v_box_container/margin_container/login_box/password_box/password_label_box"] margin_right = 93.0 margin_bottom = 17.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 2 -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" -percent_visible = 1.0 -lines_skipped = 0 -max_lines_visible = -1 -_sections_unfolded = [ "custom_colors" ] -[node name="link_button" type="LinkButton" parent="h_box_container/v_box_container/margin_container/login_box/password_box/password_label_box" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 476.0 -margin_right = 574.0 +[node name="link_button" type="LinkButton" parent="h_box_container/v_box_container/margin_container/login_box/password_box/password_label_box"] +margin_left = 529.0 +margin_right = 627.0 margin_bottom = 17.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 2 size_flags_horizontal = 10 -size_flags_vertical = 1 custom_fonts/font = SubResource( 2 ) custom_colors/font_color = Color( 0.0627451, 0.0313726, 0.45098, 1 ) custom_colors/font_color_hover = Color( 0.329412, 0.317647, 0.466667, 1 ) custom_colors/font_color_pressed = Color( 0.0627451, 0.0313726, 0.45098, 1 ) -toggle_mode = false -enabled_focus_mode = 0 -shortcut = null -group = null text = "Mot de passe oublié" underline = 2 -_sections_unfolded = [ "Size Flags", "custom_colors", "custom_constants", "custom_fonts" ] -[node name="password_edit" type="LineEdit" parent="h_box_container/v_box_container/margin_container/login_box/password_box" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="password_edit" type="LineEdit" parent="h_box_container/v_box_container/margin_container/login_box/password_box"] margin_top = 25.0 -margin_right = 574.0 +margin_right = 627.0 margin_bottom = 58.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 1 -size_flags_horizontal = 1 -size_flags_vertical = 1 secret = true -focus_mode = 2 -context_menu_enabled = true placeholder_text = "Entrez votre mot de passe ici." -placeholder_alpha = 0.6 -caret_blink = false -caret_blink_speed = 0.65 -caret_position = 0 -_sections_unfolded = [ "Material", "Placeholder", "Visibility", "custom_colors", "custom_styles" ] -[node name="h_box_container" type="HBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box" index="2"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="h_box_container" type="HBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box"] margin_top = 148.0 -margin_right = 574.0 +margin_right = 627.0 margin_bottom = 188.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 -alignment = 0 - -[node name="checkboxs_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container" index="0"] +[node name="checkboxs_box" type="VBoxContainer" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container"] editor/display_folded = true -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 margin_right = 228.0 margin_bottom = 40.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 -alignment = 0 -[node name="check_box" type="CheckBox" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container/checkboxs_box" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="check_box" type="CheckBox" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container/checkboxs_box"] margin_right = 228.0 margin_bottom = 17.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -toggle_mode = true -enabled_focus_mode = 2 -shortcut = null -group = null text = "Se souvenir du login." -flat = false -align = 0 -_sections_unfolded = [ "custom_colors" ] -[node name="check_box2" type="CheckBox" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container/checkboxs_box" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="check_box2" type="CheckBox" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container/checkboxs_box"] 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 -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -toggle_mode = true -enabled_focus_mode = 2 -shortcut = null -group = null text = "Se souvenir du mot de passe." -flat = false -align = 0 -_sections_unfolded = [ "custom_colors" ] -[node name="play_button" type="Button" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 446.0 -margin_right = 574.0 +[node name="play_button" type="Button" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container"] +margin_left = 232.0 +margin_right = 360.0 margin_bottom = 40.0 rect_min_size = Vector2( 128, 0 ) -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 0 size_flags_horizontal = 10 -size_flags_vertical = 1 custom_fonts/font = SubResource( 3 ) -toggle_mode = false -enabled_focus_mode = 2 -shortcut = null -group = null text = "Jouer" -flat = false -align = 1 -_sections_unfolded = [ "Margin", "Material", "Rect", "Size Flags", "Theme", "Visibility", "custom_colors", "custom_constants", "custom_fonts" ] +[node name="play_without_connexion" type="Button" parent="h_box_container/v_box_container/margin_container/login_box/h_box_container"] +margin_left = 364.0 +margin_right = 627.0 +margin_bottom = 40.0 +rect_min_size = Vector2( 128, 0 ) +size_flags_horizontal = 10 +custom_fonts/font = SubResource( 3 ) +text = "Tester sans se connecter" [connection signal="request_completed" from="HTTPRequest" to="." method="_on_HTTPRequest_request_completed"] - [connection signal="pressed" from="h_box_container/v_box_container/margin_container/login_box/email_box/email_label_box/register_button" to="." method="_on_register_button_pressed"] - [connection signal="pressed" from="h_box_container/v_box_container/margin_container/login_box/h_box_container/play_button" to="." method="_on_play_button_pressed"] - - +[connection signal="pressed" from="h_box_container/v_box_container/margin_container/login_box/h_box_container/play_without_connexion" to="." method="_on_play_without_connexion_pressed"] diff --git a/login_scene/login_scene.tscn b/login_scene/login_scene.tscn index 2218f15..107e8d5 100644 --- a/login_scene/login_scene.tscn +++ b/login_scene/login_scene.tscn @@ -66,7 +66,6 @@ margin_left = 1226.0 margin_right = 1280.0 margin_bottom = 61.0 texture_normal = ExtResource( 11 ) - [connection signal="character_selected" from="character_selection_menu" to="." method="_on_character_selection_menu_character_selected"] [connection signal="return_button_pressed" from="character_selection_menu" to="." method="_on_character_selection_menu_return_button_pressed"] [connection signal="login_button_pressed" from="login_menu" to="." method="_on_login_menu_login_button_pressed"]