Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/scripting/lua-bindings/auto
History
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
..
api Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 2015-08-02 22:28:27 +08:00
lua_cocos2dx_3d_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-01 13:23:21 +00:00
lua_cocos2dx_3d_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-01 13:23:21 +00:00
lua_cocos2dx_audioengine_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 07:45:19 +00:00
lua_cocos2dx_audioengine_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 09:35:35 +00:00
lua_cocos2dx_auto.cpp Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 2015-08-02 22:28:27 +08:00
lua_cocos2dx_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 09:23:06 +00:00
lua_cocos2dx_cocosbuilder_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
lua_cocos2dx_cocosbuilder_auto.hpp [AUTO]: updating luabinding automatically 2014-08-06 09:14:13 +00:00
lua_cocos2dx_cocosdenshion_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
lua_cocos2dx_cocosdenshion_auto.hpp [AUTO]: updating luabinding automatically 2014-08-06 09:14:13 +00:00
lua_cocos2dx_controller_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
lua_cocos2dx_controller_auto.hpp [AUTO]: updating luabinding automatically 2014-07-11 09:48:20 +00:00
lua_cocos2dx_csloader_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
lua_cocos2dx_csloader_auto.hpp [AUTO]: updating luabinding automatically 2015-04-14 02:12:05 +00:00
lua_cocos2dx_experimental_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
lua_cocos2dx_experimental_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 06:48:41 +00:00
lua_cocos2dx_experimental_video_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-15 05:46:42 +00:00
lua_cocos2dx_experimental_video_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-15 05:46:42 +00:00
lua_cocos2dx_experimental_webview_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
lua_cocos2dx_experimental_webview_auto.hpp [AUTO]: updating luabinding automatically 2015-05-05 03:31:53 +00:00
lua_cocos2dx_extension_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
lua_cocos2dx_extension_auto.hpp [AUTO]: updating luabinding automatically 2015-05-05 03:31:53 +00:00
lua_cocos2dx_navmesh_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
lua_cocos2dx_navmesh_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 03:47:36 +00:00
lua_cocos2dx_physics3d_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-01 13:23:21 +00:00
lua_cocos2dx_physics3d_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-01 13:23:21 +00:00
lua_cocos2dx_physics_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
lua_cocos2dx_physics_auto.hpp [AUTO]: updating luabinding automatically 2015-04-27 09:47:08 +00:00
lua_cocos2dx_spine_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 20:42:46 +00:00
lua_cocos2dx_spine_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 20:42:46 +00:00
lua_cocos2dx_studio_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-27 03:14:03 +00:00
lua_cocos2dx_studio_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-27 03:14:03 +00:00
lua_cocos2dx_ui_auto.cpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-31 02:06:41 +00:00
lua_cocos2dx_ui_auto.hpp [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-21 04:40:43 +00:00