Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/cocoa
History
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 		2013-09-13 19:06:09 +08:00
..
CCAffineTransform.cpp CCNode perf improvements 2013-08-26 18:04:51 -07:00
CCAffineTransform.h CCNode perf improvements 2013-08-26 18:04:51 -07:00
CCArray.cpp SpriteBatchNode: follows C++ best practices 2013-08-31 10:38:10 -07:00
CCArray.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
CCAutoreleasePool.cpp Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
CCAutoreleasePool.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
CCBool.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCData.cpp Better destructors logs 2013-08-21 20:08:51 -07:00
CCData.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
CCDataVisitor.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCDataVisitor.h issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
CCDictionary.cpp Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
CCDictionary.h issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
CCDouble.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCFloat.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCGeometry.cpp Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCGeometry.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
CCInteger.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCNS.cpp issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
CCNS.h issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
CCObject.cpp Uses std::sort() 2013-08-24 10:56:07 -07:00
CCObject.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCSet.cpp closed #2361:fix a crsash caused by Set::removeAllObjects 2013-07-03 15:26:58 +08:00
CCSet.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCString.cpp Better destructors logs 2013-08-21 20:08:51 -07:00
CCString.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00