pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 ... # Conflicts: # .travis.yml # build/cocos2d_js_tests.xcodeproj/project.pbxproj # build/cocos2d_tests.xcodeproj/project.pbxproj # cocos/2d/CCFont.h # cocos/2d/CCFontAtlas.cpp # cocos/2d/CCFontAtlas.h # cocos/2d/CCFontFreeType.cpp # cocos/2d/CCFontFreeType.h # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj # cocos/2d/libcocos2d_win10/libcocos2d.vcxproj # cocos/cocos2d.cpp # cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp # templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj # templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj # tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp # tests/cpp-tests/Classes/LabelTest/LabelTestNew.h # tools/bindings-generator # tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj # tools/travis-scripts/generate-bindings.sh # tools/travis-scripts/generate-cocosfiles.sh # tools/travis-scripts/travis_mac.yml		2015-08-02 22:28:27 +08:00
..
3d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d	2015-05-24 22:46:05 +08:00
audioengine	Update comments of some header files	2015-03-27 15:27:08 +08:00
cocos2d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2	2015-06-17 13:04:24 +08:00
cocosbuilder	Update comments of some header files	2015-03-27 15:27:08 +08:00
cocosdenshion	Update comments of some header files	2015-03-27 15:27:08 +08:00
cocostudio	fix lua project compile error	2015-05-25 13:42:54 +08:00
controller	Squashed commit of the following:	2014-09-09 12:18:31 -07:00
extension	Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua	2015-05-18 09:41:35 +08:00
navmesh	Fix compile error on the Linux and update the test cases	2015-06-03 18:12:21 +08:00
network	Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak.	2015-07-14 10:46:17 +08:00
physics3d	Fix the compile error in the release mode	2015-05-18 17:43:20 +08:00
platform	fix android compile error	2015-05-07 10:37:19 +08:00
spine	Update comments of some header files	2015-03-27 15:27:08 +08:00
ui	Fix the compile error on the win32	2015-04-20 11:46:48 +08:00
video	Split luabindings module to some independent modules	2014-07-31 15:20:23 +08:00
CCLuaBridge.cpp	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
CCLuaBridge.h	Update comments of some header files	2015-03-27 15:27:08 +08:00
CCLuaEngine.cpp	add vs2015 support	2015-05-21 13:55:01 +08:00
CCLuaEngine.h	Update comments of some header files	2015-03-27 15:27:08 +08:00
CCLuaStack.cpp	fix: luaLoadChunksFromZIP should just remove .lua or .luac extension	2015-05-20 10:36:05 +08:00
CCLuaStack.h	Update comments of some header files	2015-03-27 15:27:08 +08:00
CCLuaValue.cpp	Adds `std::nothrow` to `new`	2014-08-27 16:31:57 -07:00
CCLuaValue.h	Update comments of some header files	2015-03-27 15:27:08 +08:00
Cocos2dxLuaLoader.cpp	modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte);	2014-11-04 11:51:00 +09:00
Cocos2dxLuaLoader.h	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
LuaBasicConversions.cpp	Add Luabinding conversions for std::map<std::string, std::string>	2015-07-26 07:40:34 +08:00
LuaBasicConversions.h	Add Luabinding conversions for std::map<std::string, std::string>	2015-07-26 07:40:34 +08:00
tolua_fix.cpp	Squashed commit of the following:	2014-04-26 10:11:22 -07:00
tolua_fix.h	Update comments of some header files	2015-03-26 22:07:44 +08:00