diff --git a/scenes/GUI/GUI.gd b/scenes/GUI/GUI.gd index 02aa11d..967de97 100644 --- a/scenes/GUI/GUI.gd +++ b/scenes/GUI/GUI.gd @@ -96,7 +96,9 @@ func _on_login_menu_login_button_pressed(): func _on_character_creation_menu_valid_button_pressed(): $character_creation_menu.hide() + $HUD.show() pause() + emit_signal( "character_creation_finished" ) func _on_character_selection_menu_character_selected(slot): diff --git a/scenes/GUI/character_creation/character_creation_menu.gd b/scenes/GUI/character_creation/character_creation_menu.gd index 97eff05..431eb95 100644 --- a/scenes/GUI/character_creation/character_creation_menu.gd +++ b/scenes/GUI/character_creation/character_creation_menu.gd @@ -8,12 +8,6 @@ signal return_button_pressed func _ready(): character = $v_box_container/h_box_container/center_container/character_creation_scene/mesh_instance -#func _process(delta): -# # Called every frame. Delta is time since last frame. -# # Update game logic here. -# pass - - func _on_h_scroll_bar_value_changed(value): if value == 1: character.get_surface_material(0).albedo_color = Color( 1.0, 0.25, 0.25, 1.0 ) diff --git a/scenes/GUI/character_creation/character_creation_scene.tscn b/scenes/GUI/character_creation/character_creation_scene.tscn index 88d7b21..da0effc 100644 --- a/scenes/GUI/character_creation/character_creation_scene.tscn +++ b/scenes/GUI/character_creation/character_creation_scene.tscn @@ -61,7 +61,7 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo" ] -[node name="character_creation_scene" type="Spatial" index="0"] +[node name="character_creation_scene" type="Spatial"] [node name="camera" type="Camera" parent="." index="0"] diff --git a/scenes/GUI/character_selection/character_selection_menu.gd b/scenes/GUI/character_selection/character_selection_menu.gd index 32237a4..5bd227c 100644 --- a/scenes/GUI/character_selection/character_selection_menu.gd +++ b/scenes/GUI/character_selection/character_selection_menu.gd @@ -19,4 +19,5 @@ func _on_slot0_character_button_pressed(): func _on_return_button_pressed(): - emit_signal( "return_button_pressed" ) \ No newline at end of file + emit_signal( "return_button_pressed" ) + diff --git a/scenes/GUI/character_selection/character_selection_menu.tscn b/scenes/GUI/character_selection/character_selection_menu.tscn index 0f4d9df..63dd46c 100644 --- a/scenes/GUI/character_selection/character_selection_menu.tscn +++ b/scenes/GUI/character_selection/character_selection_menu.tscn @@ -56,7 +56,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 330.0 +margin_right = 342.0 margin_bottom = 600.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -68,12 +68,11 @@ alignment = 0 [node name="slot0_box" type="HBoxContainer" parent="h_box_container/character_slots" index="0"] -editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 330.0 +margin_right = 342.0 margin_bottom = 128.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -108,26 +107,31 @@ group = null texture_normal = ExtResource( 3 ) _sections_unfolded = [ "Rect", "Size Flags", "Textures" ] -[node name="character_name" type="Label" parent="h_box_container/character_slots/slot0_box" index="1"] +[node name="character_name" type="Button" parent="h_box_container/character_slots/slot0_box" index="1"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 136.0 -margin_top = 57.0 -margin_right = 330.0 -margin_bottom = 71.0 +margin_top = 54.0 +margin_right = 342.0 +margin_bottom = 74.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false -mouse_filter = 2 +focus_mode = 2 +mouse_filter = 0 mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 +size_flags_horizontal = 3 size_flags_vertical = 4 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null text = "Créer un nouveau personnage." -percent_visible = 1.0 -lines_skipped = 0 -max_lines_visible = -1 +flat = true +align = 1 +_sections_unfolded = [ "Size Flags" ] [node name="return_button" type="Button" parent="h_box_container/character_slots" index="1"] @@ -160,7 +164,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 334.0 +margin_left = 346.0 margin_right = 1024.0 margin_bottom = 600.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -173,6 +177,8 @@ _sections_unfolded = [ "Size Flags" ] [connection signal="pressed" from="h_box_container/character_slots/slot0_box/character_button" to="." method="_on_slot0_character_button_pressed"] +[connection signal="pressed" from="h_box_container/character_slots/slot0_box/character_name" to="." method="_on_slot0_character_button_pressed"] + [connection signal="pressed" from="h_box_container/character_slots/return_button" to="." method="_on_return_button_pressed"]