9 Commits

Author	SHA1	Message	Date
Ricardo Quesada	88928fff99	Merge branch 'developNewLabelMerge' into merge_new_label ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/textures/CCTexture2D.h samples/Javascript/Shared	2013-07-19 16:04:23 -07:00
carlo morgantini	c977e6c3fa	Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge ... Conflicts: cocos2dx/label_nodes/CCFontDefinition.cpp cocos2dx/label_nodes/CCFontDefinition.h cocos2dx/label_nodes/CCStringTTF.cpp cocos2dx/label_nodes/CCStringTTF.h samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp	2013-07-19 12:24:25 -07:00
carlo morgantini	002ae77698	new dynamic TTF label stuff	2013-07-11 14:41:03 -07:00
James Chen	1fb9f44d15	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
James Chen	c0d44cb2e4	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +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
carlo morgantini	dd9b4a8932	new shadow and stroke for CCLabelTTF	2013-05-15 16:12:43 -07:00
James Chen	69a746fc8b	issue #1686: Synchronizing LabelTest	2013-02-28 15:57:15 +08:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00