6 Commits

Author	SHA1	Message	Date
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