diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e939cde3ca3..21ce52d6e34 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ Sections covered in this file: The golden rule is to **always open *one* issue for *one* bug**. If you notice several bugs and want to report them, make sure to create one new issue for each of them. -Everything refered to hereafter as "bug" also applies for feature requests. +Everything referred to hereafter as "bug" also applies for feature requests. If you are reporting a new issue, you will make our life much simpler (and the fix come much sooner) by following those guidelines: diff --git a/SConstruct b/SConstruct index e9a6bc44b6f..35401194ef6 100644 --- a/SConstruct +++ b/SConstruct @@ -387,7 +387,7 @@ if selected_platform in platform_list: # env['MSVS_VERSION']='9.0' # Calls a CMD with /C(lose) and /V(delayed environment variable expansion) options. - # And runs vcvarsall bat for the propper arhitecture and scons for propper configuration + # And runs vcvarsall bat for the proper architecture and scons for proper configuration env['MSVSBUILDCOM'] = 'cmd /V /C set "plat=$(PlatformTarget)" ^& (if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64")) ^& set "tools=yes" ^& (if "$(Configuration)"=="release" (set "tools=no")) ^& call "$(VCInstallDir)vcvarsall.bat" !plat! ^& scons platform=windows target=$(Configuration) tools=!tools! -j2' env['MSVSREBUILDCOM'] = 'cmd /V /C set "plat=$(PlatformTarget)" ^& (if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64")) ^& set "tools=yes" ^& (if "$(Configuration)"=="release" (set "tools=no")) & call "$(VCInstallDir)vcvarsall.bat" !plat! ^& scons platform=windows target=$(Configuration) tools=!tools! vsproj=yes -j2' env['MSVSCLEANCOM'] = 'cmd /V /C set "plat=$(PlatformTarget)" ^& (if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64")) ^& set "tools=yes" ^& (if "$(Configuration)"=="release" (set "tools=no")) ^& call "$(VCInstallDir)vcvarsall.bat" !plat! ^& scons --clean platform=windows target=$(Configuration) tools=!tools! -j2' diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h index 3a859c809c4..d8c05ab7829 100644 --- a/core/command_queue_mt.h +++ b/core/command_queue_mt.h @@ -550,12 +550,12 @@ class CommandQueueMT { if ((COMMAND_MEM_SIZE - write_ptr) < alloc_size + 4) { // no room at the end, wrap down; - if (read_ptr == 0) // dont want write_ptr to become read_ptr + if (read_ptr == 0) // don't want write_ptr to become read_ptr return NULL; // if this happens, it's a bug ERR_FAIL_COND_V((COMMAND_MEM_SIZE - write_ptr) < sizeof(uint32_t), NULL); - // zero means, wrap to begining + // zero means, wrap to beginning uint32_t *p = (uint32_t *)&command_mem[write_ptr]; *p = 0; diff --git a/core/error_list.h b/core/error_list.h index 72b84254440..7e4249886b0 100644 --- a/core/error_list.h +++ b/core/error_list.h @@ -40,7 +40,7 @@ enum Error { OK, FAILED, ///< Generic fail error ERR_UNAVAILABLE, ///< What is requested is unsupported/unavailable - ERR_UNCONFIGURED, ///< The object being used hasnt been properly set up yet + ERR_UNCONFIGURED, ///< The object being used hasn't been properly set up yet ERR_UNAUTHORIZED, ///< Missing credentials for requested resource ERR_PARAMETER_RANGE_ERROR, ///< Parameter given out of range (5) ERR_OUT_OF_MEMORY, ///< Out of memory diff --git a/core/global_config.cpp b/core/global_config.cpp index 6aded6fbb7e..9ee49180f1e 100644 --- a/core/global_config.cpp +++ b/core/global_config.cpp @@ -282,7 +282,7 @@ Error GlobalConfig::setup(const String &p_path, const String &p_main_pack) { //Try to use the filesystem for files, according to OS. (only Android -when reading from pck- and iOS use this) if (OS::get_singleton()->get_resource_dir() != "") { - //OS will call Globals->get_resource_path which will be empty if not overriden! + //OS will call Globals->get_resource_path which will be empty if not overridden! //if the OS would rather use somewhere else, then it will not be empty. resource_path = OS::get_singleton()->get_resource_dir().replace("\\", "/"); diff --git a/core/global_constants.cpp b/core/global_constants.cpp index c7f353ac44e..9d1ae3aed95 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -414,7 +414,7 @@ static _GlobalConstant _global_constants[] = { BIND_GLOBAL_CONSTANT(OK), BIND_GLOBAL_CONSTANT(FAILED), ///< Generic fail error BIND_GLOBAL_CONSTANT(ERR_UNAVAILABLE), ///< What is requested is unsupported/unavailable - BIND_GLOBAL_CONSTANT(ERR_UNCONFIGURED), ///< The object being used hasnt been properly set up yet + BIND_GLOBAL_CONSTANT(ERR_UNCONFIGURED), ///< The object being used hasn't been properly set up yet BIND_GLOBAL_CONSTANT(ERR_UNAUTHORIZED), ///< Missing credentials for requested resource BIND_GLOBAL_CONSTANT(ERR_PARAMETER_RANGE_ERROR), ///< Parameter given out of range BIND_GLOBAL_CONSTANT(ERR_OUT_OF_MEMORY), ///< Out of memory diff --git a/core/hash_map.h b/core/hash_map.h index 645e34e923e..86646b825c0 100644 --- a/core/hash_map.h +++ b/core/hash_map.h @@ -413,7 +413,7 @@ public: } /** - * Erase an item, return true if erasing was succesful + * Erase an item, return true if erasing was successful */ bool erase(const TKey &p_key) { diff --git a/core/image.h b/core/image.h index 310351e5472..300ac11e049 100644 --- a/core/image.h +++ b/core/image.h @@ -171,7 +171,7 @@ public: void get_mipmap_offset_size_and_dimensions(int p_mipmap, int &r_ofs, int &r_size, int &w, int &h) const; //get where the mipmap begins in data /** - * Resize the image, using the prefered interpolation method. + * Resize the image, using the preferred interpolation method. * Indexed-Color images always use INTERPOLATE_NEAREST. */ diff --git a/core/io/marshalls.h b/core/io/marshalls.h index 939ed9cea9f..b3224109291 100644 --- a/core/io/marshalls.h +++ b/core/io/marshalls.h @@ -34,7 +34,7 @@ #include "variant.h" /** - * Miscelaneous helpers for marshalling data types, and encoding + * Miscellaneous helpers for marshalling data types, and encoding * in an endian independent way */ diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp index e3b669409ac..c5929617c94 100644 --- a/core/io/xml_parser.cpp +++ b/core/io/xml_parser.cpp @@ -39,7 +39,7 @@ static bool _equalsn(const CharType *str1, const CharType *str2, int len) { return false; // if one (or both) of the strings was smaller then they - // are only equal if they have the same lenght + // are only equal if they have the same length return (i == len) || (str1[i] == 0 && str2[i] == 0); } diff --git a/core/list.h b/core/list.h index 69245803806..b6f2df867fa 100644 --- a/core/list.h +++ b/core/list.h @@ -179,7 +179,7 @@ private: public: /** - * return an const iterator to the begining of the list. + * return an const iterator to the beginning of the list. */ _FORCE_INLINE_ const Element *front() const { @@ -187,7 +187,7 @@ public: }; /** - * return an iterator to the begining of the list. + * return an iterator to the beginning of the list. */ _FORCE_INLINE_ Element *front() { return _data ? _data->first : 0; @@ -251,7 +251,7 @@ public: } /** - * store a new element at the begining of the list + * store a new element at the beginning of the list */ Element *push_front(const T &value) { diff --git a/core/math/face3.cpp b/core/math/face3.cpp index d9d99b0384d..6a15feefe17 100644 --- a/core/math/face3.cpp +++ b/core/math/face3.cpp @@ -136,7 +136,7 @@ Face3::Side Face3::get_side_of(const Face3 &p_face, ClockDirection p_clock_dir) const Vector3 &v = p_face.vertex[i]; - if (plane.has_point(v)) //coplanar, dont bother + if (plane.has_point(v)) //coplanar, don't bother continue; if (plane.is_point_over(v)) diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp index ec4d352a8f8..97579e41ef6 100644 --- a/core/math/geometry.cpp +++ b/core/math/geometry.cpp @@ -990,7 +990,7 @@ void Geometry::make_atlas(const Vector &p_rects, Vector &r_resu //super simple, almost brute force scanline stacking fitter //it's pretty basic for now, but it tries to make sure that the aspect ratio of the - //resulting atlas is somehow square. This is necesary because video cards have limits + //resulting atlas is somehow square. This is necessary because video cards have limits //on texture size (usually 2048 or 4096), so the more square a texture, the more chances //it will work in every hardware. // for example, it will prioritize a 1024x1024 atlas (works everywhere) instead of a @@ -1057,7 +1057,7 @@ void Geometry::make_atlas(const Vector &p_rects, Vector &r_resu if (end_w > max_w) max_w = end_w; - if (ofs == 0 || end_h > limit_h) //while h limit not reched, keep stacking + if (ofs == 0 || end_h > limit_h) //while h limit not reached, keep stacking ofs += wrects[j].s.width; } diff --git a/core/math/geometry.h b/core/math/geometry.h index 93ab0be2e0d..26f977e6eb0 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -108,7 +108,7 @@ public: //do the function 'd' as defined by pb. I think is is dot product of some sort #define d_of(m, n, o, p) ((m.x - n.x) * (o.x - p.x) + (m.y - n.y) * (o.y - p.y) + (m.z - n.z) * (o.z - p.z)) - //caluclate the parpametric position on the 2 curves, mua and mub + //calculate the parametric position on the 2 curves, mua and mub real_t mua = ( d_of(p1,q1,q2,q1) * d_of(q2,q1,p2,p1) - d_of(p1,q1,p2,p1) * d_of(q2,q1,q2,q1) ) / ( d_of(p2,p1,p2,p1) * d_of(q2,q1,q2,q1) - d_of(q2,q1,p2,p1) * d_of(q2,q1,p2,p1) ); real_t mub = ( d_of(p1,q1,q2,q1) + mua * d_of(q2,q1,p2,p1) ) / d_of(q2,q1,q2,q1); diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp index 5f73d91ef38..98cab39ba35 100644 --- a/core/math/matrix3.cpp +++ b/core/math/matrix3.cpp @@ -229,7 +229,7 @@ Vector3 Basis::get_scale() const { // FIXME: We eventually need a proper polar decomposition. // As a cheap workaround until then, to ensure that R is a proper rotation matrix with determinant +1 // (such that it can be represented by a Quat or Euler angles), we absorb the sign flip into the scaling matrix. - // As such, it works in conjuction with get_rotation(). + // As such, it works in conjunction with get_rotation(). real_t det_sign = determinant() > 0 ? 1 : -1; return det_sign * Vector3( Vector3(elements[0][0], elements[1][0], elements[2][0]).length(), diff --git a/core/math/plane.cpp b/core/math/plane.cpp index 29e7f2e75c7..bef5c3ab06e 100644 --- a/core/math/plane.cpp +++ b/core/math/plane.cpp @@ -116,7 +116,7 @@ bool Plane::intersects_ray(Vector3 p_from, Vector3 p_dir, Vector3 *p_intersectio real_t dist = (normal.dot(p_from) - d) / den; //printf("dist is %i\n",dist); - if (dist > CMP_EPSILON) { //this is a ray, before the emiting pos (p_from) doesnt exist + if (dist > CMP_EPSILON) { //this is a ray, before the emitting pos (p_from) doesn't exist return false; } diff --git a/core/math/rect3.h b/core/math/rect3.h index 26198537c28..0b11cd7b525 100644 --- a/core/math/rect3.h +++ b/core/math/rect3.h @@ -95,7 +95,7 @@ public: Rect3 expand(const Vector3 &p_vector) const; _FORCE_INLINE_ void project_range_in_plane(const Plane &p_plane, real_t &r_min, real_t &r_max) const; - _FORCE_INLINE_ void expand_to(const Vector3 &p_vector); /** expand to contain a point if necesary */ + _FORCE_INLINE_ void expand_to(const Vector3 &p_vector); /** expand to contain a point if necessary */ operator String() const; diff --git a/core/object.h b/core/object.h index a5836b74fff..f4a622f5f7c 100644 --- a/core/object.h +++ b/core/object.h @@ -53,7 +53,7 @@ enum PropertyHint { PROPERTY_HINT_RANGE, ///< hint_text = "min,max,step,slider; //slider is optional" PROPERTY_HINT_EXP_RANGE, ///< hint_text = "min,max,step", exponential edit PROPERTY_HINT_ENUM, ///< hint_text= "val1,val2,val3,etc" - PROPERTY_HINT_EXP_EASING, /// exponential easing funciton (Math::ease) + PROPERTY_HINT_EXP_EASING, /// exponential easing function (Math::ease) PROPERTY_HINT_LENGTH, ///< hint_text= "length" (as integer) PROPERTY_HINT_SPRITE_FRAME, PROPERTY_HINT_KEY_ACCEL, ///< hint_text= "length" (as integer) diff --git a/core/pool_allocator.cpp b/core/pool_allocator.cpp index 68de05a765e..df55a5f615b 100644 --- a/core/pool_allocator.cpp +++ b/core/pool_allocator.cpp @@ -231,7 +231,7 @@ PoolAllocator::ID PoolAllocator::alloc(int p_size) { Entry &entry = entry_array[entry_indices[new_entry_indices_pos]]; entry.len = p_size; - entry.pos = (new_entry_indices_pos == 0) ? 0 : entry_end(entry_array[entry_indices[new_entry_indices_pos - 1]]); //alloc either at begining or end of previous + entry.pos = (new_entry_indices_pos == 0) ? 0 : entry_end(entry_array[entry_indices[new_entry_indices_pos - 1]]); //alloc either at beginning or end of previous entry.lock = 0; entry.check = (check_count++) & CHECK_MASK; free_mem -= size_to_alloc; diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp index bb7ed22c28d..35e7f03f0ed 100644 --- a/core/script_debugger_remote.cpp +++ b/core/script_debugger_remote.cpp @@ -369,7 +369,7 @@ void ScriptDebuggerRemote::_get_output() { void ScriptDebuggerRemote::line_poll() { //the purpose of this is just processing events every now and then when the script might get too busy - //otherwise bugs like infinite loops cant be catched + //otherwise bugs like infinite loops can't be caught if (poll_every % 2048 == 0) _poll_events(); poll_every++; diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 0b6e2d99ea0..908995196af 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -661,7 +661,7 @@ Stop the function execution and return the current state. Call [method GDFunctionState.resume] on the state to resume execution. This invalidates the state. - Returns anything that was passed to the resume function call. If passed an object and a signal, the execution is resumed when the object's signal is emmited. + Returns anything that was passed to the resume function call. If passed an object and a signal, the execution is resumed when the object's signal is emitted. @@ -2521,7 +2521,7 @@ - Emitted when the animation is finished (when it plays the last frame). If the animation is looping, this signal is emitted everytime the last frame is drawn, before looping. + Emitted when the animation is finished (when it plays the last frame). If the animation is looping, this signal is emitted every time the last frame is drawn, before looping. @@ -7805,7 +7805,7 @@ Tint the entire canvas - CanvasModulate tints the canvas elements using its asigned color + CanvasModulate tints the canvas elements using its assigned color @@ -9088,7 +9088,7 @@ - Sets the colors for the specified amount of elements. Calling this function with a different number of elements than previously defined causes the ramp to resize its colors and offsets array to accomodate the new elements. + Sets the colors for the specified amount of elements. Calling this function with a different number of elements than previously defined causes the ramp to resize its colors and offsets array to accommodate the new elements. @@ -9104,7 +9104,7 @@ - Sets the offset for the specified amount of elements. Calling this function with a different number of elements than previously defined causes the ramp to resize its colors and offsets array to accomodate the new elements, all new colors will be black by default. + Sets the offset for the specified amount of elements. Calling this function with a different number of elements than previously defined causes the ramp to resize its colors and offsets array to accommodate the new elements, all new colors will be black by default. @@ -13167,7 +13167,7 @@ - Set whether to swap the endianess of the file. Enable this if you're dealing with files written in big endian machines. + Set whether to swap the endianness of the file. Enable this if you're dealing with files written in big endian machines. Note that this is about the file format, not CPU type. This is always reseted to [code]false[/code] whenever you open the file. @@ -19951,7 +19951,7 @@ Adds the value of pixels corresponding to the Light2D to the values of pixels under it. This is the common behaviour of a light. - Substract the value of pixels corresponding to the Light2D to the values of pixels under it, resulting in inversed light effect. + Subtract the value of pixels corresponding to the Light2D to the values of pixels under it, resulting in inversed light effect. Mix the value of pixels corresponding to the Light2D to the values of pixels under it by linear interpolation. @@ -26286,7 +26286,7 @@ - Sets the randomness value of the specified emitter parameter (see the constants secction for the list of parameters), 0 means no randomness, so every particle will have the parameters specified, 1 means that the parameter will be choosen at random, the closer the randomness value gets to 0 the more conservative the variation of the parameter will be. + Sets the randomness value of the specified emitter parameter (see the constants secction for the list of parameters), 0 means no randomness, so every particle will have the parameters specified, 1 means that the parameter will be chosen at random, the closer the randomness value gets to 0 the more conservative the variation of the parameter will be. @@ -27207,7 +27207,7 @@ collider_id: Id of the object the shape intersected. collider: Object the shape intersected. rid: [RID] of the object the shape intersected. - The number of intersections can be limited with the second paramater, to reduce the processing time. + The number of intersections can be limited with the second parameter, to reduce the processing time. @@ -32714,7 +32714,7 @@ - Returns the end position of the match in the string. An interger can be specified for numeric groups or a string for named groups. Returns -1 if that group wasn't found or doesn't exist. Defaults to 0 (whole pattern). + Returns the end position of the match in the string. An integer can be specified for numeric groups or a string for named groups. Returns -1 if that group wasn't found or doesn't exist. Defaults to 0 (whole pattern). @@ -32751,7 +32751,7 @@ - Returns the starting position of the match in the string. An interger can be specified for numeric groups or a string for named groups. Returns -1 if that group wasn't found or doesn't exist. Defaults to 0 (whole pattern). + Returns the starting position of the match in the string. An integer can be specified for numeric groups or a string for named groups. Returns -1 if that group wasn't found or doesn't exist. Defaults to 0 (whole pattern). @@ -32760,7 +32760,7 @@ - Returns the result of the match in the string. An interger can be specified for numeric groups or a string for named groups. Returns -1 if that group wasn't found or doesn't exist. Defaults to 0 (whole pattern). + Returns the result of the match in the string. An integer can be specified for numeric groups or a string for named groups. Returns -1 if that group wasn't found or doesn't exist. Defaults to 0 (whole pattern). @@ -38140,7 +38140,7 @@ - Return visibility of the split dragger(One of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]). + Return visibility of the split dragger (one of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]). @@ -38168,7 +38168,7 @@ - Set visibility of the split dragger([i]mode[/i] must be one of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]). + Set visibility of the split dragger ([i]mode[/i] must be one of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]). @@ -38184,7 +38184,7 @@ - Emmited when the dragger is gragged by user. + Emitted when the dragger is dragged by user. @@ -44227,7 +44227,7 @@ tween.start() [/codeblock] Some of the methods of this class require a property name. You can get the property name by hovering over the property in the inspector of the editor. - Many of the methods accept [code]trans_type[/code] and [code]ease_type[/code]. The first accepts an TRANS_* constant, and refers to the way the timing of the animation is handled (you might want to see [code]http://easings.net/[/code] for some examples). The second accepts an EASE_* constant, and controls the where [code]trans_type[/code] is applied to the interpolation (in the begining, the end, or both). If you don't know which transision and easing to pick, you can try different TRANS_* constants with EASE_IN_OUT, and use the one that looks best. + Many of the methods accept [code]trans_type[/code] and [code]ease_type[/code]. The first accepts an TRANS_* constant, and refers to the way the timing of the animation is handled (you might want to see [code]http://easings.net/[/code] for some examples). The second accepts an EASE_* constant, and controls the where [code]trans_type[/code] is applied to the interpolation (in the beginning, the end, or both). If you don't know which transision and easing to pick, you can try different TRANS_* constants with EASE_IN_OUT, and use the one that looks best. @@ -44253,7 +44253,7 @@ Follow [code]method[/code] of [code]object[/code] and apply the returned value on [code]target_method[/code] of [code]target[/code], beginning from [code]initial_val[/code] for [code]duration[/code] seconds, [code]delay[/code] later. Methods are animated by calling them with consequitive values. - [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the beginning, the end, or both). You can read more about them in the class description. @@ -44279,7 +44279,7 @@ Follow [code]property[/code] of [code]object[/code] and apply it on [code]target_property[/code] of [code]target[/code], beginning from [code]initial_val[/code] for [code]duration[/code] seconds, [code]delay[/code] seconds later. Note that [code]target:target_property[/code] would equal [code]object:property[/code] at the end of the tween. - [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the beginning, the end, or both). You can read more about them in the class description. @@ -44370,7 +44370,7 @@ Animate [code]method[/code] of [code]object[/code] from [code]initial_val[/code] to [code]final_val[/code] for [code]duration[/code] seconds, [code]delay[/code] seconds later. Methods are animated by calling them with consecuitive values. - [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the beginning, the end, or both). You can read more about them in the class description. @@ -44394,7 +44394,7 @@ Animate [code]property[/code] of [code]object[/code] from [code]initial_val[/code] to [code]final_val[/code] for [code]duration[/code] seconds, [code]delay[/code] seconds later. - [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the beginning, the end, or both). You can read more about them in the class description. @@ -44550,7 +44550,7 @@ Animate [code]method[/code] of [code]object[/code] from the value returned by [code]initial.initial_method[/code] to [code]final_val[/code] for [code]duration[/code] seconds, [code]delay[/code] seconds later. Methods are animated by calling them with consecuitive values. - [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the beginning, the end, or both). You can read more about them in the class description. @@ -44576,7 +44576,7 @@ Animate [code]property[/code] of [code]object[/code] from the current value of the [code]initial_val[/code] property of [code]initial[/code] to [code]final_val[/code] for [code]duration[/code] seconds, [code]delay[/code] seconds later. - [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description. + [code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the beginning, the end, or both). You can read more about them in the class description. @@ -44680,7 +44680,7 @@ Helper to maange UndoRedo in the editor or custom tools. It works by storing calls to functions in both 'do' an 'undo' lists. - Common behavior is to create an action, then add do/undo calls to functions or property changes, then commiting the action. + Common behavior is to create an action, then add do/undo calls to functions or property changes, then committing the action. @@ -44767,7 +44767,7 @@ do_property]. - Get the version, each time a new action is commited, the version number of the UndoRedo is increased automatically. + Get the version, each time a new action is committed, the version number of the UndoRedo is increased automatically. This is useful mostly to check if something changed from a saved version. @@ -46057,7 +46057,7 @@ do_property]. - Return the captured screenshot after [method queue_screen_capture]. You might need to check more than one frame untill the right image is returned. + Return the captured screenshot after [method queue_screen_capture]. You might need to check more than one frame until the right image is returned. diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 5deb78977a9..3f54f887da2 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -1579,7 +1579,7 @@ Variant RasterizerGLES2::shader_get_default_param(RID p_shader, const StringName Shader *shader = shader_owner.get(p_shader); ERR_FAIL_COND_V(!shader, Variant()); - //update shader params if necesary + //update shader params if necessary //make sure the shader is compiled and everything //so the actual parameters can be properly retrieved! if (shader->dirty_list.in_list()) { @@ -1651,7 +1651,7 @@ Variant RasterizerGLES2::material_get_param(RID p_material, const StringName &p_ ERR_FAIL_COND_V(!material, Variant()); if (material->shader.is_valid()) { - //update shader params if necesary + //update shader params if necessary //make sure the shader is compiled and everything //so the actual parameters can be properly retrieved! material->shader_cache = shader_owner.get(material->shader); @@ -5684,7 +5684,7 @@ void RasterizerGLES2::_render(const Geometry *p_geometry, const Material *p_mate }; } else if (use_attribute_instancing) { - //if not, using atributes instead of uniforms can be really fast in forward rendering architectures + //if not, using attributes instead of uniforms can be really fast in forward rendering architectures if (s->index_array_len > 0) { glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, s->index_id); diff --git a/drivers/gles2/rasterizer_gles2.h b/drivers/gles2/rasterizer_gles2.h index 81e137dffd0..9aeb3af61ae 100644 --- a/drivers/gles2/rasterizer_gles2.h +++ b/drivers/gles2/rasterizer_gles2.h @@ -1661,7 +1661,7 @@ public: void set_base_framebuffer(GLuint p_id, Vector2 p_size = Vector2(0, 0)); - virtual void flush_frame(); //not necesary in most cases + virtual void flush_frame(); //not necessary in most cases void set_extensions(const char *p_strings); virtual bool needs_to_draw_next_frame() const; diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 8eaba0b9777..4fcd09ed585 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -5886,7 +5886,7 @@ bool RasterizerStorageGLES3::free(RID p_rid) { } else if (texture_owner.owns(p_rid)) { // delete the texture Texture *texture = texture_owner.get(p_rid); - ERR_FAIL_COND_V(texture->render_target, true); //cant free the render target texture, dude + ERR_FAIL_COND_V(texture->render_target, true); //can't free the render target texture, dude info.texture_mem -= texture->total_data_size; texture_owner.free(p_rid); memdelete(texture); diff --git a/drivers/gles3/shaders/screen_space_reflection.glsl b/drivers/gles3/shaders/screen_space_reflection.glsl index ec4bdf86c9f..e4ba712de65 100644 --- a/drivers/gles3/shaders/screen_space_reflection.glsl +++ b/drivers/gles3/shaders/screen_space_reflection.glsl @@ -267,7 +267,7 @@ void main() { for(int i=0;i<7;i++) { - float op_len = 2.0 * tan(cone_angle) * cone_len; //oposite side of iso triangle + float op_len = 2.0 * tan(cone_angle) * cone_len; //opposite side of iso triangle float radius; { //fit to sphere inside cone (sphere ends at end of cone), something like this: diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index bb5ab02d8c2..b0710b2c361 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -39,7 +39,7 @@ /* -[03:57] yessopie, so i dont havemak to rely on unicows +[03:57] yessopie, so i don't havemak to rely on unicows [03:58] reduz- yeah, all of the functions fail, and then you can call GetLastError () which will return 120 [03:58] CategoryApl, hehe, what? :) [03:59] didn't Verona lead to some trouble diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp index 1a65014634d..fe342b0ee86 100644 --- a/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -2503,7 +2503,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const InputEvent &p_input) { float newpos = E->get().pos - from_t + motion; /* if (newpos<0) - continue; //no add at the begining + continue; //no add at the beginning */ undo_redo->add_do_method(animation.ptr(), "track_insert_key", E->key().track, newpos, animation->track_get_key_value(E->key().track, E->key().key), animation->track_get_key_transition(E->key().track, E->key().key)); } diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index c71c2cc6087..c4f836f3e4b 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -241,7 +241,7 @@ void FindReplaceBar::_replace_all() { } text_edit->set_v_scroll(vsval); - set_error(vformat(TTR("Replaced %d Ocurrence(s)."), rc)); + set_error(vformat(TTR("Replaced %d occurrence(s)."), rc)); } void FindReplaceBar::_get_search_from(int &r_line, int &r_col) { @@ -703,7 +703,7 @@ void FindReplaceDialog::_replace() { text_edit->set_v_scroll(vsval); //text_edit->set_h_scroll(hsval); - error_label->set_text(vformat(TTR("Replaced %d ocurrence(s)."), rc)); + error_label->set_text(vformat(TTR("Replaced %d occurrence(s)."), rc)); //hide(); } else { diff --git a/editor/collada/collada.cpp b/editor/collada/collada.cpp index d96f1f4b6ea..4705810ecaa 100644 --- a/editor/collada/collada.cpp +++ b/editor/collada/collada.cpp @@ -1697,7 +1697,7 @@ Collada::Node *Collada::_parse_visual_scene_node(XMLParser &parser) { } else if (section != "node") { //usually what defines the type of node - //print_line(" dont know what to do with "+section); + //print_line(" don't know what to do with "+section); if (section.begins_with("instance_")) { if (!node) { @@ -2444,7 +2444,7 @@ bool Collada::_move_geometry_to_skeletons(VisualScene *p_vscene, Node *p_node, L //p_node->default_transform=Transform(); //this seems to be correct, because bind shape makes the object local to the skeleton p_node->ignore_anim = true; // collada may animate this later, if it does, then this is not supported (redo your original asset and don't animate the base mesh) p_node->parent = sk; - //sk->children.push_back(0,p_node); //avoid INFINIT loop + //sk->children.push_back(0,p_node); //avoid INFINITE loop p_mgeom->push_back(p_node); return true; } diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 03f77dbe94c..49990c43405 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -121,7 +121,7 @@ void ConnectDialog::_tree_node_selected() { continue; // hidden method, not show! if (ClassDB::has_method(node->get_type(),"Node") || ClassDB::has_method(node->get_type(),"Control",true)) - continue; //avoid too much unnecesary stuff + continue; //avoid too much unnecessary stuff String method=E->get().name+"("; for(int i=0;iget().arguments.size();i++) { diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 442ef1fbd39..0e2ec92fde0 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -29,12 +29,12 @@ #include "create_dialog.h" #include "class_db.h" -#include "editor_node.h" -#include "print_string.h" -#include "scene/gui/box_container.h" #include "editor_help.h" +#include "editor_node.h" #include "editor_settings.h" #include "os/keyboard.h" +#include "print_string.h" +#include "scene/gui/box_container.h" void CreateDialog::popup_create(bool p_dontclear) { @@ -86,15 +86,13 @@ void CreateDialog::popup_create(bool p_dontclear) { _update_favorite_list(); - // Restore valid window bounds or pop up at default size. if (EditorSettings::get_singleton()->has("interface/dialogs/create_new_node_bounds")) { - popup(EditorSettings::get_singleton()->get("interface/dialogs/create_new_node_bounds")); + popup(EditorSettings::get_singleton()->get("interface/dialogs/create_new_node_bounds")); } else { popup_centered_ratio(); } - if (p_dontclear) search_box->select_all(); else { @@ -213,7 +211,7 @@ void CreateDialog::_update_search() { continue; // do not show editor nodes if (!ClassDB::can_instance(type)) - continue; // cant create what can't be instanced + continue; // can't create what can't be instanced if (search_box->get_text() == "") { add_type(type, types, root, &to_select); @@ -316,7 +314,7 @@ void CreateDialog::_confirmed() { void CreateDialog::_notification(int p_what) { - switch (p_what) { + switch (p_what) { case NOTIFICATION_ENTER_TREE: { connect("confirmed", this, "_confirmed"); favorite->set_icon(get_icon("Favorites", "EditorIcons")); diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 4f1b85f2363..c6a51cce3d9 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -210,7 +210,7 @@ void DocData::generate(bool p_basic_types) { for (List::Element *E = method_list.front(); E; E = E->next()) { if (E->get().name == "" || (E->get().name[0] == '_' && !(E->get().flags & METHOD_FLAG_VIRTUAL))) - continue; //hiden, dont count + continue; //hidden, don't count MethodDoc method; diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index d2976808fe0..f601cacf54f 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -1807,7 +1807,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func if (slices.size()!=10) { atlas_valid=false; - print_line("CANT SLICE IN 10"); + print_line("CAN'T SLICE IN 10"); break; } uint64_t mod_time = slices[0].to_int64(); @@ -1946,7 +1946,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func if (f) { //recreating deps.. String depline; - //depline=String(F->get())+"::"+itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); name unneccesary by top md5 + //depline=String(F->get())+"::"+itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); name unnecessary by top md5 depline=itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); depline+="::"+itos(region.pos.x)+"::"+itos(region.pos.y)+"::"+itos(region.size.x)+"::"+itos(region.size.y); depline+="::"+itos(margin.pos.x)+"::"+itos(margin.pos.y)+"::"+itos(margin.size.x)+"::"+itos(margin.size.y); diff --git a/editor/editor_file_dialog.h b/editor/editor_file_dialog.h index 6c1bf08a409..21b764e85ba 100644 --- a/editor/editor_file_dialog.h +++ b/editor/editor_file_dialog.h @@ -162,7 +162,7 @@ private: virtual void _post_popup(); void _save_to_recent(); - //callback funtion is callback(String p_path,Ref preview,Variant udata) preview null if could not load + //callback function is callback(String p_path,Ref preview,Variant udata) preview null if could not load void _thumbnail_result(const String &p_path, const Ref &p_preview, const Variant &p_udata); void _thumbnail_done(const String &p_path, const Ref &p_preview, const Variant &p_udata); diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 161326ebabe..3b2f187af5e 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -779,7 +779,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { class_desc->set_table_column_expand(1, 1); for (int i = 0; i < cd.properties.size(); i++) { - property_line[cd.properties[i].name] = class_desc->get_line_count() - 2; //gets overriden if description + property_line[cd.properties[i].name] = class_desc->get_line_count() - 2; //gets overridden if description class_desc->push_cell(); class_desc->push_align(RichTextLabel::ALIGN_RIGHT); @@ -874,7 +874,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { class_desc->push_cell(); - method_line[methods[i].name] = class_desc->get_line_count() - 2; //gets overriden if description + method_line[methods[i].name] = class_desc->get_line_count() - 2; //gets overridden if description class_desc->push_align(RichTextLabel::ALIGN_RIGHT); class_desc->push_font(doc_code_font); _add_type(methods[i].return_type); @@ -959,7 +959,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { for (int i = 0; i < cd.theme_properties.size(); i++) { - theme_property_line[cd.theme_properties[i].name] = class_desc->get_line_count() - 2; //gets overriden if description + theme_property_line[cd.theme_properties[i].name] = class_desc->get_line_count() - 2; //gets overridden if description class_desc->push_font(doc_code_font); _add_type(cd.theme_properties[i].type); class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/highlighting/text_color")); @@ -1002,7 +1002,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { for (int i = 0; i < cd.signals.size(); i++) { - signal_line[cd.signals[i].name] = class_desc->get_line_count() - 2; //gets overriden if description + signal_line[cd.signals[i].name] = class_desc->get_line_count() - 2; //gets overridden if description class_desc->push_font(doc_code_font); // monofont //_add_type("void"); //class_desc->add_text(" "); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 72f2318f12e..18c16af5af3 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2606,7 +2606,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text("I see.."); - accept->set_text("Can't import if edited scene was not saved."); //i dont think this code will ever run + accept->set_text("Can't import if edited scene was not saved."); //i don't think this code will ever run accept->popup_centered(Size2(300,70)); break; @@ -4846,7 +4846,7 @@ EditorNode::EditorNode() { ResourceLoader::set_timestamp_on_load(true); ResourceSaver::set_timestamp_on_save(true); - { //register importers at the begining, so dialogs are created with the right extensions + { //register importers at the beginning, so dialogs are created with the right extensions Ref import_texture; import_texture.instance(); ResourceFormatImporter::get_singleton()->add_importer(import_texture); diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 9eb6758cc24..281602021f1 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -41,7 +41,7 @@ bool EditorResourcePreviewGenerator::handles(const String &p_type) const { if (get_script_instance() && get_script_instance()->has_method("handles")) { return get_script_instance()->call("handles", p_type); } - ERR_EXPLAIN("EditorResourcePreviewGenerator::handles needs to be overriden"); + ERR_EXPLAIN("EditorResourcePreviewGenerator::handles needs to be overridden"); ERR_FAIL_V(false); } Ref EditorResourcePreviewGenerator::generate(const RES &p_from) { @@ -49,7 +49,7 @@ Ref EditorResourcePreviewGenerator::generate(const RES &p_from) { if (get_script_instance() && get_script_instance()->has_method("generate")) { return get_script_instance()->call("generate", p_from); } - ERR_EXPLAIN("EditorResourcePreviewGenerator::generate needs to be overriden"); + ERR_EXPLAIN("EditorResourcePreviewGenerator::generate needs to be overridden"); ERR_FAIL_V(Ref()); } diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index ad7f0946e50..ebb280a8cf7 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -113,7 +113,7 @@ protected: public: static EditorResourcePreview *get_singleton(); - //callback funtion is callback(String p_path,Ref preview,Variant udata) preview null if could not load + //callback function is callback(String p_path,Ref preview,Variant udata) preview null if could not load void queue_resource_preview(const String &p_res, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata); void queue_edited_resource_preview(const Ref &p_path, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata); diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index b4ce666e0c0..93614fb5116 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -774,7 +774,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref &p_mesh, c weights.resize(4); } - //make sure weights allways add up to 1 + //make sure weights always add up to 1 float total = 0; for (int i = 0; i < weights.size(); i++) total += weights[i].weight; @@ -818,7 +818,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref &p_mesh, c /* CREATE PRIMITIVE ARRAY */ /**************************/ - // The way collada uses indices is more optimal, and friendlier with 3D modelling sofware, + // The way collada uses indices is more optimal, and friendlier with 3D modelling software, // because it can index everything, not only vertices (similar to how the WII works). // This is, however, more incompatible with standard video cards, so arrays must be converted. // Must convert to GL/DX format. diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp index c28c7dd425a..751fd364142 100644 --- a/editor/import/resource_importer_wav.cpp +++ b/editor/import/resource_importer_wav.cpp @@ -176,7 +176,7 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s break; } - /* Dont need anything else, continue */ + /* Don't need anything else, continue */ format_found = true; } diff --git a/editor/io_plugins/editor_atlas.cpp b/editor/io_plugins/editor_atlas.cpp index 1aa480f4425..4be22c34c7f 100644 --- a/editor/io_plugins/editor_atlas.cpp +++ b/editor/io_plugins/editor_atlas.cpp @@ -49,7 +49,7 @@ void EditorAtlas::fit(const Vector &p_rects, Vector &r_result, //super simple, almost brute force scanline stacking fitter //it's pretty basic for now, but it tries to make sure that the aspect ratio of the - //resulting atlas is somehow square. This is necesary because video cards have limits + //resulting atlas is somehow square. This is necessary because video cards have limits //on texture size (usually 2048 or 4096), so the more square a texture, the more chances //it will work in every hardware. // for example, it will prioritize a 1024x1024 atlas (works everywhere) instead of a diff --git a/editor/io_plugins/editor_font_import_plugin.cpp b/editor/io_plugins/editor_font_import_plugin.cpp index bad3b36383d..2898d85de96 100644 --- a/editor/io_plugins/editor_font_import_plugin.cpp +++ b/editor/io_plugins/editor_font_import_plugin.cpp @@ -745,8 +745,8 @@ struct _EditorFontData { Vector bitmap; int width,height; - int ofs_x; //ofset to center, from ABOVE - int ofs_y; //ofset to begining, from LEFT + int ofs_x; //offset to center, from ABOVE + int ofs_y; //offset to beginning, from LEFT int valign; //vertical alignment int halign; float advance; diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index c295a6679e5..11dfb7b9100 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -470,7 +470,7 @@ bool ShaderEditorPlugin::handles(Object *p_object) const { bool handles = true; Shader *shader = p_object->cast_to(); /* - if (!shader || shader->cast_to()) // Dont handle ShaderGraph's + if (!shader || shader->cast_to()) // Don't handle ShaderGraph's handles = false; */ diff --git a/editor/plugins/shader_graph_editor_plugin.cpp b/editor/plugins/shader_graph_editor_plugin.cpp index d55c133dc95..bff7dece204 100644 --- a/editor/plugins/shader_graph_editor_plugin.cpp +++ b/editor/plugins/shader_graph_editor_plugin.cpp @@ -2425,7 +2425,7 @@ void ShaderGraphView::_create_node(int p_id) { colors.push_back("ShadowColor"); colors.push_back("Diffuse"); colors.push_back("Specular"); - colors.push_back("Emmision"); + colors.push_back("Emission"); Array reals; reals.push_back("Alpha"); reals.push_back("DiffuseAlpha"); diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 5e992d3ec1a..c0b410ba995 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -710,7 +710,7 @@ void TextureRegionEditor::_edit_region() { autoslice_cache.erase(F->next()); } else { queue_erase = true; - //Cant delete the first rect in the list. + //Can't delete the first rect in the list. } merged = true; } diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index f9baa7ea3c3..1c6c195719a 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1570,7 +1570,7 @@ void SceneTreeDock::_normalize_drop(Node *&to_node, int &to_pos, int p_type) { //drop at below selected node if (to_node == EditorNode::get_singleton()->get_edited_scene()) { //if at lower sibling of root node - to_pos = 0; //just insert at begining of root node + to_pos = 0; //just insert at beginning of root node return; } diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp index c291afaf321..a2dd950af64 100644 --- a/main/tests/test_gui.cpp +++ b/main/tests/test_gui.cpp @@ -299,7 +299,7 @@ public: richtext->push_color(Color(0, 1.0, 0.5)); richtext->add_text("faeries.\n"); richtext->pop(); - richtext->add_text("In this new episode, we will attemp to "); + richtext->add_text("In this new episode, we will attempt to "); richtext->push_font(richtext->get_font("mono_font", "Fonts")); richtext->push_color(Color(0.7, 0.5, 1.0)); richtext->add_text("deliver something nice"); diff --git a/methods.py b/methods.py index a86fa1937d4..03216fb58be 100644 --- a/methods.py +++ b/methods.py @@ -1573,9 +1573,9 @@ def no_verbose(sys, env): def detect_visual_c_compiler_version(tools_env): # tools_env is the variable scons uses to call tools that execute tasks, SCons's env['ENV'] that executes tasks... # (see the SCons documentation for more information on what it does)... - # in order for this function to be well encapsulated i choose to force it to recieve SCons's TOOLS env (env['ENV'] + # in order for this function to be well encapsulated i choose to force it to receive SCons's TOOLS env (env['ENV'] # and not scons setup environment (env)... so make sure you call the right environment on it or it will fail to detect - # the propper vc version that will be called + # the proper vc version that will be called # These is no flag to give to visual c compilers to set the architecture, ie scons bits argument (32,64,ARM etc) # There are many different cl.exe files that are run, and each one compiles & links to a different architecture diff --git a/modules/cscript/godot_c.h b/modules/cscript/godot_c.h index e38de1e4891..58acbf8bf9b 100644 --- a/modules/cscript/godot_c.h +++ b/modules/cscript/godot_c.h @@ -491,7 +491,7 @@ godot_variant GDAPI godot_instance_get(godot_instance p_instance, char *p_prop); #define GODOT_PROPERTY_HINT_RANGE 1 ///< hint_text = "min,max,step,slider; //slider is optional" #define GODOT_PROPERTY_HINT_EXP_RANGE 2 ///< hint_text = "min,max,step", exponential edit #define GODOT_PROPERTY_HINT_ENUM 3 ///< hint_text= "val1,val2,val3,etc" -#define GODOT_PROPERTY_HINT_EXP_EASING 4 /// exponential easing funciton (Math::ease) +#define GODOT_PROPERTY_HINT_EXP_EASING 4 /// exponential easing function (Math::ease) #define GODOT_PROPERTY_HINT_LENGTH 5 ///< hint_text= "length" (as integer) #define GODOT_PROPERTY_HINT_SPRITE_FRAME 6 #define GODOT_PROPERTY_HINT_KEY_ACCEL 7 ///< hint_text= "length" (as integer) diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp index 9c976179fad..ac981d2b1a8 100644 --- a/modules/dds/texture_loader_dds.cpp +++ b/modules/dds/texture_loader_dds.cpp @@ -253,13 +253,13 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path, uint32_t size = pitch * height; ERR_FAIL_COND_V(size != width * height * info.block_size, RES()); - uint8_t pallete[256 * 4]; - f->get_buffer(pallete, 256 * 4); + uint8_t palette[256 * 4]; + f->get_buffer(palette, 256 * 4); int colsize = 3; for (int i = 0; i < 256; i++) { - if (pallete[i * 4 + 3] < 255) + if (palette[i * 4 + 3] < 255) colsize = 4; } @@ -281,11 +281,11 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path, int dst_ofs = size + i * colsize; int src_ofs = i * 4; - wb[dst_ofs + 0] = pallete[src_ofs + 2]; - wb[dst_ofs + 1] = pallete[src_ofs + 1]; - wb[dst_ofs + 2] = pallete[src_ofs + 0]; + wb[dst_ofs + 0] = palette[src_ofs + 2]; + wb[dst_ofs + 1] = palette[src_ofs + 1]; + wb[dst_ofs + 2] = palette[src_ofs + 0]; if (colsize == 4) - wb[dst_ofs + 3] = pallete[src_ofs + 3]; + wb[dst_ofs + 3] = palette[src_ofs + 3]; } wb = PoolVector::Write(); diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp index 3f8c7106740..245f44887c0 100644 --- a/modules/gdscript/gd_compiler.cpp +++ b/modules/gdscript/gd_compiler.cpp @@ -1539,7 +1539,7 @@ Error GDCompiler::_parse_function(GDScript *p_script, const GDParser::ClassNode signature += "::0"; } - //funciton and class + //function and class if (p_class->name) { signature += "::" + String(p_class->name) + "." + String(func_name); @@ -1660,7 +1660,7 @@ Error GDCompiler::_parse_class(GDScript *p_script, GDScript *p_owner, const GDPa String sub = p_class->extends_class[i]; if (script->subclasses.has(sub)) { - Ref