boyu0 790ef9e818 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step ... Conflicts: tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h		2014-08-12 10:20:34 +08:00
..
chipmunk	Squashed commit of the following:	2014-05-14 10:07:09 -07:00
CCPhysicsBody.cpp	fix PhysicsBody bitmask bug.	2014-08-08 16:38:20 +08:00
CCPhysicsBody.h	fix typo	2014-08-08 16:56:48 +08:00
CCPhysicsContact.cpp	Squashed commit of the following:	2014-05-14 10:07:09 -07:00
CCPhysicsContact.h	add CC_DLL for Event and Physics	2014-07-15 10:55:40 +08:00
CCPhysicsJoint.cpp	Squashed commit of the following:	2014-05-14 10:07:09 -07:00
CCPhysicsJoint.h	add CC_DLL for Event and Physics	2014-07-15 10:55:40 +08:00
CCPhysicsShape.cpp	Fix the bug: flip scale for physics body make it's size incorrect.	2014-07-17 17:21:09 +08:00
CCPhysicsShape.h	fix PhysicsBody bitmask bug.	2014-08-08 16:38:20 +08:00
CCPhysicsWorld.cpp	closed #5537: add setAutoStep, isAutoStep and step method for PhysicsWorld.	2014-06-12 12:45:21 +08:00
CCPhysicsWorld.h	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step	2014-08-12 10:20:34 +08:00
CMakeLists.txt	linux cmake improvements	2014-05-01 13:01:51 -07:00