Skip to content

Commit 88e81ee

Browse files
committed
Fix various typos and code style issues
1 parent 0eadbdb commit 88e81ee

23 files changed

+116
-114
lines changed

core/extension/gdextension_interface.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ typedef void (*GDExtensionInterfaceMemFree)(void *p_ptr);
842842
*
843843
* Logs an error to Godot's built-in debugger and to the OS terminal.
844844
*
845-
* @param p_description The code trigging the error.
845+
* @param p_description The code triggering the error.
846846
* @param p_function The function name where the error occurred.
847847
* @param p_file The file where the error occurred.
848848
* @param p_line The line where the error occurred.
@@ -856,7 +856,7 @@ typedef void (*GDExtensionInterfacePrintError)(const char *p_description, const
856856
*
857857
* Logs an error with a message to Godot's built-in debugger and to the OS terminal.
858858
*
859-
* @param p_description The code trigging the error.
859+
* @param p_description The code triggering the error.
860860
* @param p_message The message to show along with the error.
861861
* @param p_function The function name where the error occurred.
862862
* @param p_file The file where the error occurred.
@@ -871,7 +871,7 @@ typedef void (*GDExtensionInterfacePrintErrorWithMessage)(const char *p_descript
871871
*
872872
* Logs a warning to Godot's built-in debugger and to the OS terminal.
873873
*
874-
* @param p_description The code trigging the warning.
874+
* @param p_description The code triggering the warning.
875875
* @param p_function The function name where the warning occurred.
876876
* @param p_file The file where the warning occurred.
877877
* @param p_line The line where the warning occurred.
@@ -885,7 +885,7 @@ typedef void (*GDExtensionInterfacePrintWarning)(const char *p_description, cons
885885
*
886886
* Logs a warning with a message to Godot's built-in debugger and to the OS terminal.
887887
*
888-
* @param p_description The code trigging the warning.
888+
* @param p_description The code triggering the warning.
889889
* @param p_message The message to show along with the warning.
890890
* @param p_function The function name where the warning occurred.
891891
* @param p_file The file where the warning occurred.
@@ -900,7 +900,7 @@ typedef void (*GDExtensionInterfacePrintWarningWithMessage)(const char *p_descri
900900
*
901901
* Logs a script error to Godot's built-in debugger and to the OS terminal.
902902
*
903-
* @param p_description The code trigging the error.
903+
* @param p_description The code triggering the error.
904904
* @param p_function The function name where the error occurred.
905905
* @param p_file The file where the error occurred.
906906
* @param p_line The line where the error occurred.
@@ -914,7 +914,7 @@ typedef void (*GDExtensionInterfacePrintScriptError)(const char *p_description,
914914
*
915915
* Logs a script error with a message to Godot's built-in debugger and to the OS terminal.
916916
*
917-
* @param p_description The code trigging the error.
917+
* @param p_description The code triggering the error.
918918
* @param p_message The message to show along with the error.
919919
* @param p_function The function name where the error occurred.
920920
* @param p_file The file where the error occurred.

core/object/script_language.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ void ScriptLanguage::frame() {
568568
}
569569

570570
TypedArray<int> ScriptLanguage::CodeCompletionOption::get_option_characteristics(const String &p_base) {
571-
// Return characacteristics of the match found by order of importance.
571+
// Return characteristics of the match found by order of importance.
572572
// Matches will be ranked by a lexicographical order on the vector returned by this function.
573573
// The lower values indicate better matches and that they should go before in the order of appearance.
574574
if (last_matches == matches) {

core/string/translation_server.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ void TranslationServer::setup() {
483483
main_domain->set_pseudolocalization_skip_placeholders_enabled(GLOBAL_DEF("internationalization/pseudolocalization/skip_placeholders", true));
484484

485485
#ifdef TOOLS_ENABLED
486+
ProjectSettings::get_singleton()->set_custom_property_info(PropertyInfo(Variant::STRING, "internationalization/locale/test", PROPERTY_HINT_LOCALE_ID, ""));
486487
ProjectSettings::get_singleton()->set_custom_property_info(PropertyInfo(Variant::STRING, "internationalization/locale/fallback", PROPERTY_HINT_LOCALE_ID, ""));
487488
#endif
488489
}

doc/classes/BaseMaterial3D.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
The strength of the anisotropy effect. This is multiplied by [member anisotropy_flowmap]'s alpha channel if a texture is defined there and the texture contains an alpha channel.
8989
</member>
9090
<member name="anisotropy_enabled" type="bool" setter="set_feature" getter="get_feature" default="false">
91-
If [code]true[/code], anisotropy is enabled. Anisotropy changes the shape of the specular blob and aligns it to tangent space. This is useful for brushed aluminium and hair reflections.
91+
If [code]true[/code], anisotropy is enabled. Anisotropy changes the shape of the specular blob and aligns it to tangent space. This is useful for brushed aluminum and hair reflections.
9292
[b]Note:[/b] Mesh tangents are needed for anisotropy to work. If the mesh does not contain tangents, the anisotropy effect will appear broken.
9393
[b]Note:[/b] Material anisotropy should not to be confused with anisotropic texture filtering, which can be enabled by setting [member texture_filter] to [constant TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC].
9494
</member>

doc/classes/Node.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,7 @@
13161316
Duplicate the node's script (also overriding the duplicated children's scripts, if combined with [constant DUPLICATE_USE_INSTANTIATION]).
13171317
</constant>
13181318
<constant name="DUPLICATE_USE_INSTANTIATION" value="8" enum="DuplicateFlags">
1319-
Duplicate using [method PackedScene.instantiate]. If the node comes from a scene saved on disk, re-uses [method PackedScene.instantiate] as the base for the duplicated node and its children.
1319+
Duplicate using [method PackedScene.instantiate]. If the node comes from a scene saved on disk, reuses [method PackedScene.instantiate] as the base for the duplicated node and its children.
13201320
</constant>
13211321
<constant name="INTERNAL_MODE_DISABLED" value="0" enum="InternalMode">
13221322
The node will not be internal.

doc/classes/String.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<description>
77
This is the built-in string Variant type (and the one used by GDScript). Strings may contain any number of Unicode characters, and expose methods useful for manipulating and generating strings. Strings are reference-counted and use a copy-on-write approach (every modification to a string returns a new [String]), so passing them around is cheap in resources.
88
Some string methods have corresponding variations. Variations suffixed with [code]n[/code] ([method countn], [method findn], [method replacen], etc.) are [b]case-insensitive[/b] (they make no distinction between uppercase and lowercase letters). Method variations prefixed with [code]r[/code] ([method rfind], [method rsplit], etc.) are reversed, and start from the end of the string, instead of the beginning.
9-
To convert any Variant to or from a string, see [method @GlobalScope.str], [method @GlobalScope.str_to_var], and [method @GlobalScope.var_to_str].
9+
To convert any [Variant] to or from a string, see [method @GlobalScope.str], [method @GlobalScope.str_to_var], and [method @GlobalScope.var_to_str].
1010
[b]Note:[/b] In a boolean context, a string will evaluate to [code]false[/code] if it is empty ([code]""[/code]). Otherwise, a string will always evaluate to [code]true[/code].
1111
</description>
1212
<tutorials>

doc/classes/Tween.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
[/codeblocks]
9090
Some [Tweener]s use transitions and eases. The first accepts a [enum TransitionType] constant, and refers to the way the timing of the animation is handled (see [url=https://easings.net/]easings.net[/url] for some examples). The second accepts an [enum EaseType] constant, and controls where the [code]trans_type[/code] is applied to the interpolation (in the beginning, the end, or both). If you don't know which transition and easing to pick, you can try different [enum TransitionType] constants with [constant EASE_IN_OUT], and use the one that looks best.
9191
[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/tween_cheatsheet.webp]Tween easing and transition types cheatsheet[/url]
92-
[b]Note:[/b] Tweens are not designed to be re-used and trying to do so results in an undefined behavior. Create a new Tween for each animation and every time you replay an animation from start. Keep in mind that Tweens start immediately, so only create a Tween when you want to start animating.
92+
[b]Note:[/b] Tweens are not designed to be reused and trying to do so results in an undefined behavior. Create a new Tween for each animation and every time you replay an animation from start. Keep in mind that Tweens start immediately, so only create a Tween when you want to start animating.
9393
[b]Note:[/b] The tween is processed after all of the nodes in the current frame, i.e. node's [method Node._process] method would be called before the tween (or [method Node._physics_process] depending on the value passed to [method set_process_mode]).
9494
</description>
9595
<tutorials>

doc/classes/Window.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,13 +805,15 @@
805805
<constant name="MODE_FULLSCREEN" value="3" enum="Mode">
806806
Full screen mode with full multi-window support.
807807
Full screen window covers the entire display area of a screen and has no decorations. The display's video mode is not changed.
808+
[b]On Android:[/b] This enables immersive mode.
808809
[b]On Windows:[/b] Multi-window full-screen mode has a 1px border of the [member ProjectSettings.rendering/environment/defaults/default_clear_color] color.
809810
[b]On macOS:[/b] A new desktop is used to display the running project.
810811
[b]Note:[/b] Regardless of the platform, enabling full screen will change the window size to match the monitor's size. Therefore, make sure your project supports [url=$DOCS_URL/tutorials/rendering/multiple_resolutions.html]multiple resolutions[/url] when enabling full screen mode.
811812
</constant>
812813
<constant name="MODE_EXCLUSIVE_FULLSCREEN" value="4" enum="Mode">
813814
A single window full screen mode. This mode has less overhead, but only one window can be open on a given screen at a time (opening a child window or application switching will trigger a full screen transition).
814815
Full screen window covers the entire display area of a screen and has no border or decorations. The display's video mode is not changed.
816+
[b]On Android:[/b] This enables immersive mode.
815817
[b]On Windows:[/b] Depending on video driver, full screen transition might cause screens to go black for a moment.
816818
[b]On macOS:[/b] A new desktop is used to display the running project. Exclusive full screen mode prevents Dock and Menu from showing up when the mouse pointer is hovering the edge of the screen.
817819
[b]On Linux (X11):[/b] Exclusive full screen mode bypasses compositor.

editor/animation_track_editor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,12 +1298,12 @@ void AnimationTimelineEdit::_zoom_changed(double) {
12981298
double timeline_right = timeline_left + timeline_width_seconds;
12991299
double timeline_center = timeline_left + timeline_width_seconds / 2.0;
13001300

1301-
if (zoom_callback_occured) { // Zooming with scroll wheel will focus on the position of the mouse.
1301+
if (zoom_callback_occurred) { // Zooming with scroll wheel will focus on the position of the mouse.
13021302
double zoom_scroll_origin_norm = (zoom_scroll_origin.x - get_name_limit()) / timeline_width_pixels;
13031303
zoom_scroll_origin_norm = MAX(zoom_scroll_origin_norm, 0);
13041304
zoom_pivot = timeline_left + timeline_width_seconds * zoom_scroll_origin_norm;
13051305
zoom_pivot_delta = updated_timeline_width_seconds * zoom_scroll_origin_norm;
1306-
zoom_callback_occured = false;
1306+
zoom_callback_occurred = false;
13071307
} else { // Zooming with slider will depend on the current play position.
13081308
// If the play position is not in range, or exactly in the center, zoom in on the center.
13091309
if (get_play_position() < timeline_left || get_play_position() > timeline_left + timeline_width_seconds || get_play_position() == timeline_center) {
@@ -1952,7 +1952,7 @@ void AnimationTimelineEdit::_pan_callback(Vector2 p_scroll_vec, Ref<InputEvent>
19521952
void AnimationTimelineEdit::_zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputEvent> p_event) {
19531953
double current_zoom_value = get_zoom()->get_value();
19541954
zoom_scroll_origin = p_origin;
1955-
zoom_callback_occured = true;
1955+
zoom_callback_occurred = true;
19561956
get_zoom()->set_value(MAX(0.01, current_zoom_value - (1.0 - p_zoom_factor)));
19571957
}
19581958

editor/animation_track_editor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class AnimationTimelineEdit : public Range {
232232
double hscroll_on_zoom_buffer = -1.0;
233233

234234
Vector2 zoom_scroll_origin;
235-
bool zoom_callback_occured = false;
235+
bool zoom_callback_occurred = false;
236236

237237
virtual void gui_input(const Ref<InputEvent> &p_event) override;
238238
void _track_added(int p_track);

0 commit comments

Comments
 (0)