108 Commits

Author	SHA1	Message	Date
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	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	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00