diff options
Diffstat (limited to 'client/menu')
| -rw-r--r-- | client/menu/popup_message.gd | 30 | ||||
| -rw-r--r-- | client/menu/setup.tscn | 3 |
2 files changed, 18 insertions, 15 deletions
diff --git a/client/menu/popup_message.gd b/client/menu/popup_message.gd index 266c1f60..1748f59a 100644 --- a/client/menu/popup_message.gd +++ b/client/menu/popup_message.gd @@ -88,38 +88,38 @@ func stop_game_hints(): func _input(_event): if Input.is_action_just_pressed("boost"): - Global.set_profile("has_boosted", true) + Global.set_hint("has_boosted", true) if any_action_just_pressed(["forward", "backwards", "left", "right"]): - Global.set_profile("has_moved", true) + Global.set_hint("has_moved", true) if any_action_just_pressed(["rotate_left", "rotate_right", "rotate_up", "rotate_down"]): - if not Global.get_profile("has_reset"): + if not Global.get_hint("has_reset"): reset_timer.start() - Global.set_profile("has_rotated", true) + Global.set_hint("has_rotated", true) if any_action_just_pressed(["zoom_in", "zoom_out"]): - Global.set_profile("has_zoomed", true) + Global.set_hint("has_zoomed", true) if Input.is_action_just_pressed("interact"): - Global.set_profile("has_interacted", true) + Global.set_hint("has_interacted", true) if Input.is_action_just_pressed("reset"): - Global.set_profile("has_reset", true) + Global.set_hint("has_reset", true) func _on_boost_timeout(): - if not Global.get_profile("has_boosted") and not Global.get_setting("touch_controls"): + if not Global.get_hint("has_boosted") and not Global.get_setting("touch_controls"): display_hint_msg(tr("Press %s to boost") % display_keybind(tr("SHIFT"), "B")) func _on_move_timeout(): - if not Global.get_profile("has_moved") and not Global.get_setting("touch_controls"): + if not Global.get_hint("has_moved") and not Global.get_setting("touch_controls"): display_hint_msg(tr("Use %s to move") % display_keybind("WASD", tr("left stick"))) func _on_interact_timeout(): - if not Global.get_profile("has_interacted") and not Global.get_setting("touch_controls"): + if not Global.get_hint("has_interacted") and not Global.get_setting("touch_controls"): display_hint_msg(tr("Press %s to pick up items and interact with tools") % display_keybind(tr("SPACE"), "A")) func _on_reset_timeout(): - if not Global.get_profile("has_reset") and not Global.get_setting("touch_controls"): + if not Global.get_hint("has_reset") and not Global.get_setting("touch_controls"): display_hint_msg(tr("Press %s to reset the camera view") % display_keybind("R", "Y")) func _on_zoom_timeout(): - if not Global.get_profile("has_zoomed") and not Global.get_setting("touch_controls"): + if not Global.get_hint("has_zoomed") and not Global.get_setting("touch_controls"): display_hint_msg(tr("Use %s to zoom in/out") % display_keybind(tr("PageUp/PageDown"), "LT/RT")) func display_keybind(keyboard: String, joypad: String, touch = null) -> String: @@ -136,10 +136,10 @@ func any_action_just_pressed(actions: Array) -> bool: return false func _on_rotate_camera_timeout(): - if not Global.get_profile("has_rotated") and not Global.get_setting("touch_controls"): + if not Global.get_hint("has_rotated") and not Global.get_setting("touch_controls"): display_hint_msg(tr("Use %s to reset the camera view") % display_keybind(tr("arrow keys"), tr("right stick"))) func _on_nametags_timeout(): - if not Global.get_profile("has_seen_nametags") and not Global.get_setting("usernames"): - Global.set_profile("has_seen_nametags", true) + if not Global.get_hint("has_seen_nametags") and not Global.get_setting("usernames"): + Global.set_hint("has_seen_nametags", true) display_hint_msg(tr("Username tags can be enabled/disabled in the settings")) diff --git a/client/menu/setup.tscn b/client/menu/setup.tscn index 6a255b95..befdc92b 100644 --- a/client/menu/setup.tscn +++ b/client/menu/setup.tscn @@ -187,6 +187,7 @@ scroll_active = false [node name="NameEntry" type="HBoxContainer" parent="ScrollContainer/Control/TextureRect/PaperMargin/Contents"] layout_mode = 2 +tooltip_text = "Other players can see that name when playing on a server" [node name="LineEdit" type="LineEdit" parent="ScrollContainer/Control/TextureRect/PaperMargin/Contents/NameEntry"] custom_minimum_size = Vector2(300, 30) @@ -277,7 +278,9 @@ custom_minimum_size = Vector2(100.08, 0) layout_mode = 2 bbcode_enabled = true text = "The salary is" +fit_content = true scroll_active = false +autowrap_mode = 0 [node name="LineEdit" type="LineEdit" parent="ScrollContainer/Control/TextureRect/PaperMargin/Contents/CompensationEntry"] custom_minimum_size = Vector2(50, 30) |