Godot-sandbox/test-client-godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ajout de deux touche dans le menu controlzes.

Browse source
This commit is contained in:
osquallo 2018-07-25 11:23:19 +02:00
parent e2db3853fa
commit b9bc33c263
2 changed files with 65 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
scenes/GUI/Settings/Settings.tscn
View file

@ -7,8 +7,6 @@
[ext_resource path="res://scenes/GUI/Settings/MenuButton.gd" type="Script" id=5]
[ext_resource path="res://scenes/GUI/MusicControls/MusicControls.tscn" type="PackedScene" id=6]
[sub_resource type="DynamicFont" id=1]
size = 18
@ -150,7 +148,7 @@ use_filter = false
font_data = ExtResource( 2 )
_sections_unfolded = [ "Font", "Settings" ]
[node name="Settings" type="MarginContainer"]
[node name="Settings" type="MarginContainer" index="0"]
anchor_left = 0.0
anchor_top = 0.0
@ -235,6 +233,7 @@ _sections_unfolded = [ "Hint", "Rect", "Size Flags", "Theme", "Visibility", "cus
[node name="Display" type="MarginContainer" parent="Menus/TabContainer" index="0"]
editor/display_folded = true
visible = false
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
@ -272,6 +271,7 @@ scroll_horizontal_enabled = true
scroll_horizontal = 0
scroll_vertical_enabled = true
scroll_vertical = 0
scroll_deadzone = 0
_sections_unfolded = [ "Grow Direction", "Material", "Rect", "Scroll", "Size Flags", "Visibility" ]
[node name="VBoxContainer" type="VBoxContainer" parent="Menus/TabContainer/Display/ScrollContainer" index="0"]
@ -619,7 +619,6 @@ _sections_unfolded = [ "Size Flags" ]
[node name="Controles" type="VBoxContainer" parent="Menus/TabContainer" index="1"]
visible = false
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
@ -652,6 +651,7 @@ scroll_horizontal_enabled = true
scroll_horizontal = 0
scroll_vertical_enabled = true
scroll_vertical = 0
scroll_deadzone = 0
_sections_unfolded = [ "Hint", "Size Flags" ]
[node name="TabContainer" type="TabContainer" parent="Menus/TabContainer/Controles/ScrollContainer" index="0"]
@ -679,6 +679,7 @@ _sections_unfolded = [ "Hint", "Size Flags", "custom_colors", "custom_constants"
[node name="Jeu" type="VBoxContainer" parent="Menus/TabContainer/Controles/ScrollContainer/TabContainer" index="0"]
visible = false
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
@ -720,6 +721,7 @@ config_file = "user://input.cfg"
[node name="Interface" type="VBoxContainer" parent="Menus/TabContainer/Controles/ScrollContainer/TabContainer" index="1"]
editor/display_folded = true
visible = false
anchor_left = 0.0
anchor_top = 0.0
@ -944,8 +946,6 @@ config_file = "user://input.cfg"
[node name="Deplacement" type="VBoxContainer" parent="Menus/TabContainer/Controles/ScrollContainer/TabContainer" index="2"]
editor/display_folded = true
visible = false
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
@ -970,9 +970,8 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 46.0
margin_right = 1022.0
margin_bottom = 88.0
margin_bottom = 42.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -1055,8 +1054,9 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 46.0
margin_right = 1022.0
margin_bottom = 44.0
margin_bottom = 90.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -1078,9 +1078,9 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 48.0
margin_top = 94.0
margin_right = 1022.0
margin_bottom = 92.0
margin_bottom = 138.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -1102,9 +1102,9 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 96.0
margin_top = 142.0
margin_right = 1022.0
margin_bottom = 140.0
margin_bottom = 186.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -1126,9 +1126,9 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 144.0
margin_top = 190.0
margin_right = 1022.0
margin_bottom = 188.0
margin_bottom = 234.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -1144,6 +1144,54 @@ action_name = "move_right"
description = "Deplacement latéral droit."
config_file = "user://input.cfg"
[node name="fly_up" type="HBoxContainer" parent="Menus/TabContainer/Controles/ScrollContainer/TabContainer/Deplacement" index="5"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 238.0
margin_right = 1022.0
margin_bottom = 282.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
script = ExtResource( 3 )
__meta__ = {
"_editor_icon": ExtResource( 4 )
}
action_name = "fly_up"
description = "Deplacement vers le haut."
config_file = "user://input.cfg"
[node name="fly_down" type="HBoxContainer" parent="Menus/TabContainer/Controles/ScrollContainer/TabContainer/Deplacement" index="6"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 286.0
margin_right = 1022.0
margin_bottom = 330.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
script = ExtResource( 3 )
__meta__ = {
"_editor_icon": ExtResource( 4 )
}
action_name = "fly_down"
description = "Deplacement vers le bas."
config_file = "user://input.cfg"
[node name="ResetButton" type="Button" parent="Menus/TabContainer/Controles" index="1"]
visible = false
@ -1234,6 +1282,7 @@ scroll_horizontal_enabled = true
scroll_horizontal = 0
scroll_vertical_enabled = true
scroll_vertical = 0
scroll_deadzone = 0
_sections_unfolded = [ "Rect", "Scroll", "Size Flags" ]
[node name="VBoxContainer" type="VBoxContainer" parent="Menus/TabContainer/Test/ScrollContainer" index="0"]

2
scenes/Game/Character/Character.tscn
View file

@ -15,7 +15,7 @@ is_hemisphere = false
radius = 0.973349
[node name="Character" type="KinematicBody" index="0"]
[node name="Character" type="KinematicBody"]
transform = Transform( 1, 0, 0, 0, 0.589355, 0, 0, 0, 1, -0.0409546, 1.06519, 6.02408 )
input_ray_pickable = true