diff --git a/client/levels/hud/hud.tscn b/client/levels/hud/hud.tscn index 17d7c64d66c31e8dcac2bfea7024b3c2f5d53e4e..925c025b34edc6fddb636c9c9d46fd4c966b4d08 100644 --- a/client/levels/hud/hud.tscn +++ b/client/levels/hud/hud.tscn @@ -724,13 +724,31 @@ margin_bottom = 304.0 margin_right = 85.0 margin_bottom = 28.0 custom_fonts/font = SubResource( 9 ) -text = "Emote :" +text = "Grab item :" [node name="son2" type="Label" parent="settings/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches6"] margin_left = 89.0 margin_right = 155.0 margin_bottom = 28.0 custom_fonts/font = SubResource( 9 ) +text = "E" + +[node name="touches7" type="HBoxContainer" parent="settings/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] +margin_top = 276.0 +margin_right = 720.0 +margin_bottom = 304.0 + +[node name="son3" type="Label" parent="settings/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches7"] +margin_right = 85.0 +margin_bottom = 28.0 +custom_fonts/font = SubResource( 9 ) +text = "Emote :" + +[node name="son2" type="Label" parent="settings/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches7"] +margin_left = 89.0 +margin_right = 155.0 +margin_bottom = 28.0 +custom_fonts/font = SubResource( 9 ) text = "Alt F4" [node name="jeu" type="VBoxContainer" parent="settings/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu"] diff --git a/client/levels/settings/Settings.tscn b/client/levels/settings/Settings.tscn index 34f1c2a74f912a93c3014f0a422c0c82ddc4635b..4d47999e5bf9b6a4d85f64c7d979ef706879836a 100644 --- a/client/levels/settings/Settings.tscn +++ b/client/levels/settings/Settings.tscn @@ -318,14 +318,14 @@ size_flags_horizontal = 3 size_flags_vertical = 3 [node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer"] -margin_right = 720.0 -margin_bottom = 330.0 +margin_right = 708.0 +margin_bottom = 342.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="listMenu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer"] -margin_right = 720.0 -margin_bottom = 330.0 +margin_right = 708.0 +margin_bottom = 342.0 size_flags_horizontal = 3 [node name="son" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu"] @@ -420,13 +420,13 @@ custom_fonts/font = SubResource( 5 ) text = "0%" [node name="controles" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu"] -margin_right = 720.0 -margin_bottom = 330.0 +margin_right = 708.0 +margin_bottom = 342.0 size_flags_vertical = 3 custom_constants/separation = 10 [node name="Volume" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] -margin_right = 720.0 +margin_right = 708.0 margin_bottom = 38.0 custom_styles/normal = SubResource( 10 ) custom_fonts/font = SubResource( 5 ) @@ -435,14 +435,14 @@ uppercase = true [node name="music" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] margin_top = 48.0 -margin_right = 720.0 +margin_right = 708.0 margin_bottom = 76.0 custom_fonts/font = SubResource( 5 ) text = "Key-bindings" [node name="touches" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] margin_top = 86.0 -margin_right = 720.0 +margin_right = 708.0 margin_bottom = 114.0 [node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches"] @@ -460,7 +460,7 @@ text = "Q" [node name="touches2" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] margin_top = 124.0 -margin_right = 720.0 +margin_right = 708.0 margin_bottom = 152.0 [node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches2"] @@ -478,7 +478,7 @@ text = "D" [node name="touches3" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] margin_top = 162.0 -margin_right = 720.0 +margin_right = 708.0 margin_bottom = 190.0 [node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches3"] @@ -496,7 +496,7 @@ text = "Z or Space" [node name="touches4" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] margin_top = 200.0 -margin_right = 720.0 +margin_right = 708.0 margin_bottom = 228.0 [node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches4"] @@ -514,7 +514,7 @@ text = "Mouse Button 1" [node name="touches5" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] margin_top = 238.0 -margin_right = 720.0 +margin_right = 708.0 margin_bottom = 266.0 [node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches5"] @@ -532,16 +532,34 @@ text = "Mouse Button 2" [node name="touches6" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] margin_top = 276.0 -margin_right = 720.0 +margin_right = 708.0 margin_bottom = 304.0 [node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches6"] +margin_right = 122.0 +margin_bottom = 28.0 +custom_fonts/font = SubResource( 5 ) +text = "Grab item :" + +[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches6"] +margin_left = 126.0 +margin_right = 141.0 +margin_bottom = 28.0 +custom_fonts/font = SubResource( 5 ) +text = "E" + +[node name="touches7" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles"] +margin_top = 314.0 +margin_right = 708.0 +margin_bottom = 342.0 + +[node name="son3" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches7"] margin_right = 85.0 margin_bottom = 28.0 custom_fonts/font = SubResource( 5 ) text = "Emote :" -[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches6"] +[node name="son2" type="Label" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu/controles/touches7"] margin_left = 89.0 margin_right = 155.0 margin_bottom = 28.0