浏览代码

Merge pull request #78316 from akien-mga/codespell

Fix various typos with codespell
Rémi Verschelde 2 年之前
父节点
当前提交
9c41c4ecb6

+ 2 - 2
.github/workflows/static_checks.yml

@@ -103,8 +103,8 @@ jobs:
 
 
       - name: Spell checks via codespell
       - name: Spell checks via codespell
         if: github.event_name == 'pull_request' && env.CHANGED_FILES != ''
         if: github.event_name == 'pull_request' && env.CHANGED_FILES != ''
-        uses: codespell-project/actions-codespell@v1
+        uses: codespell-project/actions-codespell@v2
         with:
         with:
           skip: "./bin,./thirdparty,*.desktop,*.gen.*,*.po,*.pot,*.rc,./AUTHORS.md,./COPYRIGHT.txt,./DONORS.md,./core/input/gamecontrollerdb.txt,./core/string/locales.h,./editor/project_converter_3_to_4.cpp,./misc/scripts/codespell.sh,./platform/android/java/lib/src/com,./platform/web/node_modules,./platform/web/package-lock.json"
           skip: "./bin,./thirdparty,*.desktop,*.gen.*,*.po,*.pot,*.rc,./AUTHORS.md,./COPYRIGHT.txt,./DONORS.md,./core/input/gamecontrollerdb.txt,./core/string/locales.h,./editor/project_converter_3_to_4.cpp,./misc/scripts/codespell.sh,./platform/android/java/lib/src/com,./platform/web/node_modules,./platform/web/package-lock.json"
-          ignore_words_list: "curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,nd,numer,ot,te,vai"
+          ignore_words_list: "curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,mis,nd,numer,ot,requestor,te,vai"
           path: ${{ env.CHANGED_FILES }}
           path: ${{ env.CHANGED_FILES }}

+ 1 - 1
core/input/input.cpp

@@ -1544,7 +1544,7 @@ Input::Input() {
 
 
 	legacy_just_pressed_behavior = GLOBAL_DEF("input_devices/compatibility/legacy_just_pressed_behavior", false);
 	legacy_just_pressed_behavior = GLOBAL_DEF("input_devices/compatibility/legacy_just_pressed_behavior", false);
 	if (Engine::get_singleton()->is_editor_hint()) {
 	if (Engine::get_singleton()->is_editor_hint()) {
-		// Always use standard behaviour in the editor.
+		// Always use standard behavior in the editor.
 		legacy_just_pressed_behavior = false;
 		legacy_just_pressed_behavior = false;
 	}
 	}
 }
 }

+ 1 - 1
doc/classes/NavigationServer2D.xml

@@ -156,7 +156,7 @@
 			<param index="0" name="agent" type="RID" />
 			<param index="0" name="agent" type="RID" />
 			<param index="1" name="velocity" type="Vector2" />
 			<param index="1" name="velocity" type="Vector2" />
 			<description>
 			<description>
-				Sets [param velocity] as the new wanted velocity for the specified [param agent]. The avoidance simulation will try to fulfil this velocity if possible but will modify it to avoid collision with other agent's and obstacles. When an agent is teleported to a new position far away use [method agent_set_velocity_forced] instead to reset the internal velocity state.
+				Sets [param velocity] as the new wanted velocity for the specified [param agent]. The avoidance simulation will try to fulfill this velocity if possible but will modify it to avoid collision with other agent's and obstacles. When an agent is teleported to a new position far away use [method agent_set_velocity_forced] instead to reset the internal velocity state.
 			</description>
 			</description>
 		</method>
 		</method>
 		<method name="agent_set_velocity_forced">
 		<method name="agent_set_velocity_forced">

+ 1 - 1
doc/classes/NavigationServer3D.xml

@@ -181,7 +181,7 @@
 			<param index="0" name="agent" type="RID" />
 			<param index="0" name="agent" type="RID" />
 			<param index="1" name="velocity" type="Vector3" />
 			<param index="1" name="velocity" type="Vector3" />
 			<description>
 			<description>
-				Sets [param velocity] as the new wanted velocity for the specified [param agent]. The avoidance simulation will try to fulfil this velocity if possible but will modify it to avoid collision with other agent's and obstacles. When an agent is teleported to a new position use [method agent_set_velocity_forced] as well to reset the internal simulation velocity.
+				Sets [param velocity] as the new wanted velocity for the specified [param agent]. The avoidance simulation will try to fulfill this velocity if possible but will modify it to avoid collision with other agent's and obstacles. When an agent is teleported to a new position use [method agent_set_velocity_forced] as well to reset the internal simulation velocity.
 			</description>
 			</description>
 		</method>
 		</method>
 		<method name="agent_set_velocity_forced">
 		<method name="agent_set_velocity_forced">

+ 5 - 5
main/main.cpp

@@ -1011,19 +1011,19 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		} else if (I->get() == "--delta-smoothing") {
 		} else if (I->get() == "--delta-smoothing") {
 			if (I->next()) {
 			if (I->next()) {
 				String string = I->next()->get();
 				String string = I->next()->get();
-				bool recognised = false;
+				bool recognized = false;
 				if (string == "enable") {
 				if (string == "enable") {
 					OS::get_singleton()->set_delta_smoothing(true);
 					OS::get_singleton()->set_delta_smoothing(true);
 					delta_smoothing_override = true;
 					delta_smoothing_override = true;
-					recognised = true;
+					recognized = true;
 				}
 				}
 				if (string == "disable") {
 				if (string == "disable") {
 					OS::get_singleton()->set_delta_smoothing(false);
 					OS::get_singleton()->set_delta_smoothing(false);
 					delta_smoothing_override = false;
 					delta_smoothing_override = false;
-					recognised = true;
+					recognized = true;
 				}
 				}
-				if (!recognised) {
-					OS::get_singleton()->print("Delta-smoothing argument not recognised, aborting.\n");
+				if (!recognized) {
+					OS::get_singleton()->print("Delta-smoothing argument not recognized, aborting.\n");
 					goto error;
 					goto error;
 				}
 				}
 				N = I->next()->next();
 				N = I->next()->next();

+ 1 - 1
misc/scripts/codespell.sh

@@ -3,6 +3,6 @@ SKIP_LIST="./.*,./**/.*,./bin,./thirdparty,*.desktop,*.gen.*,*.po,*.pot,*.rc,./A
 SKIP_LIST+="./core/input/gamecontrollerdb.txt,./core/string/locales.h,./editor/renames_map_3_to_4.cpp,./misc/scripts/codespell.sh,"
 SKIP_LIST+="./core/input/gamecontrollerdb.txt,./core/string/locales.h,./editor/renames_map_3_to_4.cpp,./misc/scripts/codespell.sh,"
 SKIP_LIST+="./platform/android/java/lib/src/com,./platform/web/node_modules,./platform/web/package-lock.json,"
 SKIP_LIST+="./platform/android/java/lib/src/com,./platform/web/node_modules,./platform/web/package-lock.json,"
 
 
-IGNORE_LIST="curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,nd,numer,ot,te,vai"
+IGNORE_LIST="curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,mis,nd,numer,ot,requestor,te,vai"
 
 
 codespell -w -q 3 -S "${SKIP_LIST}" -L "${IGNORE_LIST}" --builtin "clear,rare,en-GB_to_en-US"
 codespell -w -q 3 -S "${SKIP_LIST}" -L "${IGNORE_LIST}" --builtin "clear,rare,en-GB_to_en-US"

+ 1 - 1
scene/2d/navigation_agent_2d.h

@@ -75,7 +75,7 @@ class NavigationAgent2D : public Node {
 	Vector2 safe_velocity;
 	Vector2 safe_velocity;
 
 
 	/// The submitted target velocity, sets the "wanted" rvo agent velocity on the next update
 	/// The submitted target velocity, sets the "wanted" rvo agent velocity on the next update
-	// this velocity is not guaranteed, the simulation will try to fulfil it if possible
+	// this velocity is not guaranteed, the simulation will try to fulfill it if possible
 	// if other agents or obstacles interfere it will be changed accordingly
 	// if other agents or obstacles interfere it will be changed accordingly
 	Vector2 velocity;
 	Vector2 velocity;
 	bool velocity_submitted = false;
 	bool velocity_submitted = false;

+ 1 - 1
scene/3d/navigation_agent_3d.h

@@ -78,7 +78,7 @@ class NavigationAgent3D : public Node {
 	Vector3 safe_velocity;
 	Vector3 safe_velocity;
 
 
 	/// The submitted target velocity, sets the "wanted" rvo agent velocity on the next update
 	/// The submitted target velocity, sets the "wanted" rvo agent velocity on the next update
-	// this velocity is not guaranteed, the simulation will try to fulfil it if possible
+	// this velocity is not guaranteed, the simulation will try to fulfill it if possible
 	// if other agents or obstacles interfere it will be changed accordingly
 	// if other agents or obstacles interfere it will be changed accordingly
 	Vector3 velocity;
 	Vector3 velocity;
 	bool velocity_submitted = false;
 	bool velocity_submitted = false;

+ 1 - 1
servers/navigation_server_2d.h

@@ -222,7 +222,7 @@ public:
 	virtual void agent_set_velocity_forced(RID p_agent, Vector2 p_velocity);
 	virtual void agent_set_velocity_forced(RID p_agent, Vector2 p_velocity);
 
 
 	/// The wanted velocity for the agent as a "suggestion" to the avoidance simulation.
 	/// The wanted velocity for the agent as a "suggestion" to the avoidance simulation.
-	/// The simulation will try to fulfil this velocity wish if possible but may change the velocity depending on other agent's and obstacles'.
+	/// The simulation will try to fulfill this velocity wish if possible but may change the velocity depending on other agent's and obstacles'.
 	virtual void agent_set_velocity(RID p_agent, Vector2 p_velocity);
 	virtual void agent_set_velocity(RID p_agent, Vector2 p_velocity);
 
 
 	/// Position of the agent in world space.
 	/// Position of the agent in world space.

+ 1 - 1
servers/navigation_server_3d.h

@@ -244,7 +244,7 @@ public:
 	virtual void agent_set_velocity_forced(RID p_agent, Vector3 p_velocity) = 0;
 	virtual void agent_set_velocity_forced(RID p_agent, Vector3 p_velocity) = 0;
 
 
 	/// The wanted velocity for the agent as a "suggestion" to the avoidance simulation.
 	/// The wanted velocity for the agent as a "suggestion" to the avoidance simulation.
-	/// The simulation will try to fulfil this velocity wish if possible but may change the velocity depending on other agent's and obstacles'.
+	/// The simulation will try to fulfill this velocity wish if possible but may change the velocity depending on other agent's and obstacles'.
 	virtual void agent_set_velocity(RID p_agent, Vector3 p_velocity) = 0;
 	virtual void agent_set_velocity(RID p_agent, Vector3 p_velocity) = 0;
 
 
 	/// Position of the agent in world space.
 	/// Position of the agent in world space.

+ 3 - 3
tests/scene/test_code_edit.h

@@ -3496,7 +3496,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
 		code_edit->confirm_code_completion();
 		code_edit->confirm_code_completion();
 		CHECK(code_edit->get_line(0) == "test");
 		CHECK(code_edit->get_line(0) == "test");
 
 
-		/* Favorize good capitalisation. */
+		/* Favorize good capitalization. */
 		code_edit->clear();
 		code_edit->clear();
 		code_edit->insert_text_at_caret("te");
 		code_edit->insert_text_at_caret("te");
 		code_edit->set_caret_column(2);
 		code_edit->set_caret_column(2);
@@ -3506,7 +3506,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
 		code_edit->confirm_code_completion();
 		code_edit->confirm_code_completion();
 		CHECK(code_edit->get_line(0) == "test");
 		CHECK(code_edit->get_line(0) == "test");
 
 
-		/* Favorize location to good capitalisation. */
+		/* Favorize location to good capitalization. */
 		code_edit->clear();
 		code_edit->clear();
 		code_edit->insert_text_at_caret("te");
 		code_edit->insert_text_at_caret("te");
 		code_edit->set_caret_column(2);
 		code_edit->set_caret_column(2);
@@ -3526,7 +3526,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
 		code_edit->confirm_code_completion();
 		code_edit->confirm_code_completion();
 		CHECK(code_edit->get_line(0) == "stest");
 		CHECK(code_edit->get_line(0) == "stest");
 
 
-		/* Favorize good capitalisation to closest to start. */
+		/* Favorize good capitalization to closest to start. */
 		code_edit->clear();
 		code_edit->clear();
 		code_edit->insert_text_at_caret("te");
 		code_edit->insert_text_at_caret("te");
 		code_edit->set_caret_column(2);
 		code_edit->set_caret_column(2);