From ec4ef2d2e794819548d731f93728266d31261d71 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 14 Apr 2014 22:43:44 -0300 Subject: -Added google play services (needed for some stuff) -Added new screen resizing options, stretch_2d is removed, new much more flexible ones. -Fixed bug in viewport (can create more instances in 3d-in-2d demo now) -Can set android permissions and screen sizes manually in the export settings -Changed export templates extension to .tpz (too many people unzipped the manually..) -File dialog now ensures that the proper extension is used (will not allow to save without it) -Fixed bug that made collision exceptions not work in 2D --- servers/physics_2d/physics_2d_server_sw.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'servers/physics_2d') diff --git a/servers/physics_2d/physics_2d_server_sw.cpp b/servers/physics_2d/physics_2d_server_sw.cpp index fd1ea579f0..ee29d3aeff 100644 --- a/servers/physics_2d/physics_2d_server_sw.cpp +++ b/servers/physics_2d/physics_2d_server_sw.cpp @@ -770,7 +770,7 @@ void Physics2DServerSW::body_remove_collision_exception(RID p_body, RID p_body_b Body2DSW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); - body->remove_exception(p_body); + body->remove_exception(p_body_b); }; -- cgit v1.2.3