15 Commits

Author	SHA1	Message	Date
boyu0	7363be0697	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-11-07 17:37:33 +08:00
boyu0	f2cd5ca630	issue #2771: fix body and joint memory bugs. add removeFormWorld and destroy to PhysicsJoint, and add a destroy param to PhysicsWorld->removeJoint()	2013-11-07 14:17:57 +08:00
boyu0	6c27a0df0b	issue #2771: make api more friendly	2013-11-06 15:43:29 +08:00
boyu0	af129e25f0	issue #2771: change some coding style	2013-11-05 20:02:58 +08:00
boyu0	8c62bf813f	issue #2771: enhance API and add Slice demo	2013-11-05 15:54:33 +08:00
Ricardo Quesada	ba7ed6e578	Fixes some compiler warnings ... The warnings are related to: * 64-to-32-bit conversion * shadow variables	2013-11-04 16:31:36 -08:00
boyu0	00acd67ff3	issue #2771: finish OneWayPlatform demo and fix some bugs	2013-11-04 14:36:38 +08:00
boyu0	2f67ceb495	issue #2771: fix some code style	2013-11-01 16:26:03 +08:00
boyu0	2efef34144	issue #2771: fix vs compile errors	2013-10-31 18:18:02 +08:00
boyu0	cae9a3e54f	issue #2771: add physics pump demo and fix bugs	2013-10-29 17:31:35 +08:00
boyu0	fdcf019665	issue #2771: implement contact callbacks	2013-10-25 10:31:22 +08:00
minggo	abcf8f268d	fix conflicts	2013-10-22 18:36:13 +08:00
minggo	6a664d480a	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
boyu0	d12ee5f120	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-10-18 15:34:13 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00