13 Commits

Author	SHA1	Message	Date
WenhaiLin	1494f09f06	Remove unneeded include files and fixed warns.	2015-06-25 23:15:39 +08:00
Ricardo Quesada	510d502631	Merge remote-tracking branch 'cocos2d/v3' into xcode_6_3_tests_compiles	2015-04-08 21:59:22 -07:00
Ricardo Quesada	23b0d4d2f6	more fixes with the namespaces	2015-04-08 21:23:47 -07:00
Ricardo Quesada	51374eb822	tests compiles on xcode 6.3 ... no more USING_NS in the header files. it creates conflict with xcode 6.3	2015-04-08 17:37:30 -07:00
tangziwen	0c2c8b072a	terrain update terrain test update ,resource update	2015-04-08 15:13:24 +08:00
tangziwen	14b94a6aac	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain ... Resolve Conflicts: tests/cpp-tests/Classes/controller.cpp	2015-04-03 17:50:08 +08:00
tangziwen	8a7b318c1a	Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment	2015-04-03 13:49:07 +08:00
tangziwen	1a93f87a15	update terrain	2015-03-30 18:25:22 +08:00
tangziwen	3a3e1e9ad1	update terrain test	2015-03-27 10:47:52 +08:00
tangziwen	b0f7c232e2	fix test	2015-02-02 16:14:13 +08:00
tangziwen	10eced8b98	bug fix upload new sample texture	2015-01-30 15:46:39 +08:00
tangziwen	9ec366a130	update terrain test add new method to get normal	2015-01-27 15:18:59 +08:00
tangziwen	d04b3feb50	add new test, fix memory leak	2015-01-23 18:09:54 +08:00