diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-22 10:57:39 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-22 10:57:39 -0300 |
| commit | acc9db1695ebabe61e6dc68bf9d63478a81c0827 (patch) | |
| tree | d67bdb5c707db95e1685581e4d4c9dd2488c7cf3 /servers/physics_2d_server.cpp | |
| parent | 02d6669a3849c55e415f37b23b36b49f23319957 (diff) | |
| parent | 89efebbf561fa19d29533acdd3716f8d1385595a (diff) | |
Merge pull request #3071 from Ovnuniarchos/NewAreaCombiners
New and corrected area override modes.
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 ); |