18 Commits

Author	SHA1	Message	Date
James Chen	2133c0e566	Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode ... Conflicts: cocos/2d/CCDrawNode.h	2014-01-09 17:03:08 +08:00
boyu0	6bc0a7066f	change CustomCommand variable to class member.	2013-12-26 21:19:12 +08:00
boyu0	f878864794	Specialize GroupCommand and CustomCommand, change generateCommand to new.	2013-12-26 15:41:47 +08:00
Huabing.Xu	02c28cf891	change indent to spaces	2013-12-25 11:46:40 +08:00
Huabing.Xu	598d295c6c	fix actionTest->DrawPrimitiveTest	2013-12-25 11:44:05 +08:00
Ricardo Quesada	7616edd9f3	Improves SpriteTest ... Improves SpriteTest. It is easier to see if Sprite works as SpriteBatchNode (and vice-versa). Needed for the new renderer. Also adds `const` to title() and subtitle()	2013-12-18 13:52:10 -08:00
PickleMan	3b5ae69ac8	Added triangle, cubic bezier and quad bezier tests to DrawPrimitivesTest	2013-10-14 00:52:58 -04:00
boyu0	70df1a6061	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
Ricardo Quesada	d683e10808	More constant fixes ... Transition::ORIENTATION_XXX -> Transition::Orientation::XXX Image::FORMAT_XXX -> Image::Format::XXX Image::_function() -> Image::function() // private methods should not start with '_' DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor() And fixes Premultiplied Alpha in PVR v3 images And tests are updated with the new functions	2013-07-25 14:49:43 -07:00
Ricardo Quesada	c158cd5be6	More best practices fixes ... - Removes Hungarian notation from the CPP test (there are still some Hungarian to remove) - Label and MotionStreak: Uses the CL() entry for the tests (lambda functions)	2013-07-22 17:25:44 -07:00
minggo	6abe6fce78	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
minggo	bb758df0d0	issue #2393:mark ccp as deprecated	2013-07-12 14:11:55 +08:00
Ricardo Quesada	cf262c28e2	getInstance() / destroyInstance() are used... ... ... instead of sharedXXX / purgeXXX. They are more C++ friendly, and also easier to remember. common files + Mac files + iOS files + tests/samples files were updated. The old methods are deprecated now.	2013-07-11 15:24:23 -07:00
minggo	04465622b7	issue #2129:remove prefix of types in ccTypes.h	2013-07-05 16:49:22 +08:00
Darragh Coy	e247b5d960	Add ccDrawSolidCircle ... Similar to ccDrawCircle() primitives drawing function except the circle is filled.	2013-07-02 13:39:16 -07:00
James Chen	1fb9f44d15	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08: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