axmol/cocos/base
Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position
Conflicts:
	CHANGELOG
	cocos/ui/UILayout.cpp
2014-06-04 09:19:22 -07:00
..
CCAutoreleasePool.cpp prefer std::vector to other containers 2014-06-03 19:09:48 +08:00
CCAutoreleasePool.h prefer std::vector to other containers 2014-06-03 19:09:48 +08:00
CCConfiguration.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCConfiguration.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCConsole.cpp fix mingw32/mingw64 compiling 2014-05-28 00:17:09 +08:00
CCConsole.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCData.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCData.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDataVisitor.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDataVisitor.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDirector.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCDirector.h remove unused variables 2014-05-27 10:47:25 +08:00
CCEvent.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEvent.h issue #4861, add CCEventFocus and CCEventListener 2014-05-05 11:37:38 +08:00
CCEventAcceleration.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventAcceleration.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventCustom.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventCustom.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventDispatcher.cpp name fix 2014-05-15 10:19:59 +09:00
CCEventDispatcher.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventFocus.cpp issue #3861. add license to CCEventFocus and CCEventListenerFocus 2014-05-05 17:49:31 +08:00
CCEventFocus.h issue #3861. add license to CCEventFocus and CCEventListenerFocus 2014-05-05 17:49:31 +08:00
CCEventKeyboard.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventKeyboard.h issue #4861. add android keypad support 2014-05-05 11:37:38 +08:00
CCEventListener.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCEventListener.h issue #4861, add CCEventFocus and CCEventListener 2014-05-05 11:37:38 +08:00
CCEventListenerAcceleration.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerAcceleration.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerCustom.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerCustom.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerFocus.cpp issue #3861. add license to CCEventFocus and CCEventListenerFocus 2014-05-05 17:49:31 +08:00
CCEventListenerFocus.h closed #3861, fixed some typo and indent problem 2014-05-06 12:04:52 +08:00
CCEventListenerKeyboard.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerKeyboard.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerMouse.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerMouse.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerTouch.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventListenerTouch.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventMouse.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventMouse.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventTouch.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventTouch.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCEventType.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCIMEDelegate.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCIMEDispatcher.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCIMEDispatcher.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCMap.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCNS.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCNS.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCPlatformConfig.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCPlatformMacros.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCProfiling.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCProfiling.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCProtocols.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCRef.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCRef.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCRefPtr.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCScheduler.cpp change comment. 2014-05-30 17:40:35 +08:00
CCScheduler.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCScriptSupport.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCScriptSupport.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTouch.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTouch.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCUserDefault.cpp CCUserDefault.cpp: Should not compile on Mac platform (should be using CCUserDefault.mm implementation). 2014-05-29 10:36:15 -04:00
CCUserDefault.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCUserDefault.mm Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCUserDefaultAndroid.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCValue.cpp Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables. 2014-05-13 17:03:48 +08:00
CCValue.h Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables. 2014-05-13 17:03:48 +08:00
CCVector.h Improved directory structure 2014-04-29 17:37:36 -07:00
CMakeLists.txt fix other platform compile error 2014-06-04 14:56:34 +08:00
ObjectFactory.cpp refactor ObjectFactor and move it to base 2014-06-04 14:56:34 +08:00
ObjectFactory.h refactor ObjectFactor and move it to base 2014-06-04 14:56:34 +08:00
TGAlib.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
TGAlib.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ZipUtils.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ZipUtils.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
atitc.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
atitc.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
base64.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
base64.h Improved directory structure 2014-04-29 17:37:36 -07:00
ccCArray.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ccCArray.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ccConfig.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
ccFPSImages.c Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ccFPSImages.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ccMacros.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ccTypes.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
ccTypes.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ccUTF8.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ccUTF8.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ccUtils.cpp adding comments for the new utility. 2014-05-27 14:29:52 +08:00
ccUtils.h udpate the comments 2014-05-27 14:51:13 +08:00
etc1.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
etc1.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
firePngData.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
s3tc.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
s3tc.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
uthash.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
utlist.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00