16 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	6c27a0df0b	issue #2771: make api more friendly	2013-11-06 15:43:29 +08:00
boyu0	a01fcc6f36	issue #2771: move header definition to first line	2013-11-06 14:51:56 +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	2f67ceb495	issue #2771: fix some code style	2013-11-01 16:26:03 +08:00
boyu0	cae9a3e54f	issue #2771: add physics pump demo and fix bugs	2013-10-29 17:31:35 +08:00
boyu0	66d1bbd89f	issue #2771: edit physics effect with all bodies and fix some bugs	2013-10-28 16:17:19 +08:00
boyu0	a8ddca81bd	issue #2771: fix some compile error in win32	2013-10-23 18:52:09 +08:00
boyu0	17422c3123	issue #2771: fix some compile error in win32	2013-10-23 11:08:21 +08:00
boyu0	24561860f0	issue #2771: add ray cast test	2013-10-22 18:00:24 +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	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	ad6325b0dd	fix conflicts	2013-10-12 11:31:32 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00