axmol/cocos2dx/actions
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
..
CCAction.cpp Better destructors logs 2013-08-21 20:08:51 -07:00
CCAction.h Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
CCActionCamera.cpp more best practices fixes 2013-07-17 16:56:19 -07:00
CCActionCamera.h more best practices fixes 2013-07-17 16:56:19 -07:00
CCActionCatmullRom.cpp Better destructors logs 2013-08-21 20:08:51 -07:00
CCActionCatmullRom.h more best practices fixes 2013-07-17 16:56:19 -07:00
CCActionEase.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCActionEase.h more best practices fixes 2013-07-17 16:56:19 -07:00
CCActionGrid.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCActionGrid.h Fixes tag typos: deprecatd -> deprecated 2013-08-01 17:09:23 +08:00
CCActionGrid3D.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCActionGrid3D.h Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes 2013-07-18 15:46:14 +08:00
CCActionInstant.cpp issue #2404: Disabling warning of invoking deprecated methods in engine. Rename CCCallFuncND to __CCCallFuncND, and add deprecated typedef CCCallFuncND. 2013-07-25 15:05:56 +08:00
CCActionInstant.h issue #2404: Disabling warning of invoking deprecated methods in engine. Rename CCCallFuncND to __CCCallFuncND, and add deprecated typedef CCCallFuncND. 2013-07-25 15:05:56 +08:00
CCActionInterval.cpp fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
CCActionInterval.h Yet another documentation fix. 2013-08-01 21:40:13 +08:00
CCActionManager.cpp Better destructors logs 2013-08-21 20:08:51 -07:00
CCActionManager.h more best practices fixes 2013-07-17 16:56:19 -07:00
CCActionPageTurn3D.cpp issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
CCActionPageTurn3D.h more best practices fixes 2013-07-17 16:56:19 -07:00
CCActionProgressTimer.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCActionProgressTimer.h more best practices fixes 2013-07-17 16:56:19 -07:00
CCActionTiledGrid.cpp more best practices fixes 2013-07-17 16:56:19 -07:00
CCActionTiledGrid.h Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes 2013-07-18 15:46:14 +08:00
CCActionTween.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCActionTween.h Surround code in document with code/endcode tags. 2013-08-01 16:57:42 +08:00