summaryrefslogtreecommitdiffstats
path: root/scene/3d/physics_body.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-09-22 00:50:48 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-09-22 00:50:48 -0300
commit048fdc8aeabbd80ba9cc8914ec7f7baa00ad0c3d (patch)
treeddd39a348b41cfe3927075a8c6b11aa692511518 /scene/3d/physics_body.h
parentf195bf673fa8f282d2508e20ca6f08260c4e1fe7 (diff)
downloadredot-engine-048fdc8aeabbd80ba9cc8914ec7f7baa00ad0c3d.tar.gz
-variables with export in script are now IMMEDIATELY AND ALWAYS visible in properties (#718)
-WorldEnvironment cleanup issues fixed (#563) -Text Editor improvement to shift-mouse selection (#648) -(Hopefully) fixed rare (but horrible) indexing bug in GDScript compiler (#652) -Some changes to PhysicsBody API, renamed property "active" to "sleeping", which makes more sense -Added add_collision_exception() API in PhysicsBody (more accessible) -ability to select and copy in the output messages panel
Diffstat (limited to 'scene/3d/physics_body.h')
-rw-r--r--scene/3d/physics_body.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h
index 0b7a389449..30a64c802f 100644
--- a/scene/3d/physics_body.h
+++ b/scene/3d/physics_body.h
@@ -125,7 +125,7 @@ private:
Vector3 linear_velocity;
Vector3 angular_velocity;
- bool active;
+ bool sleeping;
bool ccd;
AxisLock axis_lock;
@@ -216,8 +216,8 @@ public:
void set_use_custom_integrator(bool p_enable);
bool is_using_custom_integrator();
- void set_active(bool p_active);
- bool is_active() const;
+ void set_sleeping(bool p_sleeping);
+ bool is_sleeping() const;
void set_can_sleep(bool p_active);
bool is_able_to_sleep() const;