diff options
author | Olafur Haukur Flygenring <olifly@gmail.com> | 2014-02-19 20:52:07 +0000 |
---|---|---|
committer | Olafur Haukur Flygenring <olifly@gmail.com> | 2014-02-19 20:52:07 +0000 |
commit | c78a06536ebc7c2c2718eaf800c8227bdb07a931 (patch) | |
tree | 6e8d888dfe91c9717b85c18bca6e73d6a43789aa /doc | |
parent | ec448845e295c4b8e897793b0971ebd9912e3101 (diff) | |
parent | 449bc14fb49d3266f5bd82dbe3c53a4b9f4062da (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc')
-rw-r--r-- | doc/base/classes.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 13a6aa72ee..46bc8997ff 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -11027,6 +11027,9 @@ <return type="Vector2"> </return> <description> + Return the global, unscaled, screen pointer coordinates. + If the 2D viewport has been scaled, it may not work well + with [Camera] or controls. </description> </method> <method name="get_mouse_speed" qualifiers="const" > @@ -15411,6 +15414,7 @@ <brief_description> </brief_description> <description> + explain ownership, and that node does not need to own itself </description> <methods> <method name="pack" > @@ -15419,6 +15423,8 @@ <argument index="0" name="path" type="Node"> </argument> <description> + Pack will ignore any sub-nodes not owned by given + node. See [Node.set_owner]. </description> </method> <method name="instance" qualifiers="const" > @@ -17490,7 +17496,7 @@ </constant> <constant name="BODY_MODE_STATIC" value="0"> </constant> - <constant name="BODY_MODE_STATIC_ACTIVE" value="1"> + <constant name="BODY_MODE_KINEMATIC" value="1"> </constant> <constant name="BODY_MODE_RIGID" value="2"> </constant> @@ -18420,7 +18426,7 @@ </constant> <constant name="BODY_MODE_STATIC" value="0"> </constant> - <constant name="BODY_MODE_STATIC_ACTIVE" value="1"> + <constant name="BODY_MODE_KINEMATIC" value="1"> </constant> <constant name="BODY_MODE_RIGID" value="2"> </constant> @@ -20861,7 +20867,7 @@ <constants> <constant name="MODE_STATIC" value="1"> </constant> - <constant name="MODE_STATIC_ACTIVE" value="3"> + <constant name="MODE_KINEMATIC" value="3"> </constant> <constant name="MODE_RIGID" value="0"> </constant> @@ -21143,7 +21149,7 @@ <constant name="MODE_STATIC" value="1"> Static mode (does not move, can't be moved). </constant> - <constant name="MODE_STATIC_ACTIVE" value="3"> + <constant name="MODE_KINEMATIC" value="3"> </constant> <constant name="MODE_RIGID" value="0"> Rigid body, can move and rotate. |