James Chen 3bc45e665c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2013-07-26 19:56:04 +08:00
..
CCLayer.cpp	issue #2404:modify a function name to isSwallowsTouches()	2013-07-26 15:21:19 +08:00
CCLayer.h	issue #2404:modify a function name to isSwallowsTouches()	2013-07-26 15:21:19 +08:00
CCScene.cpp	issue #2404:created CCDprecated.h and move all global functions and variables into it	2013-07-15 16:14:26 +08:00
CCScene.h	more best practices fixes	2013-07-17 16:56:19 -07:00
CCTransition.cpp	More constant fixes	2013-07-25 14:49:43 -07:00
CCTransition.h	More constant fixes	2013-07-25 14:49:43 -07:00
CCTransitionPageTurn.cpp	Adds more readability to the class internals.	2013-07-15 12:43:22 -07:00
CCTransitionPageTurn.h	closed #2413: Warning fixes for overload virtual functions.	2013-07-17 16:25:13 +08:00
CCTransitionProgress.cpp	enum class for ProgressTimer::type	2013-07-26 17:28:18 +08:00
CCTransitionProgress.h	Adds more readability to the class internals.	2013-07-15 12:43:22 -07:00