Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/textures
History
carlo morgantini 47be4ff58a Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 
Conflicts:
	cocos2dx/label_nodes/CCFontAtlas.cpp
	cocos2dx/label_nodes/CCFontAtlas.h
	cocos2dx/label_nodes/CCFontAtlasCache.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.h
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontFreeType.cpp
	cocos2dx/label_nodes/CCLabel.cpp
	cocos2dx/label_nodes/CCLabel.h
	cocos2dx/label_nodes/CCStringBMFont.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
 		2013-08-13 11:28:54 -07:00
..
CCTexture2D.cpp update s3tc #5, code standardization 2013-08-09 12:54:05 +08:00
CCTexture2D.h update s3tc #5, code standardization 2013-08-09 12:54:05 +08:00
CCTextureAtlas.cpp fix bugs with new Label stuff and add new sample for unicode 2013-07-30 16:41:26 -07:00
CCTextureAtlas.h Use C++ code in C++ comments. 2013-08-01 16:40:56 +08:00
CCTextureCache.cpp Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 2013-08-13 11:28:54 -07:00
CCTextureCache.h issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D 2013-08-06 11:34:48 +08:00