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 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
..
CCFont.h working on the new atlas stuff 2013-07-19 10:33:26 -07:00
CCFontAtlas.cpp working on the new atlas stuff 2013-07-19 10:33:26 -07:00
CCFontAtlas.h working on the new atlas stuff 2013-07-19 10:33:26 -07:00
CCFontDefinition.cpp Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge 2013-07-19 12:24:25 -07:00
CCFontDefinition.h Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge 2013-07-19 12:24:25 -07:00
CCFontFreeType.cpp Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCFontFreeType.h Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCFontRender.h some more cleanup 2013-07-18 14:11:12 -07:00
CCFontRenderFreeType.cpp Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCFontRenderFreeType.h some more cleanup 2013-07-18 14:11:12 -07:00
CCLabel.cpp Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCLabel.h Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCLabelAtlas.cpp issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
CCLabelAtlas.h Adds const to getters 2013-07-03 17:22:15 -07:00
CCLabelBMFont.cpp issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
CCLabelBMFont.h issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
CCLabelBMFontNew.cpp Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCLabelBMFontNew.h Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCLabelTTF.cpp closed #2393: fix conflicts 2013-07-12 18:04:32 +08: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 Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCLabelTextFormatter.h clean up and now using FreeType for rendering fonts 2013-07-18 13:13:41 -07:00
CCStringTTF.cpp Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge 2013-07-19 12:24:25 -07:00
CCStringTTF.h Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge 2013-07-19 12:24:25 -07:00
CCTextImage.cpp Merge branch 'developNewLabelMerge' into merge_new_label 2013-07-19 16:04:23 -07:00
CCTextImage.h working on the new atlas stuff 2013-07-19 10:33:26 -07:00