115 Commits

Author	SHA1	Message	Date
minggo	4952df576b	Merge pull request #3996 from boyu0/iss2771_physical ... issue #2771: physical	2013-10-22 20:45:55 -07:00
boyu0	17422c3123	issue #2771: fix some compile error in win32	2013-10-23 11:08:21 +08:00
boyu0	51801d9218	issue #2771: fix some compile error in android and win32	2013-10-23 10:11:08 +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	24561860f0	issue #2771: add ray cast test	2013-10-22 18:00:24 +08:00
boyu0	e99b80b304	issue #2771: implements rayCast and rectQuery	2013-10-21 23:16:21 +08:00
boyu0	5741a16620	issue #2771: edit some include head file path	2013-10-18 17:47:29 +08:00
boyu0	6aef4476d9	issue #2771: edit some mistake when merge	2013-10-18 15:55:47 +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	19ee87e29a	issue #2905: step2 Box2D -> box2d	2013-10-12 14:03:04 +08:00
minggo	1f38636e84	issue #2905: step1 Box2D -> box2d	2013-10-12 14:02:13 +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