5 Commits

Author	SHA1	Message	Date
XiaoFeng	ab0efd933a	Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: CHANGELOG cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp tests/js-tests/src/RenderTextureTest/RenderTextureTest.js	2016-01-09 18:01:56 +08:00
yangxiao	50d16c13df	remove unused code	2015-12-25 17:54:58 +08:00
yangxiao	20e2b4acbd	fix NavMeshDebugDraw on iphone5s	2015-12-25 16:02:03 +08:00
Wenhai Lin	4fa58602a8	Adds `std::nothrow` to the `new` statements	2015-12-16 14:02:55 +08:00
yangxiao	c782d63bef	add 3d navigation	2015-05-29 16:45:33 +08:00