Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/label_nodes
History
Ricardo Quesada e0523b3438 Merge branch 'developNewLabelForRiq' into label_merge 
Conflicts:
	cocos2dx/textures/CCTexture2D.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
	scripting/javascript/bindings/generated
	tools/bindings-generator
 		2013-07-24 15:15:08 -07:00
..
CCFont.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontAtlas.cpp some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontAtlas.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontAtlasCache.cpp some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontAtlasCache.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontAtlasFactory.cpp some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontAtlasFactory.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontCache.cpp some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontCache.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontDefinition.cpp some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontDefinition.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontFreeType.cpp Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCFontFreeType.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontRender.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontRenderFreeType.cpp Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCFontRenderFreeType.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCLabel.cpp some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCLabel.h working on the new label stuff 2013-07-22 14:43:45 -07:00
CCLabelAtlas.cpp More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix. 2013-07-22 14:28:19 +08:00
CCLabelAtlas.h Adds const to getters 2013-07-03 17:22:15 -07:00
CCLabelBMFont.cpp issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
CCLabelBMFont.h issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
CCLabelTTF.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCLabelTTF.h issue #2129: Using 'const FontDefinition&' instead of 'FontDefinition*' and resolving memory leak in FontDefinition LabelTTF::getTextDefinition() 2013-07-08 15:17:37 +08:00
CCLabelTextFormatProtocol.h some more cleanup 2013-07-18 14:11:12 -07:00
CCLabelTextFormatter.cpp merging with Ricardo stuff and fixin the new Label 2013-07-22 11:40:39 -07:00
CCLabelTextFormatter.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCStringBMFont.cpp Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07:00
CCStringBMFont.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCStringTTF.cpp some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCStringTTF.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCTextImage.cpp Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07:00
CCTextImage.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00