pandamicro
|
1820a006ba
|
Merge pull request #14502 from xiaofeng11/v3_combine_2d
Combine Studio change for 2d components
|
2015-12-04 16:05:24 +08:00 |
XiaoFeng
|
8f9ea8a87e
|
Add missing lua engine export declaration.
|
2015-12-04 15:23:59 +08:00 |
CocosRobot
|
d09eae92f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-04 07:13:02 +00:00 |
XiaoFeng
|
6fb65b5610
|
Editing code as comment.
Move CocosStudioExtension path and update related files.
|
2015-12-04 10:43:39 +08:00 |
CocosRobot
|
fd2d616aed
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-04 02:03:46 +00:00 |
Ricardo Quesada
|
49882ed91c
|
js_cocos2dx_CCGLProgram_createWithString converted to new JSAPI
|
2015-12-03 15:49:56 -08:00 |
Ricardo Quesada
|
b87975096e
|
GLProgram converted to new JSAPI
|
2015-12-03 15:47:39 -08:00 |
Ricardo Quesada
|
67948ff8c8
|
adds jsb_ref_get_or_create_jsobject()
kind of replaces js_get_or_create_jsobject for Ref objets.
Benefits: friendly with the new JS API
takes less space (no template)
|
2015-12-03 15:40:52 -08:00 |
Ricardo Quesada
|
37b4c3fe6a
|
CallFuncN converted to new JS API
|
2015-12-03 15:24:37 -08:00 |
Ricardo Quesada
|
013f5b8d33
|
layerMultiplex converted to new JS API
|
2015-12-03 15:15:47 -08:00 |
Ricardo Quesada
|
3100cba5a1
|
Animation ported to JS
|
2015-12-03 15:02:39 -08:00 |
Ricardo Quesada
|
cc6e72fe7c
|
MenuToggleItem converted
|
2015-12-03 14:54:38 -08:00 |
Ricardo Quesada
|
e5032dccc0
|
rootObject/unrootObject working again
|
2015-12-03 14:49:23 -08:00 |
Ricardo Quesada
|
bd943c5415
|
Sequence/Spawn converted to use new API
|
2015-12-03 13:56:00 -08:00 |
CocosRobot
|
3edadc035b
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-03 21:34:13 +00:00 |
pandamicro
|
c304348c34
|
Merge pull request #14565 from pandamicro/v3
Add js test case for fix, improve template
|
2015-12-03 18:48:34 +08:00 |
pandamicro
|
4cc4dd3a9f
|
Fix Rooting API usage issue in cocos2d_specifics
|
2015-12-03 16:48:25 +08:00 |
CocosRobot
|
b1fd2277d8
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-03 07:53:26 +00:00 |
XiaoFeng
|
70b9183ddb
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
Conflicts:
tools/bindings-generator
|
2015-12-03 14:35:36 +08:00 |
Ricardo Quesada
|
58e4d3c487
|
JS Menu fixes
|
2015-12-02 17:30:54 -08:00 |
Ricardo Quesada
|
48523572b7
|
label JS fixes
|
2015-12-02 17:23:23 -08:00 |
Ricardo Quesada
|
6e50cf883f
|
Sprite::create() using new API...
...also code easier to understand
|
2015-12-02 16:45:28 -08: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 |
XiaoFeng
|
a804c67a12
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
|
2015-12-02 15:07:58 +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 |
XiaoFeng
|
e5d57b4fa2
|
update binding-generator sub module & code
|
2015-12-01 22:30:36 +08:00 |
XiaoFeng
|
ea077c5141
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
Conflicts:
cocos/scripting/js-bindings/manual/js_manual_conversions.h
|
2015-12-01 15:12:32 +08:00 |
CocosRobot
|
e891b03eee
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-12-01 04:32:19 +00:00 |
pandamicro
|
81f590e52a
|
Merge pull request #14478 from pandamicro/v3
Improved JS bindings with more secured memory management
|
2015-12-01 12:24:21 +08:00 |
pandamicro
|
17bdfb4050
|
Fix android compilation issue
|
2015-11-30 15:20:57 +08:00 |
XiaoFeng
|
89ef6da5b5
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
Conflicts:
cocos/2d/CCFontFNT.h
|
2015-11-28 12:48:55 +08:00 |
pandamicro
|
43c68aa16b
|
Fix Chipmunk bindings issue
|
2015-11-27 22:38:16 +08:00 |
CocosRobot
|
5c9084fd7d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-27 09:41:59 +00:00 |
pandamicro
|
e13e0cb886
|
Fix getJSObject issues
|
2015-11-27 14:54:25 +08:00 |
XiaoFeng
|
ec1d76b15e
|
Fix compile error
|
2015-11-27 13:08:22 +08:00 |
XiaoFeng
|
9e50c010e9
|
Fix win8.1 project compile error
|
2015-11-27 11:49:35 +08:00 |
pandamicro
|
1ee7b11e31
|
Refactor jsb_new_proxy and jsb_get_js_proxy with RootedObject
|
2015-11-27 10:20:51 +08:00 |
pandamicro
|
8320c2f702
|
Use rooted object for js_proxy new and get
|
2015-11-27 10:19:13 +08:00 |
pandamicro
|
d23ffe4fc7
|
Fix some issue of js_type_class usage
|
2015-11-27 10:16:11 +08:00 |
pandamicro
|
73c3a5dcf5
|
Activate DEBUG to test
|
2015-11-27 01:35:07 +08:00 |
pandamicro
|
ae2b75c8be
|
Fix issues causing by temporary RootedObject passed as function parameters
|
2015-11-27 01:35:06 +08:00 |
XiaoFeng
|
24dc9f3392
|
update code as comment
|
2015-11-26 17:39:57 +08:00 |
XiaoFeng
|
58dd27efd3
|
add missing return type
|
2015-11-26 17:33:45 +08:00 |
XiaoFeng
|
108d145bf0
|
Add missing luaval and color3b conversion function export
|
2015-11-26 15:08:49 +08: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 |
XiaoFeng
|
928dc3ab1f
|
Add lua value conversion function for cocos studio
|
2015-11-25 23:03:25 +08:00 |
XiaoFeng
|
145943068f
|
Add missing function export
|
2015-11-25 22:35:02 +08:00 |
XiaoFeng
|
9811d6efcf
|
Combine studio change for LuaBinding, jsb and simulator
|
2015-11-25 21:52:44 +08:00 |
CocosRobot
|
06c7b94440
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-25 09:28:43 +00:00 |
zilongshanren
|
b0d88a552a
|
Merge pull request #14419 from xiaofeng11/v3_combine_ui
Combine Studio change for UI components
|
2015-11-25 17:19:54 +08:00 |
pandamicro
|
c202834312
|
Clean up manual bindings code, remove JS_THIS_OBJECT and JS_SET_RVAL
|
2015-11-25 14:33:43 +08:00 |
pandamicro
|
69b2b5720b
|
Use JS::PersistentRooted instead of JS::Heap to prevent delegates and wrappers internal js object from GC
More elegant and secured way, potential crashes exists in previous implementation
|
2015-11-25 14:32:19 +08:00 |
pandamicro
|
be2a3077c2
|
Remove useless manual bindings for addEventListener functions in UI
|
2015-11-25 14:15:45 +08:00 |
pandamicro
|
930405d52c
|
Remove useless manual bindings for MenuItems
|
2015-11-24 16:32:02 +08:00 |
CocosRobot
|
ded045ae26
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-24 07:01:07 +00:00 |
pandamicro
|
378cfa35b6
|
Merge pull request #14394 from super626/v3
Terrain: char* to string
|
2015-11-24 14:53:00 +08:00 |
yangxiao
|
e8d853934b
|
terrain lua bindings
|
2015-11-23 14:33:39 +08:00 |
pandamicro
|
21d0ff846c
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-11-19 17:20:42 +08:00 |
pandamicro
|
0893d7d4ff
|
Fix text color parser for TextField widget
|
2015-11-19 17:17:17 +08:00 |
XiaoFeng
|
b6b35e0c74
|
Fix name space.
|
2015-11-19 15:47:36 +08:00 |
XiaoFeng
|
32f21ca5be
|
Binding ResouceData structure to js to fix auto compile error
|
2015-11-19 14:31:39 +08:00 |
CocosRobot
|
d5b07e5b60
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-19 03:14:03 +00:00 |
CocosRobot
|
0794c7a43c
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-17 04:09:43 +00:00 |
pandamicro
|
c4f9804f5b
|
Merge pull request #14404 from CocosRobot/update_lua_bindings_1447728669
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-17 10:56:58 +08:00 |
pandamicro
|
efde3c3a0e
|
Merge pull request #14403 from pandamicro/v3
Fix issue in ComponentJS::~ComponentJS
|
2015-11-17 10:56:37 +08:00 |
CocosRobot
|
3ee2e7a490
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-17 02:56:26 +00:00 |
pandamicro
|
5bc73c6ede
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-11-17 10:42:05 +08:00 |
pandamicro
|
974bdba154
|
Fix issue in ComponentJS::~ComponentJS
|
2015-11-16 11:50:48 +08:00 |
CocosRobot
|
4ccc6ce5de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-11 06:53:45 +00:00 |
XiaoFeng
|
c0c35c603e
|
Update version number & RELEASE_NOTES.md, prepare 3.9 release
|
2015-11-06 18:38:09 +08:00 |
zhangcheng
|
8183d34b68
|
revert old timelineParser-2.x.js and add "||false" to it.
|
2015-11-06 12:50:36 +08:00 |
zhangcheng
|
76ed15591f
|
Update web submodule to latest.
|
2015-11-06 11:56:45 +08:00 |
CocosRobot
|
f7803cba19
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-04 11:09:49 +00:00 |
mogemimi
|
a31cce9a80
|
Fix minor grammar and typo in documentation
|
2015-11-04 17:14:00 +09:00 |
pandamicro
|
7d93b419fd
|
Merge pull request #14303 from xiaofeng11/v3_fix
Fix ComponentTest in la-test can not load lua file under iOS & Android
|
2015-11-04 13:52:14 +08:00 |
XiaoFeng
|
3223a97b26
|
Fix ComponentTest in la-test can not load lua file under iOS & Android
|
2015-11-03 15:49:46 +08:00 |
mogemimi
|
8f632365c3
|
Fix typos in documentation
|
2015-11-03 04:43:44 +09:00 |
pandamicro
|
c80f523637
|
Merge pull request #14269 from pandamicro/v3
[ci skip]Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
|
2015-10-30 17:20:58 +08:00 |
pandamicro
|
246eab11a1
|
Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
|
2015-10-30 17:19:21 +08:00 |
pandamicro
|
c0ecf7f7aa
|
Merge pull request #14262 from liamcindy/3.9_light_js
update for light3d js reader
|
2015-10-29 13:52:33 +08:00 |
pandamicro
|
617f5265f1
|
Merge pull request #14256 from pandamicro/v3
Use generational gc friendly API in JSTouchDelegate
|
2015-10-29 12:34:42 +08:00 |
unknown
|
f2f6d25408
|
update for light3d js reader
|
2015-10-29 10:04:56 +08:00 |
pandamicro
|
7d832b0753
|
Merge pull request #14238 from pandamicro/v3
Add cc.Director.EVENT_BEFORE_UPDATE
|
2015-10-28 15:50:37 +08:00 |
pandamicro
|
06b828250a
|
Merge pull request #14241 from yuyangame/patch-1
fix cc.game.config['showFPS'] bug
|
2015-10-28 15:48:21 +08:00 |
pandamicro
|
68d75a519a
|
Use generational gc friendly API in JSTouchDelegate
|
2015-10-28 11:55:28 +08:00 |
CocosRobot
|
09cbc2145d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-28 03:29:16 +00:00 |
Kvial
|
27773b6f1a
|
fix cc.game.config['showFPS'] bug
```javascript
//project.json
{
...
'showFPS' : false,
...
}
```
```javascript
//CCBoot.js
...
config[CONFIG_KEY.showFPS] = config[CONFIG_KEY.showFPS] || true;// this property will be set to true
...
```
|
2015-10-27 20:36:05 +08:00 |
pandamicro
|
616eae2b6d
|
Add cc.Director.EVENT_BEFORE_UPDATE
|
2015-10-27 17:32:57 +08:00 |
CocosRobot
|
35f7f3cb2f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-27 09:29:42 +00:00 |
pandamicro
|
c491ddf1e8
|
Merge pull request #14235 from pandamicro/v3
Fix cc.DrawNode.drawPoly
|
2015-10-27 17:19:50 +08:00 |
pandamicro
|
a3c2904e7f
|
Fix cc.DrawNode.drawPoly
|
2015-10-27 16:46:25 +08:00 |
CocosRobot
|
5760e43387
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-26 01:45:38 +00:00 |
mogemimi
|
9df30d2454
|
Fix typos in documentation
|
2015-10-23 16:59:51 +09:00 |
pandamicro
|
530321fe70
|
#14124 Improved JSCallbackWrapper with generational GC and fix the issue
|
2015-10-22 17:00:57 +08:00 |
pandamicro
|
4633a93631
|
Disable bitcode for all targets
|
2015-10-22 12:18:51 +08:00 |
pandamicro
|
d3664b9616
|
#14128 Fix cc.loader.getRes crash caused by null type
|
2015-10-22 01:16:56 +08:00 |
pandamicro
|
9eeda122e9
|
Fix Scheduler API inconsistency
|
2015-10-21 22:10:48 +08:00 |
XiaoFeng
|
428db9c458
|
update js binding version info
|
2015-10-20 17:04:31 +08:00 |