Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform
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
..
android Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it. 2013-07-24 10:14:42 +08:00
emscripten More CCLog --> log. 2013-07-24 10:46:13 +08:00
ios More CCLog --> log. 2013-07-24 10:46:13 +08:00
linux Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07:00
mac More CCLog --> log. 2013-07-24 10:46:13 +08:00
nacl More CCLog --> log. 2013-07-24 10:46:13 +08:00
third_party Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07:00
tizen More CCLog --> log. 2013-07-24 10:46:13 +08:00
win32 More CCLog --> log. 2013-07-24 10:46:13 +08:00
CCAccelerometerDelegate.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCApplicationProtocol.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCCommon.h Put the deprecated method 'CCLog' to 'CCDeprecated.h'. 2013-07-24 10:26:36 +08:00
CCDevice.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCEGLViewProtocol.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCEGLViewProtocol.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCFileUtils.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCFileUtils.h getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCImage.h issue #2378: More setter/Getter, removing CC_PROPERTY_XXX macros. 2013-07-23 18:26:26 +08:00
CCImageCommonWebp.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCImageCommon_cpp.h More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
CCPlatformConfig.h Adding defines and enums for Tizen. 2013-05-16 19:49:16 +09:00
CCPlatformMacros.h More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
CCSAXParser.cpp More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
CCSAXParser.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCThread.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCThread.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00