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
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
..
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 working on the new atlas stuff 2013-07-19 10:33:26 -07:00
CCFontFreeType.h working on the new atlas stuff 2013-07-19 10:33:26 -07:00
CCFontRender.h some more cleanup 2013-07-18 14:11:12 -07:00
CCFontRenderFreeType.cpp some more cleanup 2013-07-18 14:11:12 -07:00
CCFontRenderFreeType.h some more cleanup 2013-07-18 14:11:12 -07:00
CCLabelAtlas.cpp issue #2129: Windows doesn't support 'initializer list', using constructor instead. 2013-07-07 21:08:14 +08:00
CCLabelAtlas.h Adds const to getters 2013-07-03 17:22:15 -07:00
CCLabelBMFont.cpp From C++ best practices 2013-07-08 14:38:14 -07:00
CCLabelBMFont.h Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix 2013-07-08 10:51:07 +08:00
CCLabelBMFontNew.cpp new dynamic TTF label stuff 2013-07-11 14:41:03 -07:00
CCLabelBMFontNew.h new dynamic TTF label stuff 2013-07-11 14:41:03 -07:00
CCLabelBMFontNewXX.cpp new dynamic TTF label stuff 2013-07-11 14:41:03 -07:00
CCLabelBMFontNewXX.h new dynamic TTF label stuff 2013-07-11 14:41:03 -07:00
CCLabelTTF.cpp issue #2129:use capital words for static const member variables 2013-07-08 18:11: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 clean up and now using FreeType for rendering fonts 2013-07-18 13:13:41 -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 working on the new atlas stuff 2013-07-19 10:33:26 -07:00
CCTextImage.h working on the new atlas stuff 2013-07-19 10:33:26 -07:00