axmol/cocos2dx/layers_scenes_transitions_n...
James Chen f403f7d683 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test
Conflicts:
	samples/samples.xcodeproj/project.pbxproj
2013-09-17 23:24:14 +08:00
..
CCLayer.cpp Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test 2013-09-17 23:24:14 +08:00
CCLayer.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test 2013-09-17 23:24:14 +08:00
CCScene.cpp issue #2771: Implement the minimum set of physical API. Improve the PhysicsTest 2013-09-16 21:22:22 +08:00
CCScene.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-09-16 22:16:50 +08:00
CCTransition.cpp [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
CCTransition.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCTransitionPageTurn.cpp Adds more readability to the class internals. 2013-07-15 12:43:22 -07:00
CCTransitionPageTurn.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCTransitionProgress.cpp Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
CCTransitionProgress.h Adds more readability to the class internals. 2013-07-15 12:43:22 -07:00