Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,376 Commits 3 Branches 31 Tags 1.1 GiB
Commit Graph

222 Commits

Author SHA1 Message Date
CocosRobot 24a63e12ec [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-17 15:08:00 +00:00
CocosRobot 9b003c9cfc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-14 03:34:30 +00:00
CocosRobot ef41cb27ca [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-11 08:02:58 +00:00
CocosRobot 8c76a194fa [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-09 02:32:59 +00:00
CocosRobot eb9d1ea205 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-07 22:55:48 +00:00
CocosRobot dbb8792630 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 07:46:25 +00:00
CocosRobot 167f9adca8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 05:09:11 +00:00
CocosRobot c281630fa6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 00:13:29 +00:00
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
CocosRobot 29208156d9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-01 13:23:21 +00:00
CocosRobot 90d578c6e5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-01 02:16:33 +00:00
CocosRobot 0851363532 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-31 02:06:41 +00:00
CocosRobot c0d6ec1946 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 16:30:01 +00:00
CocosRobot 56b58a5839 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 10:50:00 +00:00
CocosRobot ef7318cf00 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 09:23:06 +00:00
CocosRobot 7a73c65208 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 05:53:20 +00:00
CocosRobot bd867311f1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 20:42:46 +00:00
CocosRobot ac7729332a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-28 10:39:16 +00:00
CocosRobot c8f2514758 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-28 09:21:06 +00:00
CocosRobot f7fced7b70 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-25 05:40:05 +00:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
 2015-07-21 11:39:24 +08:00
CocosRobot 0a23e4a305 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-20 07:08:12 +00:00
CocosRobot f2567f498c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 08:22:58 +00:00
CocosRobot 8442fe5f89 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 06:04:17 +00:00
CocosRobot be71b6d563 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-15 08:23:23 +00:00
CocosRobot 4b418fe823 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-15 05:46:42 +00:00
CocosRobot 6b9a5b8264 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-14 05:41:48 +00:00
CocosRobot 9e60713322 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 14:41:58 +00:00
CocosRobot 300da3e3fc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 12:57:03 +00:00
CocosRobot 0e8a3f14f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-10 09:11:50 +00:00
CocosRobot 2065e5b4a7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-09 07:45:43 +00:00
CocosRobot 9638ae628a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-08 05:48:55 +00:00
CocosRobot 4a486077c0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-07 06:05:39 +00:00
CocosRobot 4c88db3fb2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-07 00:44:47 +00:00
CocosRobot ae860bd6ee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-06 08:29:03 +00:00
CocosRobot 91dc2d22de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-03 10:37:33 +00:00
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 
Conflicts:
	cocos/ui/UICheckBox.cpp
 2015-07-03 10:23:49 +08:00
CocosRobot bf3c970534 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-01 14:12:18 +00:00
kompjoefriek 6eca03fdd2 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
pandamicro 8e9fed936c Add auto bindings 2015-06-19 10:36:36 +08:00
CocosRobot ea2ec582f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 14:05:05 +00:00
CocosRobot 6e849a158d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
CocosRobot 55c7de75e9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 06:48:41 +00:00
CocosRobot 8ec924c206 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-15 05:46:51 +00:00
CocosRobot 60d68ab4de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-12 13:27:20 +00:00
CocosRobot 94a47fabcf [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-11 06:16:36 +00:00
CocosRobot 4fc0366e4d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-08 06:21:14 +00:00
CocosRobot 835e56e80a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-05 23:13:03 +00:00
CocosRobot 9178eeca73 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-05 08:11:21 +00:00
CocosRobot 9e3fa92803 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-05 01:51:34 +00:00
CocosRobot 8865bd488e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-04 12:52:41 +00:00
CocosRobot 76b151c281 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-03 20:25:32 +00:00
CocosRobot 3a1b52cafd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-05-29 06:31:00 +00:00
CocosRobot 892816de3a [AUTO]: updating luabinding & jsbinding automatically 2015-05-29 05:46:22 +00:00
CocosRobot 3bf58ab401 [AUTO]: updating luabinding & jsbinding automatically 2015-05-27 09:08:33 +00:00
CocosRobot 3851e8356e [AUTO]: updating luabinding & jsbinding automatically 2015-05-27 08:00:53 +00:00
CocosRobot 824456b073 [AUTO]: updating luabinding & jsbinding automatically 2015-05-26 21:56:01 +00:00
CocosRobot f18b8bfd95 [AUTO]: updating luabinding & jsbinding automatically 2015-05-22 06:55:54 +00:00
CocosRobot 59807629d9 [AUTO]: updating luabinding & jsbinding automatically 2015-05-22 02:04:38 +00:00
CocosRobot 61aad4581a [AUTO]: updating luabinding & jsbinding automatically 2015-05-19 23:02:24 +00:00
CocosRobot 3e08ec4c11 [AUTO]: updating luabinding & jsbinding automatically 2015-05-18 07:04:27 +00:00
CocosRobot 9572de26d4 [AUTO]: updating luabinding & jsbinding automatically 2015-05-18 05:43:08 +00:00
CocosRobot 006f9fcd36 [AUTO]: updating luabinding & jsbinding automatically 2015-05-14 02:30:32 +00:00
CocosRobot 6bf984f3d3 [AUTO]: updating luabinding & jsbinding automatically 2015-05-13 08:11:34 +00:00
CocosRobot dbb51e2367 [AUTO]: updating luabinding & jsbinding automatically 2015-05-12 05:59:42 +00:00
CocosRobot a7fb56de69 [AUTO]: updating luabinding & jsbinding automatically 2015-05-12 05:23:45 +00:00
CocosRobot e325a3b746 [AUTO]: updating luabinding & jsbinding automatically 2015-05-11 08:33:55 +00:00
CocosRobot b5e9986d17 [AUTO]: updating luabinding & jsbinding automatically 2015-05-11 02:00:41 +00:00
CocosRobot 4195c4b250 [AUTO]: updating luabinding & jsbinding automatically 2015-05-08 02:03:02 +00:00
CocosRobot 8470ab606b [AUTO]: updating luabinding & jsbinding automatically 2015-05-06 01:07:26 +00:00
CocosRobot 534868368e [AUTO]: updating luabinding & jsbinding automatically 2015-05-05 05:48:55 +00:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00