CocosRobot
|
29da95494e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-04-26 03:47:27 +00:00 |
CocosRobot
|
f4c9ea3902
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-04-21 01:54:49 +00:00 |
CocosRobot
|
a9184f1047
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-04-20 09:31:06 +00:00 |
CocosRobot
|
416d2531fc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-04-07 15:25:41 +00:00 |
CocosRobot
|
81448cd1b8
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-04-02 12:06:57 +00:00 |
CocosRobot
|
6e12d8c98a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-03-22 12:58:39 +00:00 |
Xpol Wan
|
ae3fbcce79
|
Manually fixes include path for generated code.
|
2016-03-22 16:08:28 +08:00 |
CocosRobot
|
97130dc084
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-03-21 12:56:42 +00:00 |
Xpol Wan
|
90456d29ba
|
Fixes 1605 include path in 541 files
using the tools/coding-style/include-linter.py with -f options.
|
2016-03-20 21:53:44 +08:00 |
CocosRobot
|
e2f820df25
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-03-18 09:11:18 +00:00 |
CocosRobot
|
16edf90f70
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-03-11 14:40:00 +00:00 |
CocosRobot
|
6e0887b2c9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-03-02 03:38:29 +00:00 |
CocosRobot
|
78c99e33e9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-26 02:11:26 +00:00 |
CocosRobot
|
b2fd4b0c32
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-19 02:19:55 +00:00 |
CocosRobot
|
f1f0a7130f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-14 06:53:19 +00:00 |
CocosRobot
|
89c0c801b0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-11 13:40:35 +00:00 |
CocosRobot
|
b340e48cb1
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-01-20 10:21:41 +00:00 |
Ricardo Quesada
|
d589e44b0a
|
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
Load anchor points from plist files
|
2016-01-13 15:58:02 -08:00 |
CocosRobot
|
b5141a28bd
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-18 13:28:14 +00:00 |
Joachim Grill
|
98079b49e8
|
updated javascript bindings
|
2015-12-15 11:18:32 +01:00 |
CocosRobot
|
8cb2ec6187
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-15 04:31:50 +00:00 |
CocosRobot
|
71f9ead981
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-11 17:52:29 +00:00 |
Ricardo Quesada
|
13dc967b03
|
js_get_or_create_jsobject() and other stuff
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()
Squashed commit of the following:
commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:04:24 2015 -0800
logging added (and commented)
will be useful in the future
commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:00:09 2015 -0800
new js_get_or_create_jsobject<T>
Specializes Template on cocos2d::Ref.
When Ref, it calls the `jsb_ref` functions
commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 13:31:52 2015 -0800
singletons converted
commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 12:20:07 2015 -0800
getDescendants() converted
|
2015-12-07 19:05:23 -08:00 |
Ricardo Quesada
|
d02f4afd4a
|
using new bindings templates
ignores createInstance() from ui
|
2015-12-05 22:26:54 -08:00 |
Ricardo Quesada
|
aebfefd7a8
|
Merge branch 'v3' into js_more_conversions
|
2015-12-04 19:01:20 -08:00 |
Ricardo Quesada
|
cd8631ef09
|
sfunction "create" uses new optimized code
...although this code should never be called
|
2015-12-04 18:42:31 -08:00 |
CocosRobot
|
d5e54bdb81
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-04 09:48:13 +00:00 |
CocosRobot
|
d09eae92f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-04 07:13:02 +00:00 |
CocosRobot
|
3edadc035b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-03 21:34:13 +00:00 |
CocosRobot
|
b1fd2277d8
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-03 07:53:26 +00:00 |
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
|
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
|
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
|
0af77fca90
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-21 08:35:18 +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
|
19561ca84b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-15 06:32:52 +00:00 |
CocosRobot
|
a4cb98d993
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-14 04:01:38 +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
|
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 |
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
|
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
|
c8f2514758
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 09:21:06 +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
|
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
|
91dc2d22de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-03 10:37:33 +00:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02: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
|
94a47fabcf
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-11 06:16:36 +00:00 |
CocosRobot
|
835e56e80a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 23:13:03 +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
|
824456b073
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-26 21:56:01 +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 |