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 d7590affda Merge branch 'develop' into dictionary_array_fixes 
Conflicts:
	cocos2dx/cocoa/CCArray.cpp
	cocos2dx/cocoa/CCArray.h
	cocos2dx/label_nodes/CCLabel.cpp
	extensions/CCArmature/datas/CCDatas.cpp
	extensions/CCArmature/display/CCDisplayManager.cpp
 		2013-08-21 21:27:44 -07:00
..
CCFont.cpp issue #2488: Fixing typo: #include "CCFontFreeType.cpp" --> "CCFontFreeType.h". 2013-08-15 20:59:05 +08:00
CCFont.h more cleanup 2013-08-06 13:43:29 -07:00
CCFontAtlas.cpp Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 2013-08-13 11:28:54 -07:00
CCFontAtlas.h more cleanup 2013-08-06 14:37:19 -07:00
CCFontAtlasCache.cpp Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 2013-08-13 11:28:54 -07:00
CCFontAtlasCache.h New label stuff cleanup and re factoring 2013-08-05 15:11:07 -07:00
CCFontAtlasFactory.cpp New label stuff cleanup and re factoring 2013-08-05 15:11:07 -07:00
CCFontAtlasFactory.h Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 2013-08-13 11:28:54 -07:00
CCFontCache.cpp Adding Android support for new label. 2013-08-02 13:46:26 +08:00
CCFontCache.h some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
CCFontDefinition.cpp Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 2013-08-13 11:28:54 -07:00
CCFontDefinition.h more cleanup 2013-08-06 13:43:29 -07:00
CCFontFNT.cpp some more clean up and removed CCStringTTF 2013-08-07 16:36:04 -07:00
CCFontFNT.h issue #2488: Adding 'override' keyword for new Label classes. 2013-08-15 21:00:06 +08:00
CCFontFreeType.cpp issue #2488: Fixing a warning in CCFontFreeType.cpp. 2013-08-15 21:39:03 +08:00
CCFontFreeType.h issue #2488: Adding 'override' keyword for new Label classes. 2013-08-15 21:00:06 +08:00
CCLabel.cpp Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
CCLabel.h Array & Dictionary fixes 2013-08-21 20:12:09 -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 Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCLabelBMFont.h New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment 2013-07-26 16:04:21 -07:00
CCLabelTTF.cpp New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment 2013-07-26 16:04:21 -07:00
CCLabelTTF.h New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment 2013-07-26 16:04:21 -07:00
CCLabelTextFormatProtocol.h more cleanup 2013-08-05 16:52:24 -07:00
CCLabelTextFormatter.cpp Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 2013-08-13 11:28:54 -07:00
CCLabelTextFormatter.h issue #2179: Fixing compilation errors on Linux. 2013-08-05 10:29:20 +08:00
CCTextImage.cpp Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 2013-08-13 11:28:54 -07:00
CCTextImage.h more cleanup 2013-08-06 14:37:19 -07:00