Repaired mistyped of 'its' on several files.
(cherry picked from commit b46ba24e3b
)
This commit is contained in:
parent
f0cdf4294e
commit
e6ae704f32
|
@ -1196,7 +1196,7 @@
|
||||||
The higher, the stronger.
|
The higher, the stronger.
|
||||||
</constant>
|
</constant>
|
||||||
<constant name="PIN_JOINT_IMPULSE_CLAMP" value="2" enum="PinJointParam">
|
<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>
|
||||||
<constant name="HINGE_JOINT_BIAS" value="0" enum="HingeJointParam">
|
<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.
|
The speed with which the two bodies get pulled together when they move in different directions.
|
||||||
|
|
|
@ -482,13 +482,13 @@ void ScriptEditor::_open_recent_script(int p_idx) {
|
||||||
if (p_idx < previous_scripts.size() && p_idx >= 0) {
|
if (p_idx < previous_scripts.size() && p_idx >= 0) {
|
||||||
|
|
||||||
String path = previous_scripts.get(p_idx);
|
String path = previous_scripts.get(p_idx);
|
||||||
// if its not on disk its a help file or deleted
|
// if it's not on disk it's a help file or deleted
|
||||||
if (FileAccess::exists(path)) {
|
if (FileAccess::exists(path)) {
|
||||||
Ref<Script> script = ResourceLoader::load(path);
|
Ref<Script> script = ResourceLoader::load(path);
|
||||||
if (script.is_valid()) {
|
if (script.is_valid()) {
|
||||||
edit(script, true);
|
edit(script, true);
|
||||||
}
|
}
|
||||||
// if it's a path then its most likely a delted file not help
|
// if it's a path then it's most likely a deleted file not help
|
||||||
} else if (!path.is_resource_file()) {
|
} else if (!path.is_resource_file()) {
|
||||||
_help_class_open(path);
|
_help_class_open(path);
|
||||||
}
|
}
|
||||||
|
|
|
@ -543,7 +543,7 @@ Error OS_Android::shell_open(String p_uri) {
|
||||||
|
|
||||||
String OS_Android::get_resource_dir() const {
|
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 {
|
String OS_Android::get_locale() const {
|
||||||
|
|
|
@ -1954,7 +1954,7 @@ void OS_X11::process_xevents() {
|
||||||
last_timestamp = event.xkey.time;
|
last_timestamp = event.xkey.time;
|
||||||
|
|
||||||
// key event is a little complex, so
|
// 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);
|
handle_key_event((XKeyEvent *)&event);
|
||||||
} break;
|
} break;
|
||||||
case SelectionRequest: {
|
case SelectionRequest: {
|
||||||
|
|
|
@ -38,14 +38,14 @@
|
||||||
void ARVRCamera::_notification(int p_what) {
|
void ARVRCamera::_notification(int p_what) {
|
||||||
switch (p_what) {
|
switch (p_what) {
|
||||||
case NOTIFICATION_ENTER_TREE: {
|
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());
|
ARVROrigin *origin = Object::cast_to<ARVROrigin>(get_parent());
|
||||||
if (origin != NULL) {
|
if (origin != NULL) {
|
||||||
origin->set_tracked_camera(this);
|
origin->set_tracked_camera(this);
|
||||||
}
|
}
|
||||||
}; break;
|
}; break;
|
||||||
case NOTIFICATION_EXIT_TREE: {
|
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());
|
ARVROrigin *origin = Object::cast_to<ARVROrigin>(get_parent());
|
||||||
if (origin != NULL) {
|
if (origin != NULL) {
|
||||||
origin->clear_tracked_camera_if(this);
|
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
|
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
|
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) {
|
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) {
|
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
|
//find best axis to map to, for scanning values
|
||||||
int closest_axis = 0;
|
int closest_axis = 0;
|
||||||
|
|
|
@ -265,7 +265,7 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (n.instance >= 0 || n.type != TYPE_INSTANCED || i == 0) {
|
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 (i > 0) {
|
||||||
if (parent) {
|
if (parent) {
|
||||||
parent->_add_child_nocheck(node, snames[n.name]);
|
parent->_add_child_nocheck(node, snames[n.name]);
|
||||||
|
|
Loading…
Reference in New Issue