From 9f479f096cb50fa8d1215e68c262f110116114ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 18 Jan 2018 21:37:17 +0100 Subject: [PATCH] Fix typos in code and docs with codespell Using v1.11.0 from https://github.com/lucasdemarchi/codespell --- core/image.cpp | 2 +- core/io/marshalls.cpp | 2 +- core/list.h | 2 +- core/math/octree.h | 2 +- core/method_bind.h | 2 +- core/oa_hash_map.h | 2 +- core/project_settings.cpp | 2 +- core/project_settings.h | 6 +- core/script_language.h | 2 +- core/ustring.cpp | 10 +-- doc/classes/@GlobalScope.xml | 2 +- doc/classes/ARVRInterface.xml | 2 +- doc/classes/ARVRServer.xml | 2 +- doc/classes/Control.xml | 2 +- doc/classes/Generic6DOFJoint.xml | 24 +++---- doc/classes/HingeJoint.xml | 6 +- doc/classes/Input.xml | 2 +- doc/classes/InputEventMouse.xml | 4 +- doc/classes/InputEventMouseButton.xml | 2 +- doc/classes/InputEventMouseMotion.xml | 2 +- doc/classes/InputEventScreenDrag.xml | 2 +- doc/classes/InputEventWithModifiers.xml | 2 +- doc/classes/Joint.xml | 2 +- doc/classes/KinematicBody.xml | 4 +- doc/classes/KinematicBody2D.xml | 4 +- doc/classes/Line2D.xml | 2 +- doc/classes/LineEdit.xml | 2 +- doc/classes/Node.xml | 18 ++--- doc/classes/PhysicsServer.xml | 28 ++++---- doc/classes/PinJoint.xml | 8 +-- doc/classes/PopupMenu.xml | 4 +- doc/classes/SliderJoint.xml | 20 +++--- doc/classes/String.xml | 2 +- doc/classes/VisualServer.xml | 10 +-- drivers/gles3/rasterizer_storage_gles3.cpp | 2 +- drivers/gles3/shaders/copy.glsl | 2 +- editor/collada/collada.cpp | 4 +- editor/dependency_editor.cpp | 8 +-- editor/editor_node.cpp | 4 +- editor/editor_plugin.h | 2 +- editor/editor_themes.cpp | 2 +- editor/icons/SCsub | 4 +- editor/import/editor_import_collada.cpp | 4 +- .../animation_player_editor_plugin.cpp | 8 +-- editor/plugins/canvas_item_editor_plugin.cpp | 4 +- editor/plugins/curve_editor_plugin.cpp | 2 +- editor/plugins/navigation_mesh_generator.cpp | 14 ++-- editor/plugins/navigation_mesh_generator.h | 2 +- editor/plugins/spatial_editor_plugin.cpp | 2 +- editor/project_manager.cpp | 54 +++++++------- editor/project_manager.h | 2 +- editor/translations/af.po | 6 +- editor/translations/ar.po | 6 +- editor/translations/bg.po | 6 +- editor/translations/bn.po | 6 +- editor/translations/ca.po | 6 +- editor/translations/cs.po | 6 +- editor/translations/da.po | 6 +- editor/translations/de.po | 6 +- editor/translations/de_CH.po | 6 +- editor/translations/editor.pot | 6 +- editor/translations/el.po | 6 +- editor/translations/es.po | 6 +- editor/translations/es_AR.po | 6 +- editor/translations/fa.po | 6 +- editor/translations/fi.po | 6 +- editor/translations/fr.po | 6 +- editor/translations/he.po | 6 +- editor/translations/hi.po | 6 +- editor/translations/hu.po | 6 +- editor/translations/id.po | 6 +- editor/translations/is.po | 6 +- editor/translations/it.po | 6 +- editor/translations/ja.po | 6 +- editor/translations/ko.po | 6 +- editor/translations/lt.po | 6 +- editor/translations/nb.po | 6 +- editor/translations/nl.po | 6 +- editor/translations/pl.po | 6 +- editor/translations/pr.po | 6 +- editor/translations/pt_BR.po | 6 +- editor/translations/pt_PT.po | 6 +- editor/translations/ru.po | 6 +- editor/translations/sk.po | 6 +- editor/translations/sl.po | 6 +- editor/translations/sr_Cyrl.po | 6 +- editor/translations/sv.po | 6 +- editor/translations/ta.po | 6 +- editor/translations/th.po | 6 +- editor/translations/tr.po | 6 +- editor/translations/uk.po | 6 +- editor/translations/ur_PK.po | 6 +- editor/translations/vi.po | 6 +- editor/translations/zh_CN.po | 6 +- editor/translations/zh_HK.po | 6 +- editor/translations/zh_TW.po | 6 +- main/main.cpp | 2 +- main/tests/test_string.cpp | 2 +- methods.py | 2 +- modules/bullet/area_bullet.cpp | 4 +- modules/bullet/godot_motion_state.h | 2 +- modules/bullet/rigid_body_bullet.cpp | 2 +- modules/bullet/rigid_body_bullet.h | 4 +- modules/bullet/shape_bullet.cpp | 2 +- modules/gdnative/include/gdnative/gdnative.h | 2 +- .../include/nativescript/godot_nativescript.h | 2 +- .../pluginscript/pluginscript_script.cpp | 2 +- modules/gdscript/gdscript_editor.cpp | 12 ++-- modules/gdscript/gdscript_parser.cpp | 4 +- modules/mobile_vr/mobile_interface.cpp | 2 +- modules/mono/editor/bindings_generator.cpp | 2 +- modules/mono/glue/cs_files/Plane.cs | 2 +- scene/2d/audio_stream_player_2d.cpp | 2 +- scene/2d/canvas_item.cpp | 2 +- scene/2d/physics_body_2d.cpp | 2 +- scene/3d/audio_stream_player_3d.cpp | 2 +- scene/3d/physics_body.cpp | 2 +- scene/3d/skeleton.cpp | 6 +- scene/3d/skeleton.h | 8 +-- scene/3d/vehicle_body.cpp | 2 +- scene/3d/voxel_light_baker.cpp | 26 +++---- scene/3d/voxel_light_baker.h | 4 +- scene/gui/base_button.h | 4 +- scene/gui/control.cpp | 2 +- scene/gui/text_edit.cpp | 8 +-- scene/gui/tree.cpp | 70 +++++++++---------- scene/gui/tree.h | 4 +- scene/main/node.cpp | 10 +-- scene/resources/packed_scene.cpp | 4 +- scene/resources/primitive_meshes.h | 2 +- scene/resources/scene_format_text.cpp | 2 +- scene/resources/tile_set.cpp | 2 +- servers/arvr_server.cpp | 2 +- servers/arvr_server.h | 4 +- servers/audio/audio_rb_resampler.cpp | 2 +- servers/visual/visual_server_scene.cpp | 2 +- servers/visual/visual_server_wrap_mt.h | 2 +- servers/visual_server.cpp | 8 +-- 138 files changed, 405 insertions(+), 405 deletions(-) diff --git a/core/image.cpp b/core/image.cpp index 41d70e6df6a..07e705265d6 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -775,7 +775,7 @@ void Image::crop_from_point(int p_x, int p_y, int p_width, int p_height) { ERR_FAIL_COND(p_y + p_height > MAX_HEIGHT); /* to save memory, cropping should be done in-place, however, since this function - will most likely either not be used much, or in critical areas, for now it wont, because + will most likely either not be used much, or in critical areas, for now it won't, because it's a waste of time. */ if (p_width == width && p_height == height && p_x == 0 && p_y == 0) diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 35b9a8610cb..9e212877800 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -333,7 +333,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int len -= 12; buf += 12; - if (flags & 2) // Obsolete format with property seperate from subpath + if (flags & 2) // Obsolete format with property separate from subpath subnamecount++; uint32_t total = namecount + subnamecount; diff --git a/core/list.h b/core/list.h index a00372e39fd..f977df46346 100644 --- a/core/list.h +++ b/core/list.h @@ -388,7 +388,7 @@ public: }; /** - * return wether the list is empty + * return whether the list is empty */ _FORCE_INLINE_ bool empty() const { diff --git a/core/math/octree.h b/core/math/octree.h index 7411e4aa526..4e3d6257f08 100644 --- a/core/math/octree.h +++ b/core/math/octree.h @@ -612,7 +612,7 @@ bool Octree::_remove_element_from_octant(Element *p_element, O bool unpaired = false; if (use_pairs && p_octant->last_pass != pass) { - // check wether we should unpair stuff + // check whether we should unpair stuff // always test pairable typename List::Element *E = p_octant->pairable_elements.front(); while (E) { diff --git a/core/method_bind.h b/core/method_bind.h index 2e5712c3fec..e02d64c935f 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -243,7 +243,7 @@ public: PropertyInfo get_argument_info(int p_argument) const; PropertyInfo get_return_info() const; - void set_argument_names(const Vector &p_names); //set by class, db, cant be inferred otherwise + void set_argument_names(const Vector &p_names); //set by class, db, can't be inferred otherwise Vector get_argument_names() const; #endif diff --git a/core/oa_hash_map.h b/core/oa_hash_map.h index c3b32af5450..280aea6a14c 100644 --- a/core/oa_hash_map.h +++ b/core/oa_hash_map.h @@ -36,7 +36,7 @@ #include "os/copymem.h" #include "os/memory.h" -// uncomment this to disable intial local storage. +// uncomment this to disable initial local storage. #define OA_HASH_MAP_INITIAL_LOCAL_STORAGE /** diff --git a/core/project_settings.cpp b/core/project_settings.cpp index 0c19de382c9..0991c0df68a 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -167,7 +167,7 @@ bool ProjectSettings::_set(const StringName &p_name, const Variant &p_value) { } if (props.has(p_name)) { - if (!props[p_name].overrided) + if (!props[p_name].overridden) props[p_name].variant = p_value; } else { diff --git a/core/project_settings.h b/core/project_settings.h index e85092e4317..eba53441cfa 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -58,19 +58,19 @@ protected: Variant variant; Variant initial; bool hide_from_editor; - bool overrided; + bool overridden; VariantContainer() : order(0), persist(false), hide_from_editor(false), - overrided(false) { + overridden(false) { } VariantContainer(const Variant &p_variant, int p_order, bool p_persist = false) : order(p_order), persist(p_persist), variant(p_variant), hide_from_editor(false), - overrided(false) { + overridden(false) { } }; diff --git a/core/script_language.h b/core/script_language.h index 66614a293c1..d1da0a3b72d 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -179,7 +179,7 @@ class ScriptCodeCompletionCache { public: virtual RES get_cached_resource(const String &p_path) = 0; - static ScriptCodeCompletionCache *get_sigleton() { return singleton; } + static ScriptCodeCompletionCache *get_singleton() { return singleton; } ScriptCodeCompletionCache(); }; diff --git a/core/ustring.cpp b/core/ustring.cpp index 1fce4f1826b..7aa2b012dec 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -2217,7 +2217,7 @@ int String::find(const String &p_str, int p_from) const { const int len = length(); if (src_len == 0 || len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); const CharType *str = p_str.c_str(); @@ -2256,7 +2256,7 @@ int String::find(const char *p_str, int p_from) const { const int len = length(); if (len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); @@ -2317,7 +2317,7 @@ int String::findmk(const Vector &p_keys, int p_from, int *r_key) const { int len = length(); if (len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); @@ -2366,7 +2366,7 @@ int String::findn(const String &p_str, int p_from) const { int src_len = p_str.length(); if (src_len == 0 || length() == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *srcd = c_str(); @@ -2462,7 +2462,7 @@ int String::rfindn(const String &p_str, int p_from) const { int len = length(); if (src_len == 0 || len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml index 9af81ae2997..8b3e6345eca 100644 --- a/doc/classes/@GlobalScope.xml +++ b/doc/classes/@GlobalScope.xml @@ -1077,7 +1077,7 @@ Joypad Right Analog Trigger - Functions that return Error return OK when no error occured. Most functions don't return errors and/or just print errors to STDOUT. + Functions that return Error return OK when no error occurred. Most functions don't return errors and/or just print errors to STDOUT. Generic error. diff --git a/doc/classes/ARVRInterface.xml b/doc/classes/ARVRInterface.xml index c941b126a4e..50f49ae66c3 100644 --- a/doc/classes/ARVRInterface.xml +++ b/doc/classes/ARVRInterface.xml @@ -91,7 +91,7 @@ This interface support AR (video background and real world tracking). - This interface outputs to an external device, if the main viewport is used the on screen output is an unmodified buffer of either the left or right eye (stretched if the viewport size is not changed to the same aspect ratio of get_render_targetsize. Using a seperate viewport node frees up the main viewport for other purposes. + This interface outputs to an external device, if the main viewport is used the on screen output is an unmodified buffer of either the left or right eye (stretched if the viewport size is not changed to the same aspect ratio of get_render_targetsize. Using a separate viewport node frees up the main viewport for other purposes. Mono output, this is mostly used internally when retrieving positioning information for our camera node or when stereo scopic rendering is not supported. diff --git a/doc/classes/ARVRServer.xml b/doc/classes/ARVRServer.xml index 0b1db11a4d4..1eec98a40dc 100644 --- a/doc/classes/ARVRServer.xml +++ b/doc/classes/ARVRServer.xml @@ -49,7 +49,7 @@ - Get the number of interfaces currently registered with the AR/VR server. If you're game supports multiple AR/VR platforms you can look throught the available interface and either present the user with a selection or simply try an initialize each interface and use the first one that returns true. + Get the number of interfaces currently registered with the AR/VR server. If you're game supports multiple AR/VR platforms you can look through the available interface and either present the user with a selection or simply try an initialize each interface and use the first one that returns true. diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml index 3ce04577552..9f3263528dc 100644 --- a/doc/classes/Control.xml +++ b/doc/classes/Control.xml @@ -8,7 +8,7 @@ For more information on Godot's UI system, anchors, margins, and containers, see the related tutorials in the manual. To build flexible UIs, you'll need a mix of UI elements that inherit from [code]Control[/code] and [Container] nodes. [b]User Interface nodes and input[/b] Godot sends input events to the scene's root node first, by calling [method Node._input]. [method Node._input] forwards the event down the node tree to the nodes under the mouse cursor, or on keyboard focus. To do so, it calls [method MainLoop._input_event]. Call [method accept_event] so no other node receives the event. Once you accepted an input, it becomes handled so [method Node._unhandled_input] will not process it. - Only one [code]Control[/code] node can be in keyboard focus. Only the node in focus will receive keyboard events. To get the foucs, call [method set_focus_mode]. [code]Control[/code] nodes lose focus when another node grabs it, or if you hide the node in focus. + Only one [code]Control[/code] node can be in keyboard focus. Only the node in focus will receive keyboard events. To get the focus, call [method set_focus_mode]. [code]Control[/code] nodes lose focus when another node grabs it, or if you hide the node in focus. Call [method set_ignore_mouse] to tell a [code]Control[/code] node to ignore mouse or touch events. You'll need it if you place an icon on top of a button. [Theme] resources change the Control's appearance. If you change the [Theme] on a [code]Control[/code] node, it affects all of its children. To override some of the theme's parameters, call one of the [code]add_*_override[/code] methods, like [method add_font_override]. You can override the theme with the inspector. diff --git a/doc/classes/Generic6DOFJoint.xml b/doc/classes/Generic6DOFJoint.xml index f5b3df714b6..01009edf9a5 100644 --- a/doc/classes/Generic6DOFJoint.xml +++ b/doc/classes/Generic6DOFJoint.xml @@ -24,10 +24,10 @@ When rotating across x-axis, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. - The maximum amount of force that can occur, when rotating arround x-axis. + The maximum amount of force that can occur, when rotating around x-axis. - The minimum rotation in negative direction to break loose and rotate arround the x-axis. + The minimum rotation in negative direction to break loose and rotate around the x-axis. The amount of rotational restitution across the x-axis. The lower, the more restitution occurs. @@ -36,7 +36,7 @@ The speed of all rotations across the x-axis. - The minimum rotation in positive direction to break loose and rotate arround the x-axis. + The minimum rotation in positive direction to break loose and rotate around the x-axis. The amount of rotational damping across the y-axis. The lower, the more dampening occurs. @@ -48,10 +48,10 @@ When rotating across y-axis, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. - The maximum amount of force that can occur, when rotating arround y-axis. + The maximum amount of force that can occur, when rotating around y-axis. - The minimum rotation in negative direction to break loose and rotate arround the y-axis. + The minimum rotation in negative direction to break loose and rotate around the y-axis. The amount of rotational restitution across the y-axis. The lower, the more restitution occurs. @@ -60,7 +60,7 @@ The speed of all rotations across the y-axis. - The minimum rotation in positive direction to break loose and rotate arround the y-axis. + The minimum rotation in positive direction to break loose and rotate around the y-axis. The amount of rotational damping across the z-axis. The lower, the more dampening occurs. @@ -72,10 +72,10 @@ When rotating across z-axis, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. - The maximum amount of force that can occur, when rotating arround z-axis. + The maximum amount of force that can occur, when rotating around z-axis. - The minimum rotation in negative direction to break loose and rotate arround the z-axis. + The minimum rotation in negative direction to break loose and rotate around the z-axis. The amount of rotational restitution across the z-axis. The lower, the more restitution occurs. @@ -84,7 +84,7 @@ The speed of all rotations across the z-axis. - The minimum rotation in positive direction to break loose and rotate arround the z-axis. + The minimum rotation in positive direction to break loose and rotate around the z-axis. If [code]true[/code] a rotating motor at the x-axis is enabled. @@ -185,10 +185,10 @@ The amount of damping that happens at the linear motion across the axes. - The minimum rotation in negative direction to break loose and rotate arround the axes. + The minimum rotation in negative direction to break loose and rotate around the axes. - The minimum rotation in positive direction to break loose and rotate arround the axes. + The minimum rotation in positive direction to break loose and rotate around the axes. The speed of all rotations across the axes. @@ -200,7 +200,7 @@ The amount of rotational restitution across the axes. The lower, the more restitution occurs. - The maximum amount of force that can occur, when rotating arround the axes. + The maximum amount of force that can occur, when rotating around the axes. When rotating across the axes, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. diff --git a/doc/classes/HingeJoint.xml b/doc/classes/HingeJoint.xml index dab7f4127c9..b6e2f6f9a2a 100644 --- a/doc/classes/HingeJoint.xml +++ b/doc/classes/HingeJoint.xml @@ -4,7 +4,7 @@ A hinge between two 3D bodies. - Normaly uses the z-axis of body A as the hinge axis, another axis can be specified when adding it manually though. + Normally uses the z-axis of body A as the hinge axis, another axis can be specified when adding it manually though. @@ -40,12 +40,12 @@ Target speed for the motor. - The speed with wich the two bodies get pulled together when they move in different directions. + The speed with which the two bodies get pulled together when they move in different directions. - The speed with wich the two bodies get pulled together when they move in different directions. + The speed with which the two bodies get pulled together when they move in different directions. The maximum rotation. only active if [member angular_limit/enable] is [code]true[/code]. diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml index 30fc80dae9e..5b0b63abec6 100644 --- a/doc/classes/Input.xml +++ b/doc/classes/Input.xml @@ -17,7 +17,7 @@ - This will simulate pressing the specificed action. + This will simulate pressing the specified action. diff --git a/doc/classes/InputEventMouse.xml b/doc/classes/InputEventMouse.xml index 7d5a60ff0d7..5d9cda8605c 100644 --- a/doc/classes/InputEventMouse.xml +++ b/doc/classes/InputEventMouse.xml @@ -4,7 +4,7 @@ Base input event type for mouse events. - Stores general mouse events informations. + Stores general mouse events information. http://docs.godotengine.org/en/3.0/learning/features/inputs/inputevent.html @@ -21,7 +21,7 @@ Mouse position relative to the current [Viewport] when used in [method Control._gui_input], otherwise is at 0,0. - Mouse local position relative to the [Viewport]. If used in [method Control._gui_input] the position is relative to the current [Control] wich is under the mouse. + Mouse local position relative to the [Viewport]. If used in [method Control._gui_input] the position is relative to the current [Control] which is under the mouse. diff --git a/doc/classes/InputEventMouseButton.xml b/doc/classes/InputEventMouseButton.xml index 6b93fbfa675..1f7aa193869 100644 --- a/doc/classes/InputEventMouseButton.xml +++ b/doc/classes/InputEventMouseButton.xml @@ -4,7 +4,7 @@ Input event type for mouse button events. - Contains mouse click informations. See [method Node._input]. + Contains mouse click information. See [method Node._input]. http://docs.godotengine.org/en/3.0/learning/features/inputs/mouse_and_input_coordinates.html diff --git a/doc/classes/InputEventMouseMotion.xml b/doc/classes/InputEventMouseMotion.xml index 4b3126dc72d..1183d1c16ca 100644 --- a/doc/classes/InputEventMouseMotion.xml +++ b/doc/classes/InputEventMouseMotion.xml @@ -4,7 +4,7 @@ Input event type for mouse motion events. - Contains mouse motion informations. Supports relative, absolute positions and speed. See [method Node._input]. + Contains mouse motion information. Supports relative, absolute positions and speed. See [method Node._input]. http://docs.godotengine.org/en/3.0/learning/features/inputs/mouse_and_input_coordinates.html diff --git a/doc/classes/InputEventScreenDrag.xml b/doc/classes/InputEventScreenDrag.xml index bbf1411189e..950f79018ef 100644 --- a/doc/classes/InputEventScreenDrag.xml +++ b/doc/classes/InputEventScreenDrag.xml @@ -5,7 +5,7 @@ (only available on mobile devices) - Contains screen drag informations. See [method Node._input]. + Contains screen drag information. See [method Node._input]. http://docs.godotengine.org/en/3.0/learning/features/inputs/inputevent.html diff --git a/doc/classes/InputEventWithModifiers.xml b/doc/classes/InputEventWithModifiers.xml index 68a5540402d..3dc102aa614 100644 --- a/doc/classes/InputEventWithModifiers.xml +++ b/doc/classes/InputEventWithModifiers.xml @@ -4,7 +4,7 @@ Base class for keys events with modifiers. - Contains keys events informations with modifiers support like [code]SHIFT[/code] or [code]ALT[/code]. See [method Node._input]. + Contains keys events information with modifiers support like [code]SHIFT[/code] or [code]ALT[/code]. See [method Node._input]. http://docs.godotengine.org/en/3.0/learning/features/inputs/inputevent.html diff --git a/doc/classes/Joint.xml b/doc/classes/Joint.xml index c26bbdb2185..7b1497e99a3 100644 --- a/doc/classes/Joint.xml +++ b/doc/classes/Joint.xml @@ -23,7 +23,7 @@ The [Node], the second side of the Joint attaches to. - The order in wich the solver is executed compared to the other [Joints], the lower, the earlier. + The order in which the solver is executed compared to the other [Joints], the lower, the earlier. diff --git a/doc/classes/KinematicBody.xml b/doc/classes/KinematicBody.xml index 747c46cced1..a782a555042 100644 --- a/doc/classes/KinematicBody.xml +++ b/doc/classes/KinematicBody.xml @@ -27,7 +27,7 @@ - Returns a [KinematicCollision], which contains information about a collision that occured during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). + Returns a [KinematicCollision], which contains information about a collision that occurred during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). @@ -87,7 +87,7 @@ If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes. If the body collides, it will change direction a maximum of [code]max_bounces[/code] times before it stops. [code]floor_max_angle[/code] is the maximum angle (in radians) where a slope is still considered a floor (or a ceiling), rather than a wall. The default value equals 45 degrees. - Returns the movement that remained when the body stopped. To get more detailed information about collisions that occured, use [method get_slide_collision]. + Returns the movement that remained when the body stopped. To get more detailed information about collisions that occurred, use [method get_slide_collision]. diff --git a/doc/classes/KinematicBody2D.xml b/doc/classes/KinematicBody2D.xml index 5c12a0c8c01..d00a887e424 100644 --- a/doc/classes/KinematicBody2D.xml +++ b/doc/classes/KinematicBody2D.xml @@ -26,7 +26,7 @@ - Returns a [KinematicCollision2D], which contains information about a collision that occured during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). + Returns a [KinematicCollision2D], which contains information about a collision that occurred during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). @@ -86,7 +86,7 @@ If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes. If the body collides, it will change direction a maximum of [code]max_bounces[/code] times before it stops. [code]floor_max_angle[/code] is the maximum angle (in radians) where a slope is still considered a floor (or a ceiling), rather than a wall. The default value equals 45 degrees. - Returns the movement that remained when the body stopped. To get more detailed information about collisions that occured, use [method get_slide_collision]. + Returns the movement that remained when the body stopped. To get more detailed information about collisions that occurred, use [method get_slide_collision]. diff --git a/doc/classes/Line2D.xml b/doc/classes/Line2D.xml index 4ad0d7575f8..2898a844910 100644 --- a/doc/classes/Line2D.xml +++ b/doc/classes/Line2D.xml @@ -71,7 +71,7 @@ The gradient is drawn through the whole line from start to finish. The default color will not be used if a gradient is set. - The style for the points inbetween the start and the end. + The style for the points between the start and the end. The points that form the lines. The line is drawn between every point set in this array. diff --git a/doc/classes/LineEdit.xml b/doc/classes/LineEdit.xml index 3a3fda72ccc..c8798b8ee49 100644 --- a/doc/classes/LineEdit.xml +++ b/doc/classes/LineEdit.xml @@ -86,7 +86,7 @@ Duration (in seconds) of a caret's blinking cycle. - The cursor's position inside the [code]LineEdit[/code]. When set, the text may scroll to accomodate it. + The cursor's position inside the [code]LineEdit[/code]. When set, the text may scroll to accommodate it. If [code]true[/code] the context menu will appear when right clicked. diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml index e7627e11c5c..6f64c865cd0 100644 --- a/doc/classes/Node.xml +++ b/doc/classes/Node.xml @@ -44,7 +44,7 @@ Called when there is an input event. The input event propagates through the node tree until a node consumes it. - It is only called if input processing is enabled, which is done automatically if this method is overriden, and can be toggled with [method set_process_input]. + It is only called if input processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process_input]. @@ -54,7 +54,7 @@ Called during the physics processing step of the main loop. Physics processing means that the frame rate is synced to the physics, i.e. the [code]delta[/code] variable should be constant. - It is only called if physics processing is enabled, which is done automatically if this method is overriden, and can be toggled with [method set_physics_process]. + It is only called if physics processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_physics_process]. Corresponds to the NOTIFICATION_PHYSICS_PROCESS notification in [method Object._notification]. @@ -65,7 +65,7 @@ Called during the processing step of the main loop. Processing happens at every frame and as fast as possible, so the [code]delta[/code] time since the previous frame is not constant. - It is only called if processing is enabled, which is done automatically if this method is overriden, and can be toggled with [method set_process]. + It is only called if processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process]. Corresponds to the NOTIFICATION_PROCESS notification in [method Object._notification]. @@ -84,7 +84,7 @@ Propagated to all nodes when the previous InputEvent is not consumed by any nodes. - It is only called if unhandled input processing is enabled, which is done automatically if this method is overriden, and can be toggled with [method set_process_unhandled_input]. + It is only called if unhandled input processing is enabled, which is done automatically if this method is overridden, and can be toggled with [method set_process_unhandled_input]. @@ -656,7 +656,7 @@ - Enables or disables physics (i.e. fixed framerate) processing. When a node is being processed, it will receive a NOTIFICATION_PHYSICS_PROCESS at a fixed (usually 60 fps, see [OS] to change) interval (and the [method _physics_process] callback will be called if exists). Enabled automatically if [method _physics_process] is overriden. Any calls to this before [method _ready] will be ignored. + Enables or disables physics (i.e. fixed framerate) processing. When a node is being processed, it will receive a NOTIFICATION_PHYSICS_PROCESS at a fixed (usually 60 fps, see [OS] to change) interval (and the [method _physics_process] callback will be called if exists). Enabled automatically if [method _physics_process] is overridden. Any calls to this before [method _ready] will be ignored. @@ -673,7 +673,7 @@ - Enables or disables processing. When a node is being processed, it will receive a NOTIFICATION_PROCESS on every drawn frame (and the [method _process] callback will be called if exists). Enabled automatically if [method _process] is overriden. Any calls to this before [method _ready] will be ignored. + Enables or disables processing. When a node is being processed, it will receive a NOTIFICATION_PROCESS on every drawn frame (and the [method _process] callback will be called if exists). Enabled automatically if [method _process] is overridden. Any calls to this before [method _ready] will be ignored. @@ -682,7 +682,7 @@ - Enables or disables input processing. This is not required for GUI controls! Enabled automatically if [method _input] is overriden. Any calls to this before [method _ready] will be ignored. + Enables or disables input processing. This is not required for GUI controls! Enabled automatically if [method _input] is overridden. Any calls to this before [method _ready] will be ignored. @@ -699,7 +699,7 @@ - Enables unhandled input processing. This is not required for GUI controls! It enables the node to receive all input that was not previously handled (usually by a [Control]). Enabled automatically if [method _unhandled_input] is overriden. Any calls to this before [method _ready] will be ignored. + Enables unhandled input processing. This is not required for GUI controls! It enables the node to receive all input that was not previously handled (usually by a [Control]). Enabled automatically if [method _unhandled_input] is overridden. Any calls to this before [method _ready] will be ignored. @@ -708,7 +708,7 @@ - Enables unhandled key input processing. Enabled automatically if [method _unhandled_key_input] is overriden. Any calls to this before [method _ready] will be ignored. + Enables unhandled key input processing. Enabled automatically if [method _unhandled_key_input] is overridden. Any calls to this before [method _ready] will be ignored. diff --git a/doc/classes/PhysicsServer.xml b/doc/classes/PhysicsServer.xml index 2edf2f5e72d..f822867666e 100644 --- a/doc/classes/PhysicsServer.xml +++ b/doc/classes/PhysicsServer.xml @@ -1199,7 +1199,7 @@ If above 0, this value is the maximum value for an impulse that this Joint puts on it's ends. - The speed with wich the two bodies get pulled together when they move in different directions. + The speed with which the two bodies get pulled together when they move in different directions. The maximum rotation across the Hinge. @@ -1234,7 +1234,7 @@ The minimum difference between the pivot points on their x-axis before damping happens. - A factor applied to the movement accross the slider axis once the limits get surpassed. The lower, the slower the movement. + A factor applied to the movement across the slider axis once the limits get surpassed. The lower, the slower the movement. The amount of restitution once the limits are surpassed. The lower, the more velocityenergy gets lost. @@ -1243,7 +1243,7 @@ The amount of damping once the slider limits are surpassed. - A factor applied to the movement accross the slider axis as long as the slider is in the limits. The lower, the slower the movement. + A factor applied to the movement across the slider axis as long as the slider is in the limits. The lower, the slower the movement. The amount of restitution inside the slider limits. @@ -1252,13 +1252,13 @@ The amount of damping inside the slider limits. - A factor applied to the movement accross axes orthogonal to the slider. + A factor applied to the movement across axes orthogonal to the slider. - The amount of restitution when movement is accross axes orthogonal to the slider. + The amount of restitution when movement is across axes orthogonal to the slider. - The amount of damping when movement is accross axes orthogonal to the slider. + The amount of damping when movement is across axes orthogonal to the slider. The upper limit of rotation in the slider. @@ -1323,7 +1323,7 @@ The maximum difference between the pivot points' axes. - A factor that gets applied to the movement accross the axes. The lower, the slower the movement. + A factor that gets applied to the movement across the axes. The lower, the slower the movement. The amount of restitution on the axes movement. The lower, the more velocity-energy gets lost. @@ -1332,25 +1332,25 @@ The amount of damping that happens at the linear motion across the axes. - The minimum rotation in negative direction to break loose and rotate arround the axes. + The minimum rotation in negative direction to break loose and rotate around the axes. - The minimum rotation in positive direction to break loose and rotate arround the axes. + The minimum rotation in positive direction to break loose and rotate around the axes. - A factor that gets multiplied onto all rotations accross the axes. + A factor that gets multiplied onto all rotations across the axes. - The amount of rotational damping accross the axes. The lower, the more dampening occurs. + The amount of rotational damping across the axes. The lower, the more dampening occurs. - The amount of rotational restitution accross the axes. The lower, the more restitution occurs. + The amount of rotational restitution across the axes. The lower, the more restitution occurs. - The maximum amount of force that can occur, when rotating arround the axes. + The maximum amount of force that can occur, when rotating around the axes. - When correcting the crossing of limits in rotation accross the axes, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. + When correcting the crossing of limits in rotation across the axes, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower. Target speed for the motor at the axes. diff --git a/doc/classes/PinJoint.xml b/doc/classes/PinJoint.xml index f1e9d8dfe67..eeea1d5565b 100644 --- a/doc/classes/PinJoint.xml +++ b/doc/classes/PinJoint.xml @@ -14,11 +14,11 @@ - The force with wich the pinned objects stay in positional relation to each other. + The force with which the pinned objects stay in positional relation to each other. The higher, the stronger. - The force with wich the pinned objects stay in velocity relation to each other. + The force with which the pinned objects stay in velocity relation to each other. The higher, the stronger. @@ -27,11 +27,11 @@ - The force with wich the pinned objects stay in positional relation to each other. + The force with which the pinned objects stay in positional relation to each other. The higher, the stronger. - The force with wich the pinned objects stay in velocity relation to each other. + The force with which the pinned objects stay in velocity relation to each other. The higher, the stronger. diff --git a/doc/classes/PopupMenu.xml b/doc/classes/PopupMenu.xml index 1a68a139072..da73abbabb4 100644 --- a/doc/classes/PopupMenu.xml +++ b/doc/classes/PopupMenu.xml @@ -266,7 +266,7 @@ - Return whether the item is a seperator. If it is, it would be displayed as a line. + Return whether the item is a separator. If it is, it would be displayed as a line. @@ -308,7 +308,7 @@ - Mark the item at index "idx" as a seperator, which means that it would be displayed as a mere line. + Mark the item at index "idx" as a separator, which means that it would be displayed as a mere line. diff --git a/doc/classes/SliderJoint.xml b/doc/classes/SliderJoint.xml index 89441094e63..81ab064b8af 100644 --- a/doc/classes/SliderJoint.xml +++ b/doc/classes/SliderJoint.xml @@ -59,7 +59,7 @@ The amount of restitution once the limits are surpassed. The lower, the more velocity-energy gets lost. - A factor applied to the movement accross the slider axis once the limits get surpassed. The lower, the slower the movement. + A factor applied to the movement across the slider axis once the limits get surpassed. The lower, the slower the movement. The maximum difference between the pivot points on their x-axis before damping happens. @@ -71,16 +71,16 @@ The amount of restitution inside the slider limits. - A factor applied to the movement accross the slider axis as long as the slider is in the limits. The lower, the slower the movement. + A factor applied to the movement across the slider axis as long as the slider is in the limits. The lower, the slower the movement. - The amount of damping when movement is accross axes orthogonal to the slider. + The amount of damping when movement is across axes orthogonal to the slider. - The amount of restitution when movement is accross axes orthogonal to the slider. + The amount of restitution when movement is across axes orthogonal to the slider. - A factor applied to the movement accross axes orthogonal to the slider. + A factor applied to the movement across axes orthogonal to the slider. @@ -91,7 +91,7 @@ The minimum difference between the pivot points on their x-axis before damping happens. - A factor applied to the movement accross the slider axis once the limits get surpassed. The lower, the slower the movement. + A factor applied to the movement across the slider axis once the limits get surpassed. The lower, the slower the movement. The amount of restitution once the limits are surpassed. The lower, the more velocityenergy gets lost. @@ -100,7 +100,7 @@ The amount of damping once the slider limits are surpassed. - A factor applied to the movement accross the slider axis as long as the slider is in the limits. The lower, the slower the movement. + A factor applied to the movement across the slider axis as long as the slider is in the limits. The lower, the slower the movement. The amount of restitution inside the slider limits. @@ -109,13 +109,13 @@ The amount of damping inside the slider limits. - A factor applied to the movement accross axes orthogonal to the slider. + A factor applied to the movement across axes orthogonal to the slider. - The amount of restitution when movement is accross axes orthogonal to the slider. + The amount of restitution when movement is across axes orthogonal to the slider. - The amount of damping when movement is accross axes orthogonal to the slider. + The amount of damping when movement is across axes orthogonal to the slider. The upper limit of rotation in the slider. diff --git a/doc/classes/String.xml b/doc/classes/String.xml index 5ae1c6608b3..19ab367257d 100644 --- a/doc/classes/String.xml +++ b/doc/classes/String.xml @@ -343,7 +343,7 @@ - Formats the string by replacing all occurences of [code]placeholder[/code] with [code]values[/code]. + Formats the string by replacing all occurrences of [code]placeholder[/code] with [code]values[/code]. diff --git a/doc/classes/VisualServer.xml b/doc/classes/VisualServer.xml index 3823b7e5e97..ed987f70476 100644 --- a/doc/classes/VisualServer.xml +++ b/doc/classes/VisualServer.xml @@ -204,7 +204,7 @@ - Adds a polyline, which is a line from mutliple points with a width, to the [CanvasItem]'s draw commands. + Adds a polyline, which is a line from multiple points with a width, to the [CanvasItem]'s draw commands. @@ -669,7 +669,7 @@ - The shadow mask. binary about wich layers this canvas light affects wich canvas item's shadows. See [LightOccluder2D] for more information on light masks. + The shadow mask. binary about which layers this canvas light affects which canvas item's shadows. See [LightOccluder2D] for more information on light masks. @@ -1506,7 +1506,7 @@ - Returns a copy of a texture's image unless it's a CubeMap, in wich case it returns the [RID] of the image at one of the cubes sides. + Returns a copy of a texture's image unless it's a CubeMap, in which case it returns the [RID] of the image at one of the cubes sides. @@ -2155,10 +2155,10 @@ Primitive to draw consists of triangles. - Primitive to draw consists of a triangle strip (the last 3 verticies are always combined to make a triangle). + Primitive to draw consists of a triangle strip (the last 3 vertices are always combined to make a triangle). - Primitive to draw consists of a triangle strip (the last 2 verticies are always combined with the first to make a triangle). + Primitive to draw consists of a triangle strip (the last 2 vertices are always combined with the first to make a triangle). Marks the primitive types endpoint. used internally. diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 71f475b6556..0fc095a8680 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -5369,7 +5369,7 @@ void RasterizerStorageGLES3::particles_set_emitting(RID p_particles, bool p_emit Particles *particles = particles_owner.getornull(p_particles); ERR_FAIL_COND(!particles); if (p_emitting != particles->emitting) { - // Restart is overriden by set_emitting + // Restart is overridden by set_emitting particles->restart_request = false; } particles->emitting = p_emitting; diff --git a/drivers/gles3/shaders/copy.glsl b/drivers/gles3/shaders/copy.glsl index 44eec9525bd..1b7c626d3c8 100644 --- a/drivers/gles3/shaders/copy.glsl +++ b/drivers/gles3/shaders/copy.glsl @@ -131,7 +131,7 @@ void main() { #elif defined(USE_ASYM_PANO) - // When an assymetrical projection matrix is used (applicable for stereoscopic rendering i.e. VR) we need to do this calculation per fragment to get a perspective correct result. + // When an asymmetrical projection matrix is used (applicable for stereoscopic rendering i.e. VR) we need to do this calculation per fragment to get a perspective correct result. // Note that we're ignoring the x-offset for IPD, with Z sufficiently in the distance it becomes neglectible, as a result we could probably just set cube_normal.z to -1. // The Matrix[2][0] (= asym_proj.x) and Matrix[2][1] (= asym_proj.z) values are what provide the right shift in the image. diff --git a/editor/collada/collada.cpp b/editor/collada/collada.cpp index 1f0af55103c..4ce57d7f63b 100644 --- a/editor/collada/collada.cpp +++ b/editor/collada/collada.cpp @@ -908,7 +908,7 @@ void Collada::_parse_curve_geometry(XMLParser &parser, String p_id, String p_nam COLLADA_PRINT("curve name: " + p_name); String current_source; - // handles geometry node and the curve childs in this loop + // handles geometry node and the curve children in this loop // read sources with arrays and accessor for each curve if (parser.is_empty()) { return; @@ -996,7 +996,7 @@ void Collada::_parse_mesh_geometry(XMLParser &parser, String p_id, String p_name COLLADA_PRINT("mesh name: " + p_name); String current_source; - // handles geometry node and the mesh childs in this loop + // handles geometry node and the mesh children in this loop // read sources with arrays and accessor for each mesh if (parser.is_empty()) { return; diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 3ecb7d63144..19fd297f69a 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -627,7 +627,7 @@ bool OrphanResourcesDialog::_fill_owners(EditorFileSystemDirectory *efsd, HashMa if (!efsd) return false; - bool has_childs = false; + bool has_children = false; for (int i = 0; i < efsd->get_subdir_count(); i++) { @@ -643,7 +643,7 @@ bool OrphanResourcesDialog::_fill_owners(EditorFileSystemDirectory *efsd, HashMa if (!children) { memdelete(dir_item); } else { - has_childs = true; + has_children = true; } } } @@ -683,12 +683,12 @@ bool OrphanResourcesDialog::_fill_owners(EditorFileSystemDirectory *efsd, HashMa ti->add_button(1, get_icon("GuiVisibilityVisible", "EditorIcons")); } ti->set_metadata(0, path); - has_childs = true; + has_children = true; } } } - return has_childs; + return has_children; } void OrphanResourcesDialog::refresh() { diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 621364d901b..2f0c41c6e16 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -369,7 +369,7 @@ void EditorNode::_notification(int p_what) { search_button->set_icon(gui_base->get_icon("Search", "EditorIcons")); object_menu->set_icon(gui_base->get_icon("Tools", "EditorIcons")); - // clear_button->set_icon(gui_base->get_icon("Close", "EditorIcons")); dont have access to that node. needs to become a class property + // clear_button->set_icon(gui_base->get_icon("Close", "EditorIcons")); don't have access to that node. needs to become a class property update_menu->set_icon(gui_base->get_icon("Collapse", "EditorIcons")); dock_tab_move_left->set_icon(theme->get_icon("Back", "EditorIcons")); dock_tab_move_right->set_icon(theme->get_icon("Forward", "EditorIcons")); @@ -4239,7 +4239,7 @@ void EditorNode::_bottom_panel_switch(bool p_enable, int p_idx) { bottom_panel_items[i].button->set_pressed(i == p_idx); bottom_panel_items[i].control->set_visible(i == p_idx); } - if (ScriptEditor::get_singleton()->get_debugger() == bottom_panel_items[p_idx].control) { // this is the debug panel wich uses tabs, so the top section should be smaller + if (ScriptEditor::get_singleton()->get_debugger() == bottom_panel_items[p_idx].control) { // this is the debug panel which uses tabs, so the top section should be smaller bottom_panel->add_style_override("panel", gui_base->get_stylebox("BottomPanelDebuggerOverride", "EditorStyles")); } else { bottom_panel->add_style_override("panel", gui_base->get_stylebox("panel", "TabContainer")); diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index 8ed14ab847f..145dccc2d57 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -178,7 +178,7 @@ public: virtual bool handles(Object *p_object) const; virtual Dictionary get_state() const; //save editor state so it can't be reloaded when reloading scene virtual void set_state(const Dictionary &p_state); //restore editor state (likely was saved with the scene) - virtual void clear(); // clear any temporary data in te editor, reset it (likely new scene or load another scene) + virtual void clear(); // clear any temporary data in the editor, reset it (likely new scene or load another scene) virtual void save_external_data(); // if editor references external resources/scenes, save them virtual void apply_changes(); // if changes are pending in editor, apply them virtual void get_breakpoints(List *p_breakpoints); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 9125f5f6704..096a60afa33 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -212,7 +212,7 @@ void editor_register_and_generate_icons(Ref p_theme, bool p_dark_theme = } // generate thumb files with the given thumb size - bool force_filter = !(p_thumb_size == 64 && p_thumb_size == 32); // we dont need filter with original resolution + bool force_filter = !(p_thumb_size == 64 && p_thumb_size == 32); // we don't need filter with original resolution if (p_thumb_size >= 64) { float scale = (float)p_thumb_size / 64.0 * EDSCALE; for (int i = 0; i < editor_bg_thumbs_count; i++) { diff --git a/editor/icons/SCsub b/editor/icons/SCsub index 0e4a4796ece..9bd036dfa9e 100644 --- a/editor/icons/SCsub +++ b/editor/icons/SCsub @@ -52,9 +52,9 @@ def make_editor_icons_action(target, source, env): # some special cases if icon_name in ['Int', 'Bool', 'Float']: icon_name = icon_name.lower() - if icon_name.endswith("MediumThumb"): # dont know a better way to handle this + if icon_name.endswith("MediumThumb"): # don't know a better way to handle this thumb_medium_indices.append(str(index)) - if icon_name.endswith("BigThumb"): # dont know a better way to handle this + if icon_name.endswith("BigThumb"): # don't know a better way to handle this thumb_big_indices.append(str(index)) s.write('\t"%s"' % icon_name) diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 869500a6b69..863b13cbd7c 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -1551,7 +1551,7 @@ void ColladaImport::create_animations(bool p_make_tracks_in_all_bones, bool p_im node = node_name_map[at.target]; } else { - print_line("Couldnt find node: " + at.target); + print_line("Couldn't find node: " + at.target); continue; } } else { @@ -1736,7 +1736,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones } if (xform_idx == -1) { - print_line("couldnt find matching node " + at.target + " xform for track " + at.param); + print_line("couldn't find matching node " + at.target + " xform for track " + at.param); continue; } diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index d071d43cb75..c22e1cd88b2 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -187,7 +187,7 @@ void AnimationPlayerEditor::_play_pressed() { if (current != "") { if (current == player->get_assigned_animation()) - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself player->play(current); } @@ -211,7 +211,7 @@ void AnimationPlayerEditor::_play_from_pressed() { if (current == player->get_assigned_animation() && player->is_playing()) { - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself } player->play(current); @@ -235,7 +235,7 @@ void AnimationPlayerEditor::_play_bw_pressed() { if (current != "") { if (current == player->get_assigned_animation()) - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself player->play(current, -1, -1, true); } @@ -257,7 +257,7 @@ void AnimationPlayerEditor::_play_bw_from_pressed() { float time = player->get_current_animation_position(); if (current == player->get_assigned_animation()) - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself player->play(current, -1, -1, true); player->seek(time); diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index f6834732a31..670f13b6c82 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1238,7 +1238,7 @@ void CanvasItemEditor::_gui_input_viewport_base(const Ref &p_event) if (b->get_button_index() == BUTTON_LEFT && b->is_pressed()) { if (show_guides && show_rulers && EditorNode::get_singleton()->get_edited_scene()) { Transform2D xform = viewport_scrollable->get_transform() * transform; - // Retreive the guide lists + // Retrieve the guide lists Array vguides; if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) { vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_"); @@ -1296,7 +1296,7 @@ void CanvasItemEditor::_gui_input_viewport_base(const Ref &p_event) if (show_guides && EditorNode::get_singleton()->get_edited_scene()) { Transform2D xform = viewport_scrollable->get_transform() * transform; - // Retreive the guide lists + // Retrieve the guide lists Array vguides; if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) { vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_"); diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 3be68f21af0..7c49408c355 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -177,7 +177,7 @@ void CurveEditor::on_gui_input(const Ref &p_event) { set_hover_point_index(i); set_selected_point(i); - // This is to prevent the user from loosing a point out of view. + // This is to prevent the user from losing a point out of view. if (point_pos.y < curve.get_min_value()) point_pos.y = curve.get_min_value(); else if (point_pos.y > curve.get_max_value()) diff --git a/editor/plugins/navigation_mesh_generator.cpp b/editor/plugins/navigation_mesh_generator.cpp index 214f9821408..5d4e5520f4c 100644 --- a/editor/plugins/navigation_mesh_generator.cpp +++ b/editor/plugins/navigation_mesh_generator.cpp @@ -138,12 +138,12 @@ void NavigationMeshGenerator::_convert_detail_mesh_to_native_navigation_mesh(con void NavigationMeshGenerator::_build_recast_navigation_mesh(Ref p_nav_mesh, EditorProgress *ep, rcHeightfield *hf, rcCompactHeightfield *chf, rcContourSet *cset, rcPolyMesh *poly_mesh, rcPolyMeshDetail *detail_mesh, - Vector &verticies, Vector &indices) { + Vector &vertices, Vector &indices) { rcContext ctx; ep->step(TTR("Setting up Configuration..."), 1); - const float *verts = verticies.ptr(); - const int nverts = verticies.size() / 3; + const float *verts = vertices.ptr(); + const int nverts = vertices.size() / 3; const int *tris = indices.ptr(); const int ntris = indices.size() / 3; @@ -265,12 +265,12 @@ void NavigationMeshGenerator::bake(Ref p_nav_mesh, Node *p_node) EditorProgress ep("bake", TTR("Navigation Mesh Generator Setup:"), 11); ep.step(TTR("Parsing Geometry..."), 0); - Vector verticies; + Vector vertices; Vector indices; - _parse_geometry(Object::cast_to(p_node)->get_global_transform().affine_inverse(), p_node, verticies, indices); + _parse_geometry(Object::cast_to(p_node)->get_global_transform().affine_inverse(), p_node, vertices, indices); - if (verticies.size() > 0 && indices.size() > 0) { + if (vertices.size() > 0 && indices.size() > 0) { rcHeightfield *hf = NULL; rcCompactHeightfield *chf = NULL; @@ -278,7 +278,7 @@ void NavigationMeshGenerator::bake(Ref p_nav_mesh, Node *p_node) rcPolyMesh *poly_mesh = NULL; rcPolyMeshDetail *detail_mesh = NULL; - _build_recast_navigation_mesh(p_nav_mesh, &ep, hf, chf, cset, poly_mesh, detail_mesh, verticies, indices); + _build_recast_navigation_mesh(p_nav_mesh, &ep, hf, chf, cset, poly_mesh, detail_mesh, vertices, indices); if (hf) { rcFreeHeightField(hf); diff --git a/editor/plugins/navigation_mesh_generator.h b/editor/plugins/navigation_mesh_generator.h index 2f7bad0a823..d26f541b8d1 100644 --- a/editor/plugins/navigation_mesh_generator.h +++ b/editor/plugins/navigation_mesh_generator.h @@ -54,7 +54,7 @@ protected: static void _convert_detail_mesh_to_native_navigation_mesh(const rcPolyMeshDetail *p_detail_mesh, Ref p_nav_mesh); static void _build_recast_navigation_mesh(Ref p_nav_mesh, EditorProgress *ep, rcHeightfield *hf, rcCompactHeightfield *chf, rcContourSet *cset, rcPolyMesh *poly_mesh, - rcPolyMeshDetail *detail_mesh, Vector &verticies, Vector &indices); + rcPolyMeshDetail *detail_mesh, Vector &vertices, Vector &indices); public: static void bake(Ref p_nav_mesh, Node *p_node); diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index e2ea8530528..5e8eb065560 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -1589,7 +1589,7 @@ void SpatialEditorViewport::_sinput(const Ref &p_event) { float snap = spatial_editor->get_rotate_snap(); if (snap) { - angle = Math::rad2deg(angle) + snap * 0.5; //else it wont reach +180 + angle = Math::rad2deg(angle) + snap * 0.5; //else it won't reach +180 angle -= Math::fmod(angle, snap); set_message(vformat(TTR("Rotating %s degrees."), rtos(angle))); angle = Math::deg2rad(angle); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 33b538fd487..16605f2ebde 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -159,7 +159,7 @@ private: bool is_empty = true; String n = d->get_next(); while (n != String()) { - if (!n.begins_with(".")) { // i dont know if this is enough to guarantee an empty dir + if (!n.begins_with(".")) { // i don't know if this is enough to guarantee an empty dir is_empty = false; break; } @@ -690,7 +690,7 @@ void ProjectManager::_notification(int p_what) { } break; case NOTIFICATION_READY: { - if (scroll_childs->get_child_count() == 0) + if (scroll_children->get_child_count() == 0) open_templates->popup_centered_minsize(); } break; case NOTIFICATION_VISIBILITY_CHANGED: { @@ -712,9 +712,9 @@ void ProjectManager::_panel_draw(Node *p_hb) { } void ProjectManager::_update_project_buttons() { - for (int i = 0; i < scroll_childs->get_child_count(); i++) { + for (int i = 0; i < scroll_children->get_child_count(); i++) { - CanvasItem *item = Object::cast_to(scroll_childs->get_child(i)); + CanvasItem *item = Object::cast_to(scroll_children->get_child(i)); item->update(); } @@ -736,8 +736,8 @@ void ProjectManager::_panel_input(const Ref &p_ev, Node *p_hb) { int clicked_id = -1; int last_clicked_id = -1; - for (int i = 0; i < scroll_childs->get_child_count(); i++) { - HBoxContainer *hb = Object::cast_to(scroll_childs->get_child(i)); + for (int i = 0; i < scroll_children->get_child_count(); i++) { + HBoxContainer *hb = Object::cast_to(scroll_children->get_child(i)); if (!hb) continue; if (hb->get_meta("name") == clicked) clicked_id = i; if (hb->get_meta("name") == last_clicked) last_clicked_id = i; @@ -746,8 +746,8 @@ void ProjectManager::_panel_input(const Ref &p_ev, Node *p_hb) { if (last_clicked_id != -1 && clicked_id != -1) { int min = clicked_id < last_clicked_id ? clicked_id : last_clicked_id; int max = clicked_id > last_clicked_id ? clicked_id : last_clicked_id; - for (int i = 0; i < scroll_childs->get_child_count(); ++i) { - HBoxContainer *hb = Object::cast_to(scroll_childs->get_child(i)); + for (int i = 0; i < scroll_children->get_child_count(); ++i) { + HBoxContainer *hb = Object::cast_to(scroll_children->get_child(i)); if (!hb) continue; if (i != clicked_id && (i < min || i > max) && !mb->get_control()) { selected_list.erase(hb->get_meta("name")); @@ -801,9 +801,9 @@ void ProjectManager::_unhandled_input(const Ref &p_ev) { } break; case KEY_HOME: { - for (int i = 0; i < scroll_childs->get_child_count(); i++) { + for (int i = 0; i < scroll_children->get_child_count(); i++) { - HBoxContainer *hb = Object::cast_to(scroll_childs->get_child(i)); + HBoxContainer *hb = Object::cast_to(scroll_children->get_child(i)); if (hb) { selected_list.clear(); selected_list.insert(hb->get_meta("name"), hb->get_meta("main_scene")); @@ -816,13 +816,13 @@ void ProjectManager::_unhandled_input(const Ref &p_ev) { } break; case KEY_END: { - for (int i = scroll_childs->get_child_count() - 1; i >= 0; i--) { + for (int i = scroll_children->get_child_count() - 1; i >= 0; i--) { - HBoxContainer *hb = Object::cast_to(scroll_childs->get_child(i)); + HBoxContainer *hb = Object::cast_to(scroll_children->get_child(i)); if (hb) { selected_list.clear(); selected_list.insert(hb->get_meta("name"), hb->get_meta("main_scene")); - scroll->set_v_scroll(scroll_childs->get_size().y); + scroll->set_v_scroll(scroll_children->get_size().y); _update_project_buttons(); break; } @@ -838,9 +838,9 @@ void ProjectManager::_unhandled_input(const Ref &p_ev) { bool found = false; - for (int i = scroll_childs->get_child_count() - 1; i >= 0; i--) { + for (int i = scroll_children->get_child_count() - 1; i >= 0; i--) { - HBoxContainer *hb = Object::cast_to(scroll_childs->get_child(i)); + HBoxContainer *hb = Object::cast_to(scroll_children->get_child(i)); if (!hb) continue; String current = hb->get_meta("name"); @@ -875,9 +875,9 @@ void ProjectManager::_unhandled_input(const Ref &p_ev) { bool found = selected_list.empty(); - for (int i = 0; i < scroll_childs->get_child_count(); i++) { + for (int i = 0; i < scroll_children->get_child_count(); i++) { - HBoxContainer *hb = Object::cast_to(scroll_childs->get_child(i)); + HBoxContainer *hb = Object::cast_to(scroll_children->get_child(i)); if (!hb) continue; String current = hb->get_meta("name"); @@ -941,8 +941,8 @@ void ProjectManager::_load_recent_projects() { ProjectListFilter::FilterOption filter_option = project_filter->get_filter_option(); String search_term = project_filter->get_search_term(); - while (scroll_childs->get_child_count() > 0) { - memdelete(scroll_childs->get_child(0)); + while (scroll_children->get_child_count() > 0) { + memdelete(scroll_children->get_child(0)); } Map selected_list_copy = selected_list; @@ -1102,7 +1102,7 @@ void ProjectManager::_load_recent_projects() { fpath->add_color_override("font_color", font_color); fpath->set_clip_text(true); - scroll_childs->add_child(hb); + scroll_children->add_child(hb); } for (Map::Element *E = selected_list_copy.front(); E; E = E->next()) { @@ -1125,8 +1125,8 @@ void ProjectManager::_on_project_renamed() { void ProjectManager::_on_project_created(const String &dir) { bool has_already = false; - for (int i = 0; i < scroll_childs->get_child_count(); i++) { - HBoxContainer *hb = Object::cast_to(scroll_childs->get_child(i)); + for (int i = 0; i < scroll_children->get_child_count(); i++) { + HBoxContainer *hb = Object::cast_to(scroll_children->get_child(i)); Label *fpath = Object::cast_to