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

108 Commits

Author SHA1 Message Date
Ricardo Quesada c321d35a9a Squashed commit of the following: 
commit 000a025fb4027c26bf05f7296e2d1fbbf21abe6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Dec 2 10:38:27 2015 -0800

    updated submodule

commit b5f45a62b48493f05d75aea865158c371241973d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 19:21:34 2015 -0800

    ooops... thanks Panda

commit 85f0b9c01d5281970f748b6460107bc0ca82cdf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 18:19:16 2015 -0800

    better macro name for GC. Thanks panda

commit e42ad74a664dd2b85cbf4463a6fef8f6abc06664
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 17:10:32 2015 -0800

    RepeatForever, Repeat and Speed converted

commit 3a8130ffc06301c91c836539736bbae456f05b4d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 14:31:32 2015 -0800

    cherry-picking changes to disable retain/release from GC

commit 3ed6e00dc2d9d46248d9374a1f9874cd0b2ba67d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 12:31:04 2015 -0800

    fixes autorelease issues on rebind

commit b65f5f6b16c1542c28b04d66377a27233c6cf214
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 12:23:33 2015 -0800

    my JS changes... again
 2015-12-02 14:45:13 -08:00
CocosRobot edd786e7f6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-02 06:30:18 +00:00
CocosRobot 0c67171b9d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-02 02:05:32 +00:00
CocosRobot e891b03eee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-01 04:32:19 +00:00
CocosRobot 5c9084fd7d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-27 09:41:59 +00:00
CocosRobot 51cfbca523 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-26 06:02:24 +00:00
CocosRobot da9e8548a0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 17:29:11 +00:00
CocosRobot 06c7b94440 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 09:28:43 +00:00
CocosRobot ded045ae26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-24 07:01:07 +00:00
CocosRobot 0794c7a43c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 04:09:43 +00:00
CocosRobot 3ee2e7a490 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 02:56:26 +00:00
CocosRobot 4ccc6ce5de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-11 06:53:45 +00:00
CocosRobot 09cbc2145d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-28 03:29:16 +00:00
CocosRobot 35f7f3cb2f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-27 09:29:42 +00:00
CocosRobot 6a0e1b323f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-20 02:42:17 +00:00
CocosRobot 1919d1a679 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-08 03:50:33 +00:00
CocosRobot b082620d85 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-27 15:24:49 +00:00
CocosRobot c135587962 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-25 08:43:00 +00:00
CocosRobot 9ef7991b99 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 10:43:59 +00:00
CocosRobot 0af77fca90 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 08:35:18 +00:00
CocosRobot c562a57030 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 16:32:43 +00:00
CocosRobot 37cb9afb3f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 14:04:49 +00:00
CocosRobot 79a7878687 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 07:41:46 +00:00
CocosRobot ae8a35a726 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 10:36:16 +00:00
CocosRobot 19561ca84b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 06:32:52 +00:00
CocosRobot 4b3e71e353 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 01:35:59 +00:00
CocosRobot a4cb98d993 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-14 04:01:38 +00:00
CocosRobot e79678454b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-11 09:59:04 +00:00
CocosRobot cfe0be269b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-10 10:14:45 +00:00
CocosRobot b164ac059d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 10:45:05 +00:00
CocosRobot 2423f05024 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 02:37:17 +00:00
CocosRobot 3d6866279a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-26 13:01:17 +00:00
CocosRobot 7117fa24be [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-24 10:13:27 +00:00
CocosRobot 31a09c9f23 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-24 06:13:37 +00:00
CocosRobot 6b6c6b242c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-21 06:44:25 +00:00
CocosRobot 9a6c779580 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-21 03:59:12 +00:00
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