summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-06-22 08:24:49 +0200
committerGitHub <noreply@github.com>2020-06-22 08:24:49 +0200
commitd2fec77800c7146d17e53e8ef94f765d23cdd966 (patch)
tree093b1f7e29f51b75ad886d85b6ce4c0e449f9a6d
parent091e500a887b68c1734d17dd40c5ea47a83b73cc (diff)
parenta94ba7be599b72a9cac374bdaecbcc9aaaff8a8b (diff)
Merge pull request #39741 from skyace65/Joint2DDoc
Fix Joint2D disable collision description.
-rw-r--r--doc/classes/Joint2D.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/classes/Joint2D.xml b/doc/classes/Joint2D.xml
index fb0e184c26..b055293b9d 100644
--- a/doc/classes/Joint2D.xml
+++ b/doc/classes/Joint2D.xml
@@ -15,7 +15,7 @@
When [member node_a] and [member node_b] move in different directions the [code]bias[/code] controls how fast the joint pulls them back to their original position. The lower the [code]bias[/code] the more the two bodies can pull on the joint.
</member>
<member name="disable_collision" type="bool" setter="set_exclude_nodes_from_collision" getter="get_exclude_nodes_from_collision" default="true">
- If [code]true[/code], [member node_a] and [member node_b] can collide.
+ If [code]true[/code], [member node_a] and [member node_b] can not collide.
</member>
<member name="node_a" type="NodePath" setter="set_node_a" getter="get_node_a" default="NodePath(&quot;&quot;)">
The first body attached to the joint. Must derive from [PhysicsBody2D].