diff options
| author | reduz <juan@okamstudio.com> | 2015-12-26 10:27:04 -0300 |
|---|---|---|
| committer | reduz <juan@okamstudio.com> | 2015-12-26 10:27:04 -0300 |
| commit | 9d9520f227d58c2499e906d72002cf631e40f4c8 (patch) | |
| tree | d2f238c5048c4aeb199e28b39117559ccd42318c /servers/physics_2d_server.cpp | |
| parent | 13964f59c1359473980916ea1f930fef1c28331a (diff) | |
| parent | dfd7bdb00528eb9a45e21a5c99d0e76bd642e74c (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'servers/physics_2d_server.cpp')
| -rw-r--r-- | servers/physics_2d_server.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index 5d8446ed38..c18b32468a 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -663,9 +663,11 @@ void Physics2DServer::_bind_methods() { BIND_CONSTANT( AREA_PARAM_ANGULAR_DAMP); BIND_CONSTANT( AREA_PARAM_PRIORITY ); - BIND_CONSTANT( AREA_SPACE_OVERRIDE_COMBINE ); BIND_CONSTANT( AREA_SPACE_OVERRIDE_DISABLED ); + BIND_CONSTANT( AREA_SPACE_OVERRIDE_COMBINE ); + BIND_CONSTANT( AREA_SPACE_OVERRIDE_COMBINE_REPLACE ); BIND_CONSTANT( AREA_SPACE_OVERRIDE_REPLACE ); + BIND_CONSTANT( AREA_SPACE_OVERRIDE_REPLACE_COMBINE ); BIND_CONSTANT( BODY_MODE_STATIC ); BIND_CONSTANT( BODY_MODE_KINEMATIC ); |