diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/project_settings.cpp | 4 | ||||
| -rw-r--r-- | core/input/input.cpp | 4 | ||||
| -rw-r--r-- | core/input/input_event.cpp | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index db3191334a..00e74a7cce 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -1286,6 +1286,10 @@ ProjectSettings::ProjectSettings() { GLOBAL_DEF(PropertyInfo(Variant::STRING, "editor/script/templates_search_path", PROPERTY_HINT_DIR), "res://script_templates"); + // For correct doc generation. + GLOBAL_DEF("editor/naming/default_signal_callback_name", "_on_{node_name}_{signal_name}"); + GLOBAL_DEF("editor/naming/default_signal_callback_to_self_name", "_on_{signal_name}"); + _add_builtin_input_map(); // Keep the enum values in sync with the `DisplayServer::ScreenOrientation` enum. diff --git a/core/input/input.cpp b/core/input/input.cpp index 1ea9f00fee..3cf83fd64b 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -349,8 +349,8 @@ float Input::get_axis(const StringName &p_negative_action, const StringName &p_p Vector2 Input::get_vector(const StringName &p_negative_x, const StringName &p_positive_x, const StringName &p_negative_y, const StringName &p_positive_y, float p_deadzone) const { Vector2 vector = Vector2( - get_action_raw_strength(p_positive_x) - get_action_raw_strength(p_negative_x), - get_action_raw_strength(p_positive_y) - get_action_raw_strength(p_negative_y)); + get_action_strength(p_positive_x) - get_action_strength(p_negative_x), + get_action_strength(p_positive_y) - get_action_strength(p_negative_y)); if (p_deadzone < 0.0f) { // If the deadzone isn't specified, get it from the average of the actions. diff --git a/core/input/input_event.cpp b/core/input/input_event.cpp index dbe9b55ee3..74c0812f43 100644 --- a/core/input/input_event.cpp +++ b/core/input/input_event.cpp @@ -478,7 +478,6 @@ Ref<InputEventKey> InputEventKey::create_reference(Key p_keycode) { Ref<InputEventKey> ie; ie.instantiate(); ie->set_keycode(p_keycode & KeyModifierMask::CODE_MASK); - ie->set_key_label(p_keycode & KeyModifierMask::CODE_MASK); ie->set_unicode(char32_t(p_keycode & KeyModifierMask::CODE_MASK)); if ((p_keycode & KeyModifierMask::SHIFT) != Key::NONE) { |