12 Commits

Author	SHA1	Message	Date
Ricardo Quesada	d1b555614e	removes `using namespace std` from header file ... ... in order to prevent possible collisions. `using namespace XXX` MUST never be used in header files.	2013-12-18 11:45:30 -08:00
Ricardo Quesada	3ab1e4f3a1	ClippingNode Test works again	2013-11-22 12:15:41 -08:00
Ricardo Quesada	c943702bc8	Merge branch 'develop' into constructors_are_protected ... Conflicts: cocos/editor-support/cocostudio/CCActionObject.cpp samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h	2013-11-18 11:07:15 -08:00
boyu0	8c949c3441	fix bugs: delete initTest functions.	2013-11-18 03:43:32 +08:00
Ricardo Quesada	d590986e73	Constructors are protected	2013-11-13 15:55:36 -08:00
James Chen	f403f7d683	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test ... Conflicts: samples/samples.xcodeproj/project.pbxproj	2013-09-17 23:24:14 +08:00
James Chen	513237d5f6	Fixing armature test crash.	2013-09-17 23:03:33 +08:00
boyu0	d161c6a576	issue #2771: Add PhysicsTest to TestCpp. Add initTest to TestScene, move Scene::init() from constructor to TestScene::initTest()	2013-09-10 17:41:06 +08:00
James Chen	1fb9f44d15	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
Ricardo Quesada	022dfc0acc	CPP Tests migrated to the new C++11 API ... Many tests were converted to the C++11 API and some tests were also simplified by using the "CL" macro instead of the "CF" macro.	2013-06-07 17:21:11 -07:00
Ricardo Quesada	80117afc82	Adds Base class to tests ... Base class displays the Menu( <- O -> ) Improved in some tests the way to create entries. Instead of defining the tests twice: the "create" method, and the entry in the array, it is only needed in the array (ActionsTest, SpriteTest and Texture2DTest)	2013-06-06 17:12:28 -07:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00