mirror of
https://github.com/godotengine/godot.git
synced 2024-11-22 20:23:53 +00:00
Merge pull request #23266 from CakHuri/mistyped-of-its
Repaired mistyped of 'its' on several files.
This commit is contained in:
commit
7e2d391c09
@ -123,7 +123,7 @@
|
||||
<argument index="0" name="button_index" type="int">
|
||||
</argument>
|
||||
<description>
|
||||
Receives a [code]JOY_BUTTON_*[/code] Enum and returns it's equivalent name as a string.
|
||||
Receives a [code]JOY_BUTTON_*[/code] Enum and returns its equivalent name as a string.
|
||||
</description>
|
||||
</method>
|
||||
<method name="get_joy_guid" qualifiers="const">
|
||||
|
@ -1260,7 +1260,7 @@
|
||||
The higher, the stronger.
|
||||
</constant>
|
||||
<constant name="PIN_JOINT_IMPULSE_CLAMP" value="2" enum="PinJointParam">
|
||||
If above 0, this value is the maximum value for an impulse that this Joint puts on it's ends.
|
||||
If above 0, this value is the maximum value for an impulse that this Joint puts on its ends.
|
||||
</constant>
|
||||
<constant name="HINGE_JOINT_BIAS" value="0" enum="HingeJointParam">
|
||||
The speed with which the two bodies get pulled together when they move in different directions.
|
||||
|
@ -182,7 +182,7 @@
|
||||
Name of the project. It is used from both project manager and by the exporters. Overriding this as name.locale allows setting it in multiple languages.
|
||||
</member>
|
||||
<member name="application/config/use_custom_user_dir" type="bool" setter="" getter="">
|
||||
Allow the project to save to it's own custom user dir (in AppData on windows or ~/.config on unixes). This setting only works for desktop exporters. A name must be set in the "custom_user_dir_name" setting for this to take effect.
|
||||
Allow the project to save to its own custom user dir (in AppData on windows or ~/.config on unixes). This setting only works for desktop exporters. A name must be set in the "custom_user_dir_name" setting for this to take effect.
|
||||
</member>
|
||||
<member name="application/run/disable_stderr" type="bool" setter="" getter="">
|
||||
Disable printing to stderr on exported build.
|
||||
|
@ -490,7 +490,7 @@ void ScriptEditor::_open_recent_script(int p_idx) {
|
||||
edit(text_file, true);
|
||||
return;
|
||||
}
|
||||
// if it's a path then its most likely a deleted file not help
|
||||
// if it's a path then it's most likely a deleted file not help
|
||||
} else if (path.find("::") != -1) {
|
||||
// built-in script
|
||||
Ref<Script> script = ResourceLoader::load(path);
|
||||
|
@ -586,7 +586,7 @@ Error OS_Android::shell_open(String p_uri) {
|
||||
|
||||
String OS_Android::get_resource_dir() const {
|
||||
|
||||
return "/"; //android has it's own filesystem for resources inside the APK
|
||||
return "/"; //android has its own filesystem for resources inside the APK
|
||||
}
|
||||
|
||||
String OS_Android::get_locale() const {
|
||||
|
@ -2095,7 +2095,7 @@ void OS_X11::process_xevents() {
|
||||
last_timestamp = event.xkey.time;
|
||||
|
||||
// key event is a little complex, so
|
||||
// it will be handled in it's own function.
|
||||
// it will be handled in its own function.
|
||||
handle_key_event((XKeyEvent *)&event);
|
||||
} break;
|
||||
case SelectionRequest: {
|
||||
|
@ -38,14 +38,14 @@
|
||||
void ARVRCamera::_notification(int p_what) {
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_ENTER_TREE: {
|
||||
// need to find our ARVROrigin parent and let it know we're it's camera!
|
||||
// need to find our ARVROrigin parent and let it know we're its camera!
|
||||
ARVROrigin *origin = Object::cast_to<ARVROrigin>(get_parent());
|
||||
if (origin != NULL) {
|
||||
origin->set_tracked_camera(this);
|
||||
}
|
||||
}; break;
|
||||
case NOTIFICATION_EXIT_TREE: {
|
||||
// need to find our ARVROrigin parent and let it know we're no longer it's camera!
|
||||
// need to find our ARVROrigin parent and let it know we're no longer its camera!
|
||||
ARVROrigin *origin = Object::cast_to<ARVROrigin>(get_parent());
|
||||
if (origin != NULL) {
|
||||
origin->clear_tracked_camera_if(this);
|
||||
|
@ -62,7 +62,7 @@ public:
|
||||
};
|
||||
|
||||
/*
|
||||
ARVRController is a helper node that automatically updates it's position based on tracker data.
|
||||
ARVRController is a helper node that automatically updates its position based on tracker data.
|
||||
|
||||
It must be a child node of our ARVROrigin node
|
||||
*/
|
||||
@ -102,7 +102,7 @@ public:
|
||||
};
|
||||
|
||||
/*
|
||||
ARVRAnchor is a helper node that automatically updates it's position based on anchor data, it represents a real world location.
|
||||
ARVRAnchor is a helper node that automatically updates its position based on anchor data, it represents a real world location.
|
||||
It must be a child node of our ARVROrigin node
|
||||
*/
|
||||
|
||||
|
@ -261,7 +261,7 @@ static _FORCE_INLINE_ void get_uv_and_normal(const Vector3 &p_pos, const Vector3
|
||||
void VoxelLightBaker::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector3 *p_normal, const Vector2 *p_uv, const MaterialCache &p_material, const AABB &p_aabb) {
|
||||
|
||||
if (p_level == cell_subdiv - 1) {
|
||||
//plot the face by guessing it's albedo and emission value
|
||||
//plot the face by guessing its albedo and emission value
|
||||
|
||||
//find best axis to map to, for scanning values
|
||||
int closest_axis = 0;
|
||||
|
@ -264,7 +264,7 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
|
||||
}
|
||||
|
||||
if (n.instance >= 0 || n.type != TYPE_INSTANCED || i == 0) {
|
||||
//if node was not part of instance, must set it's name, parenthood and ownership
|
||||
//if node was not part of instance, must set its name, parenthood and ownership
|
||||
if (i > 0) {
|
||||
if (parent) {
|
||||
parent->_add_child_nocheck(node, snames[n.name]);
|
||||
|
Loading…
Reference in New Issue
Block a user