typos
This commit is contained in:
parent
0e4532998d
commit
2911841daf
10 changed files with 122 additions and 93 deletions
BIN
assets/GUI/images/Login-Khanat-background-loading.png
Normal file
BIN
assets/GUI/images/Login-Khanat-background-loading.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.7 KiB |
BIN
assets/GUI/themes/login_theme.theme
Normal file
BIN
assets/GUI/themes/login_theme.theme
Normal file
Binary file not shown.
|
@ -1,7 +1,7 @@
|
||||||
[gd_scene load_steps=3 format=2]
|
[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://assets/GUI/images/Login-Khanat-background.png" 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-loading.png" type="Texture" id=2]
|
||||||
|
|
||||||
[node name="background_loader" type="Panel"]
|
[node name="background_loader" type="Panel"]
|
||||||
|
|
||||||
|
@ -49,11 +49,11 @@ mouse_filter = 1
|
||||||
mouse_default_cursor_shape = 0
|
mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 3
|
size_flags_horizontal = 3
|
||||||
size_flags_vertical = 3
|
size_flags_vertical = 3
|
||||||
min_value = 0.0
|
min_value = 42.0
|
||||||
max_value = 100.0
|
max_value = 100.0
|
||||||
step = 1.0
|
step = 1.0
|
||||||
page = 0.0
|
page = 0.0
|
||||||
value = 0.0
|
value = 42.0
|
||||||
exp_edit = false
|
exp_edit = false
|
||||||
rounded = false
|
rounded = false
|
||||||
texture_under = ExtResource( 1 )
|
texture_under = ExtResource( 1 )
|
||||||
|
|
|
@ -14,6 +14,8 @@ func _ready():
|
||||||
character.show_third_person_camera()
|
character.show_third_person_camera()
|
||||||
character.get_node( "infos_spatial" ).show()
|
character.get_node( "infos_spatial" ).show()
|
||||||
|
|
||||||
|
global.get_node( "audio_stream_player" ).stop()
|
||||||
|
|
||||||
func _process(delta):
|
func _process(delta):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
|
@ -143,9 +143,9 @@ func _input( event ):
|
||||||
|
|
||||||
func update_progress():
|
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 ):
|
func set_new_scene( scene_resource ):
|
||||||
|
|
|
@ -16,4 +16,13 @@ _sections_unfolded = [ "Pause" ]
|
||||||
|
|
||||||
visible = false
|
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"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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/themes/login_theme.theme" type="Theme" id=1]
|
||||||
[ext_resource path="res://assets/GUI/images/Login-Khanat-background.png" type="Texture" id=2]
|
[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-buttons.png" type="Texture" id=3]
|
[ext_resource path="res://assets/GUI/images/Login-Khanat-background.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-background-buttons.png" type="Texture" id=4]
|
||||||
[ext_resource path="res://assets/GUI/images/Login-Khanat-help-button.png" type="Texture" id=5]
|
[ext_resource path="res://gui_scene/GUI/login/quit_button.gd" type="Script" 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-help-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/images/Login-Khanat-settings-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/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]
|
[sub_resource type="CanvasItemMaterial" id=1]
|
||||||
|
|
||||||
|
@ -31,9 +32,17 @@ width = 2048
|
||||||
size = 10
|
size = 10
|
||||||
use_mipmaps = false
|
use_mipmaps = false
|
||||||
use_filter = false
|
use_filter = false
|
||||||
font_data = ExtResource( 8 )
|
font_data = ExtResource( 9 )
|
||||||
_sections_unfolded = [ "Font", "Settings" ]
|
_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"]
|
[node name="login_menu" type="Control" index="0"]
|
||||||
|
|
||||||
material = SubResource( 1 )
|
material = SubResource( 1 )
|
||||||
|
@ -47,7 +56,8 @@ mouse_filter = 0
|
||||||
mouse_default_cursor_shape = 0
|
mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 1
|
size_flags_horizontal = 1
|
||||||
size_flags_vertical = 1
|
size_flags_vertical = 1
|
||||||
script = ExtResource( 1 )
|
theme = ExtResource( 1 )
|
||||||
|
script = ExtResource( 2 )
|
||||||
_sections_unfolded = [ "Material", "Theme", "Visibility", "custom_styles" ]
|
_sections_unfolded = [ "Material", "Theme", "Visibility", "custom_styles" ]
|
||||||
|
|
||||||
[node name="background" type="TextureRect" parent="." index="0"]
|
[node name="background" type="TextureRect" parent="." index="0"]
|
||||||
|
@ -62,7 +72,7 @@ mouse_filter = 1
|
||||||
mouse_default_cursor_shape = 0
|
mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 1
|
size_flags_horizontal = 1
|
||||||
size_flags_vertical = 1
|
size_flags_vertical = 1
|
||||||
texture = ExtResource( 2 )
|
texture = ExtResource( 3 )
|
||||||
expand = true
|
expand = true
|
||||||
stretch_mode = 7
|
stretch_mode = 7
|
||||||
_sections_unfolded = [ "Visibility" ]
|
_sections_unfolded = [ "Visibility" ]
|
||||||
|
@ -81,7 +91,7 @@ mouse_filter = 1
|
||||||
mouse_default_cursor_shape = 0
|
mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 10
|
size_flags_horizontal = 10
|
||||||
size_flags_vertical = 1
|
size_flags_vertical = 1
|
||||||
texture = ExtResource( 3 )
|
texture = ExtResource( 4 )
|
||||||
stretch_mode = 0
|
stretch_mode = 0
|
||||||
_sections_unfolded = [ "Size Flags" ]
|
_sections_unfolded = [ "Size Flags" ]
|
||||||
|
|
||||||
|
@ -345,7 +355,7 @@ group = null
|
||||||
text = "Quitter"
|
text = "Quitter"
|
||||||
flat = false
|
flat = false
|
||||||
align = 1
|
align = 1
|
||||||
script = ExtResource( 4 )
|
script = ExtResource( 5 )
|
||||||
|
|
||||||
[node name="error_label" type="Label" parent="center_container/v_box_container" index="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
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
group = null
|
group = null
|
||||||
texture_normal = ExtResource( 5 )
|
texture_normal = ExtResource( 6 )
|
||||||
_sections_unfolded = [ "Size Flags", "Textures" ]
|
_sections_unfolded = [ "Size Flags", "Textures" ]
|
||||||
|
|
||||||
[node name="settings_button" type="TextureButton" parent="h_box_container/v_box_container/h_box_container" index="1"]
|
[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
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
group = null
|
group = null
|
||||||
texture_normal = ExtResource( 6 )
|
texture_normal = ExtResource( 7 )
|
||||||
_sections_unfolded = [ "Size Flags", "Textures" ]
|
_sections_unfolded = [ "Size Flags", "Textures" ]
|
||||||
|
|
||||||
[node name="quit_button" type="TextureButton" parent="h_box_container/v_box_container/h_box_container" index="2"]
|
[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
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
group = null
|
group = null
|
||||||
texture_normal = ExtResource( 7 )
|
texture_normal = ExtResource( 8 )
|
||||||
_sections_unfolded = [ "Size Flags", "Textures" ]
|
_sections_unfolded = [ "Size Flags", "Textures" ]
|
||||||
|
|
||||||
[node name="margin_container" type="MarginContainer" parent="h_box_container/v_box_container" index="1"]
|
[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
|
anchor_bottom = 0.0
|
||||||
margin_top = 65.0
|
margin_top = 65.0
|
||||||
margin_right = 510.0
|
margin_right = 510.0
|
||||||
margin_bottom = 265.0
|
margin_bottom = 255.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 0
|
mouse_filter = 0
|
||||||
|
@ -533,7 +543,7 @@ anchor_bottom = 0.0
|
||||||
margin_left = 32.0
|
margin_left = 32.0
|
||||||
margin_top = 32.0
|
margin_top = 32.0
|
||||||
margin_right = 478.0
|
margin_right = 478.0
|
||||||
margin_bottom = 200.0
|
margin_bottom = 190.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 1
|
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"]
|
[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_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 42.0
|
margin_bottom = 44.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 1
|
mouse_filter = 1
|
||||||
mouse_default_cursor_shape = 0
|
mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 1
|
size_flags_horizontal = 1
|
||||||
size_flags_vertical = 1
|
size_flags_vertical = 1
|
||||||
|
custom_constants/separation = 8
|
||||||
alignment = 0
|
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"]
|
[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_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 14.0
|
margin_bottom = 17.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 1
|
mouse_filter = 1
|
||||||
|
@ -585,8 +596,8 @@ anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_right = 141.0
|
margin_right = 158.0
|
||||||
margin_bottom = 14.0
|
margin_bottom = 17.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 2
|
mouse_filter = 2
|
||||||
|
@ -608,7 +619,7 @@ anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_left = 400.0
|
margin_left = 400.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 14.0
|
margin_bottom = 17.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 0
|
mouse_filter = 0
|
||||||
|
@ -633,9 +644,9 @@ anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_top = 18.0
|
margin_top = 25.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 42.0
|
margin_bottom = 44.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
focus_mode = 2
|
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"]
|
[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_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_top = 58.0
|
margin_top = 60.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 100.0
|
margin_bottom = 104.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 1
|
mouse_filter = 1
|
||||||
mouse_default_cursor_shape = 0
|
mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 1
|
size_flags_horizontal = 1
|
||||||
size_flags_vertical = 1
|
size_flags_vertical = 1
|
||||||
|
custom_constants/separation = 8
|
||||||
alignment = 0
|
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"]
|
[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_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 14.0
|
margin_bottom = 17.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 1
|
mouse_filter = 1
|
||||||
|
@ -694,8 +705,8 @@ anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_right = 87.0
|
margin_right = 93.0
|
||||||
margin_bottom = 14.0
|
margin_bottom = 17.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 2
|
mouse_filter = 2
|
||||||
|
@ -703,7 +714,7 @@ mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 1
|
size_flags_horizontal = 1
|
||||||
size_flags_vertical = 4
|
size_flags_vertical = 4
|
||||||
custom_colors/font_color = Color( 0, 0, 0, 1 )
|
custom_colors/font_color = Color( 0, 0, 0, 1 )
|
||||||
text = "mot de passe"
|
text = "Mot de passe"
|
||||||
percent_visible = 1.0
|
percent_visible = 1.0
|
||||||
lines_skipped = 0
|
lines_skipped = 0
|
||||||
max_lines_visible = -1
|
max_lines_visible = -1
|
||||||
|
@ -717,7 +728,7 @@ anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_left = 348.0
|
margin_left = 348.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 14.0
|
margin_bottom = 17.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 0
|
mouse_filter = 0
|
||||||
|
@ -742,9 +753,9 @@ anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_top = 18.0
|
margin_top = 25.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 42.0
|
margin_bottom = 44.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
focus_mode = 2
|
focus_mode = 2
|
||||||
|
@ -755,7 +766,7 @@ size_flags_vertical = 1
|
||||||
secret = true
|
secret = true
|
||||||
focus_mode = 2
|
focus_mode = 2
|
||||||
context_menu_enabled = true
|
context_menu_enabled = true
|
||||||
placeholder_text = "Entrez votre adresse email ici."
|
placeholder_text = "Entrez votre mot de passe ici."
|
||||||
placeholder_alpha = 0.6
|
placeholder_alpha = 0.6
|
||||||
caret_blink = false
|
caret_blink = false
|
||||||
caret_blink_speed = 0.65
|
caret_blink_speed = 0.65
|
||||||
|
@ -768,9 +779,9 @@ anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_top = 116.0
|
margin_top = 120.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 168.0
|
margin_bottom = 158.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 1
|
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"]
|
[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_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_right = 217.0
|
margin_right = 228.0
|
||||||
margin_bottom = 52.0
|
margin_bottom = 38.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
mouse_filter = 1
|
mouse_filter = 1
|
||||||
|
@ -802,8 +812,8 @@ anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_right = 217.0
|
margin_right = 228.0
|
||||||
margin_bottom = 24.0
|
margin_bottom = 17.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
focus_mode = 2
|
focus_mode = 2
|
||||||
|
@ -819,7 +829,7 @@ toggle_mode = true
|
||||||
enabled_focus_mode = 2
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
group = null
|
group = null
|
||||||
text = "Se souvenir de l'e-mail."
|
text = "Se souvenir du login."
|
||||||
flat = false
|
flat = false
|
||||||
align = 0
|
align = 0
|
||||||
_sections_unfolded = [ "custom_colors" ]
|
_sections_unfolded = [ "custom_colors" ]
|
||||||
|
@ -830,9 +840,9 @@ anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_top = 28.0
|
margin_top = 21.0
|
||||||
margin_right = 217.0
|
margin_right = 228.0
|
||||||
margin_bottom = 52.0
|
margin_bottom = 38.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
focus_mode = 2
|
focus_mode = 2
|
||||||
|
@ -861,7 +871,7 @@ anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_left = 318.0
|
margin_left = 318.0
|
||||||
margin_right = 446.0
|
margin_right = 446.0
|
||||||
margin_bottom = 52.0
|
margin_bottom = 38.0
|
||||||
rect_min_size = Vector2( 128, 0 )
|
rect_min_size = Vector2( 128, 0 )
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
|
@ -870,6 +880,7 @@ mouse_filter = 0
|
||||||
mouse_default_cursor_shape = 0
|
mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 10
|
size_flags_horizontal = 10
|
||||||
size_flags_vertical = 1
|
size_flags_vertical = 1
|
||||||
|
custom_fonts/font = SubResource( 5 )
|
||||||
toggle_mode = false
|
toggle_mode = false
|
||||||
enabled_focus_mode = 2
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
|
@ -877,7 +888,7 @@ group = null
|
||||||
text = "Jouer"
|
text = "Jouer"
|
||||||
flat = false
|
flat = false
|
||||||
align = 1
|
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"]
|
[connection signal="pressed" from="center_container/v_box_container/login_button" to="." method="_on_login_button_pressed"]
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
[sub_resource type="Gradient" id=1]
|
[sub_resource type="Gradient" id=1]
|
||||||
|
|
||||||
offsets = PoolRealArray( 0 )
|
offsets = PoolRealArray( 0 )
|
||||||
colors = PoolColorArray( 0, 0, 0, 1 )
|
colors = PoolColorArray( 1, 1, 1, 1 )
|
||||||
|
_sections_unfolded = [ "Resource" ]
|
||||||
|
|
||||||
[sub_resource type="GradientTexture" id=2]
|
[sub_resource type="GradientTexture" id=2]
|
||||||
|
|
||||||
|
@ -62,7 +63,7 @@ mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 1
|
size_flags_horizontal = 1
|
||||||
size_flags_vertical = 1
|
size_flags_vertical = 1
|
||||||
texture = SubResource( 2 )
|
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"]
|
[node name="margin_container" type="MarginContainer" parent="." index="1"]
|
||||||
|
|
||||||
|
|
|
@ -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://assets/GUI/themes/login_theme.theme" type="Theme" id=1]
|
||||||
[ext_resource path="res://game_scene/Game/Character/Character.tscn" type="PackedScene" id=2]
|
[ext_resource path="res://login_scene/character_selection_menu.gd" type="Script" id=2]
|
||||||
[ext_resource path="res://assets/GUI/images/new_launcher_bg_0-1.png" type="Texture" id=3]
|
[ext_resource path="res://game_scene/Game/Character/Character.tscn" type="PackedScene" id=3]
|
||||||
[ext_resource path="res://login_scene/character_slots.tscn" type="PackedScene" id=4]
|
[ext_resource path="res://assets/GUI/images/Login-Khanat-background.png" type="Texture" id=4]
|
||||||
[ext_resource path="res://login_scene/character_creation_box.tscn" type="PackedScene" id=5]
|
[ext_resource path="res://login_scene/character_slots.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://login_scene/character_creation_box.tscn" type="PackedScene" 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_turn_left_up.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_turn_left.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_zoom_out.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_zoom_in.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_turn_right_up.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_turn_right.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/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]
|
[sub_resource type="ViewportTexture" id=1]
|
||||||
|
|
||||||
|
@ -32,7 +33,9 @@ mouse_filter = 0
|
||||||
mouse_default_cursor_shape = 0
|
mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 1
|
size_flags_horizontal = 1
|
||||||
size_flags_vertical = 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"]
|
[node name="viewport" type="Viewport" parent="." index="0"]
|
||||||
|
|
||||||
|
@ -61,10 +64,9 @@ shadow_atlas_quad_2 = 3
|
||||||
shadow_atlas_quad_3 = 4
|
shadow_atlas_quad_3 = 4
|
||||||
_sections_unfolded = [ "Render Target", "Rendering" ]
|
_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 )
|
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"]
|
[node name="face_camera" type="Camera" parent="viewport/character" index="4"]
|
||||||
|
|
||||||
|
@ -146,7 +148,7 @@ mouse_filter = 1
|
||||||
mouse_default_cursor_shape = 0
|
mouse_default_cursor_shape = 0
|
||||||
size_flags_horizontal = 1
|
size_flags_horizontal = 1
|
||||||
size_flags_vertical = 1
|
size_flags_vertical = 1
|
||||||
texture = ExtResource( 3 )
|
texture = ExtResource( 4 )
|
||||||
expand = true
|
expand = true
|
||||||
stretch_mode = 7
|
stretch_mode = 7
|
||||||
_sections_unfolded = [ "Size Flags" ]
|
_sections_unfolded = [ "Size Flags" ]
|
||||||
|
@ -188,15 +190,16 @@ size_flags_vertical = 3
|
||||||
alignment = 0
|
alignment = 0
|
||||||
_sections_unfolded = [ "Mouse", "Size Flags", "custom_constants" ]
|
_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
|
margin_bottom = 302.0
|
||||||
size_flags_vertical = 6
|
size_flags_vertical = 6
|
||||||
custom_constants/separation = 8
|
custom_constants/separation = 8
|
||||||
_sections_unfolded = [ "Size Flags", "custom_constants" ]
|
_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
|
visible = false
|
||||||
margin_top = 0.0
|
margin_top = 0.0
|
||||||
|
@ -211,7 +214,7 @@ anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_left = 58.0
|
margin_left = 56.0
|
||||||
margin_right = 1008.0
|
margin_right = 1008.0
|
||||||
margin_bottom = 584.0
|
margin_bottom = 584.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
|
@ -229,8 +232,8 @@ anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_left = 387.0
|
margin_left = 388.0
|
||||||
margin_right = 563.0
|
margin_right = 564.0
|
||||||
margin_bottom = 32.0
|
margin_bottom = 32.0
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
rect_clip_content = false
|
rect_clip_content = false
|
||||||
|
@ -262,8 +265,8 @@ action_mode = 0
|
||||||
enabled_focus_mode = 2
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
group = null
|
group = null
|
||||||
texture_normal = ExtResource( 6 )
|
texture_normal = ExtResource( 7 )
|
||||||
texture_pressed = ExtResource( 7 )
|
texture_pressed = ExtResource( 8 )
|
||||||
_sections_unfolded = [ "Hint", "Rect", "Textures" ]
|
_sections_unfolded = [ "Hint", "Rect", "Textures" ]
|
||||||
|
|
||||||
[node name="zoom_out" type="TextureButton" parent="margin_container/character_box/v_box_container/h_box_container" index="1"]
|
[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
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
group = null
|
group = null
|
||||||
texture_normal = ExtResource( 8 )
|
texture_normal = ExtResource( 9 )
|
||||||
_sections_unfolded = [ "Hint", "Textures" ]
|
_sections_unfolded = [ "Hint", "Textures" ]
|
||||||
|
|
||||||
[node name="zoom_in" type="TextureButton" parent="margin_container/character_box/v_box_container/h_box_container" index="2"]
|
[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
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
group = null
|
group = null
|
||||||
texture_normal = ExtResource( 9 )
|
texture_normal = ExtResource( 10 )
|
||||||
_sections_unfolded = [ "Hint", "Textures" ]
|
_sections_unfolded = [ "Hint", "Textures" ]
|
||||||
|
|
||||||
[node name="turn_right" type="TextureButton" parent="margin_container/character_box/v_box_container/h_box_container" index="3"]
|
[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
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
group = null
|
group = null
|
||||||
texture_normal = ExtResource( 10 )
|
texture_normal = ExtResource( 11 )
|
||||||
texture_pressed = ExtResource( 11 )
|
texture_pressed = ExtResource( 12 )
|
||||||
_sections_unfolded = [ "Hint", "Textures" ]
|
_sections_unfolded = [ "Hint", "Textures" ]
|
||||||
|
|
||||||
[node name="lights" type="TextureButton" parent="margin_container/character_box/v_box_container/h_box_container" index="4"]
|
[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
|
enabled_focus_mode = 2
|
||||||
shortcut = null
|
shortcut = null
|
||||||
group = null
|
group = null
|
||||||
texture_normal = ExtResource( 12 )
|
texture_normal = ExtResource( 13 )
|
||||||
texture_pressed = ExtResource( 13 )
|
texture_pressed = ExtResource( 14 )
|
||||||
_sections_unfolded = [ "Hint", "Textures" ]
|
_sections_unfolded = [ "Hint", "Textures" ]
|
||||||
|
|
||||||
[node name="character_preview_image" type="TextureRect" parent="margin_container/character_box/v_box_container" index="1"]
|
[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_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_top = 36.0
|
margin_top = 36.0
|
||||||
margin_right = 950.0
|
margin_right = 952.0
|
||||||
margin_bottom = 584.0
|
margin_bottom = 584.0
|
||||||
rect_min_size = Vector2( 512, 512 )
|
rect_min_size = Vector2( 512, 512 )
|
||||||
rect_pivot_offset = Vector2( 0, 0 )
|
rect_pivot_offset = Vector2( 0, 0 )
|
||||||
|
|
|
@ -8,6 +8,9 @@ func _ready():
|
||||||
self.connect( "character_creation_finished", global, "_on_login_scene_character_creation_finished" )
|
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():
|
func _on_login_menu_login_button_pressed():
|
||||||
$login_menu.hide()
|
$login_menu.hide()
|
||||||
$character_selection_menu.show()
|
$character_selection_menu.show()
|
||||||
|
|
Loading…
Reference in a new issue