Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/base
History
pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 
Conflicts:
	cocos/base/ccConfig.h
	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_prepare.js
 		2016-01-18 16:40:00 +08:00
..
allocator fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCAsyncTaskPool.cpp simplify AsyncTaskPool 2014-12-23 10:12:37 +08:00
CCAsyncTaskPool.h Update comment for Lua 2015-03-30 15:47:47 +08:00
CCAutoreleasePool.cpp fix issue autorelease will not release trigger by autorelease. 2015-03-11 15:31:06 +08:00
CCAutoreleasePool.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCConfiguration.cpp Merge pull request #14709 from kcisoul/v3 2016-01-12 11:35:00 +08:00
CCConfiguration.h Windows/osx/linux build fail bug fixed 2015-12-17 15:40:16 +09:00
CCConsole.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCConsole.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCController-android.cpp updates to JniHelper, refactoring of existing JNI calls 2015-11-27 12:00:33 +03:00
CCController-iOS.mm Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
CCController.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCController.h [ci skip]Update comments 2015-03-24 14:12:58 +08:00
CCData.cpp issue #10323: Fix the compile error when COCOS2D_DEBUG>=2. 2015-06-04 11:58:22 +08:00
CCData.h Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
CCDataVisitor.cpp
…
CCDataVisitor.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCDirector.cpp ouch... doesn't crash on pure C++ projects 2016-01-06 11:16:55 -08:00
CCDirector.h Add cc.Director.EVENT_BEFORE_UPDATE 2015-10-27 17:32:57 +08:00
CCEvent.cpp
…
CCEvent.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCEventAcceleration.cpp
…
CCEventAcceleration.h update comments. 2015-03-27 12:07:19 +08:00
CCEventController.cpp Cleanup order of fields initialization. 2014-10-30 17:28:41 +03:00
CCEventController.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCEventCustom.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCEventCustom.h Merge pull request #11120 from fusijie/cocosapi 2015-03-25 09:49:52 +08:00
CCEventDispatcher.cpp Pass native references to script scope 2015-12-21 00:16:16 +08:00
CCEventDispatcher.h Pass native references to script scope 2015-12-21 00:16:16 +08:00
CCEventFocus.cpp Cleanup order of fields initialization. 2014-10-30 17:28:41 +03:00
CCEventFocus.h Merge pull request #11120 from fusijie/cocosapi 2015-03-25 09:49:52 +08:00
CCEventKeyboard.cpp
…
CCEventKeyboard.h Merge pull request #11120 from fusijie/cocosapi 2015-03-25 09:49:52 +08:00
CCEventListener.cpp issue #10323: Fix the compile error when COCOS2D_DEBUG>=2. 2015-06-04 11:58:22 +08:00
CCEventListener.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCEventListenerAcceleration.cpp add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
CCEventListenerAcceleration.h Merge pull request #11120 from fusijie/cocosapi 2015-03-25 09:49:52 +08:00
CCEventListenerController.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCEventListenerController.h Merge pull request #11120 from fusijie/cocosapi 2015-03-25 09:49:52 +08:00
CCEventListenerCustom.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCEventListenerCustom.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCEventListenerFocus.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCEventListenerFocus.h Merge pull request #11120 from fusijie/cocosapi 2015-03-25 09:49:52 +08:00
CCEventListenerKeyboard.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCEventListenerKeyboard.h Merge pull request #11120 from fusijie/cocosapi 2015-03-25 09:49:52 +08:00
CCEventListenerMouse.cpp EventListenerMouse will dispatch EventMouse events 2015-09-07 20:05:51 +02:00
CCEventListenerMouse.h EventListenerMouse will dispatch EventMouse events 2015-09-07 20:05:51 +02:00
CCEventListenerTouch.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCEventListenerTouch.h Merge pull request #11120 from fusijie/cocosapi 2015-03-25 09:49:52 +08:00
CCEventMouse.cpp initialize _startPointCaptured. 2014-12-15 19:42:25 +08:00
CCEventMouse.h Fixed missing const-correctness 2015-05-20 17:19:42 +02:00
CCEventTouch.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCEventTouch.h Merge pull request #11120 from fusijie/cocosapi 2015-03-25 09:49:52 +08:00
CCEventType.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCGameController.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCIMEDelegate.h [ci skip] Add javascript notes... 2015-03-28 15:11:51 +08:00
CCIMEDispatcher.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCIMEDispatcher.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCMap.h Don't call release() before retain() 2015-09-10 11:09:17 +02:00
CCNS.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCNS.h [ci skip]Update comments 2015-03-27 15:31:42 +08:00
CCNinePatchImageParser.cpp fix Scale9Sprite draw extra pixels in spritesheet 2015-08-26 16:15:00 +08:00
CCNinePatchImageParser.h fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
CCProfiling.cpp Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 2014-08-29 12:55:14 -07:00
CCProfiling.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCProperties.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCProperties.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCProtocols.h add PlayableFrame 2016-01-12 17:21:01 +08:00
CCRef.cpp Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
CCRef.h more js fixes 2015-12-11 15:18:09 -08:00
CCRefPtr.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCScheduler.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCScheduler.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCScriptSupport.cpp support custom action, and rewrite update function 2015-09-09 10:08:07 +08:00
CCScriptSupport.h Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
CCStencilStateManager.cpp change the default alphaThreshold 2015-11-25 14:31:32 +08:00
CCStencilStateManager.hpp rename CCStencilBitsManager to StencilStateManager 2015-11-25 14:24:27 +08:00
CCTouch.cpp Remove default arguments 2015-12-02 11:02:27 +08:00
CCTouch.h Remove default arguments 2015-12-02 11:02:27 +08:00
CCUserDefault-android.cpp Merge pull request #14340 from fnz/easyjni 2016-01-12 11:50:16 +08:00
CCUserDefault-apple.mm Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCUserDefault-winrt.cpp clean up include files for WINRT platforms 2015-10-02 18:49:41 -07:00
CCUserDefault.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCUserDefault.h add UserDefault api deleteValueForKey 2015-07-06 17:01:17 +08:00
CCValue.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCValue.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCVector.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CMakeLists.txt rename CCStencilBitsManager to StencilStateManager 2015-11-25 14:24:27 +08:00
ObjectFactory.cpp fix 2014-09-02 10:51:17 +08:00
ObjectFactory.h Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
TGAlib.cpp fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
TGAlib.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
ZipUtils.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
ZipUtils.h Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
atitc.cpp
…
atitc.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
base64.cpp windows dll version of cpp-tests works 2014-07-15 13:54:08 +08:00
base64.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
ccCArray.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
ccCArray.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
ccConfig.h moves macro definition to `ccConfig.h` 2015-12-29 17:36:02 -08:00
ccFPSImages.c fix libpng warning 2014-12-27 20:47:59 +08:00
ccFPSImages.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
ccMacros.h animate3d callback and test 2015-07-17 11:08:27 +08:00
ccRandom.cpp Fix xcode warning that cause `getEngine` inline expansion 2014-08-12 18:07:17 +09:00
ccRandom.h fix extra @ symbol in Base group 2015-03-27 12:01:20 +08:00
ccTypes.cpp
…
ccTypes.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
ccUTF8.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
ccUTF8.h fix textfield and editbox can not input emoticon 2015-08-05 17:03:06 +08:00
ccUtils.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
ccUtils.h Remove `CC_DLL` in front of `createSpriteFromBase64()` in ccUtils.h to avoid compilation error on windows platform 2015-11-15 23:02:43 +09:00
etc1.cpp
…
etc1.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
firePngData.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
pvr.cpp missing include 2014-07-22 15:49:39 +04:00
pvr.h Copyright & small fixes 2014-07-22 15:49:38 +04:00
s3tc.cpp
…
s3tc.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
uthash.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
utlist.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00