pandamicro
ceac1d9d6a
Merge pull request #14626 from dumganhar/v3
...
Bug fix for shouldStartLoading method, should return value from JS
2015-12-10 09:36:28 +08:00
James Chen
65eb5fa4ba
Bug fix for shouldStartLoading method, should return value from JS, also fix that webview callback is already in Cocos Thread, don't need to post to cocos thread for running again.
2015-12-09 22:40:57 +08:00
lunhao.guo
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
Ricardo Quesada
96ee343884
fixes for windows
2015-12-08 20:07:13 -08:00
Ricardo Quesada
e675657cae
improved docstrings
2015-12-07 19:14:10 -08: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
CocosRobot
7e803cbd0a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-07 03:30:43 +00:00
zilongshanren
c9d32a83b8
Merge pull request #14597 from mogemimi/fix-api-spelling
...
Fix misspelled APIs in v3.10
2015-12-07 11:07:13 +08:00
Ricardo Quesada
d02f4afd4a
using new bindings templates
...
ignores createInstance() from ui
2015-12-05 22:26:54 -08:00
mogemimi
c7640c8aaf
Replace 'resoucedata' with 'resourcedata' in JS Binding
2015-12-05 18:59:54 +09:00
mogemimi
745f54b421
Replace 'ResouceData' with 'ResourceData'
2015-12-05 18:59:54 +09: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
Pan Demosthenous
54ac5d8d2e
fix allocation issue with remote images
2015-12-05 10:10:58 +11:00
pandamicro
d371ec2c8a
Merge pull request #14585 from CocosRobot/update_lua_bindings_1449222153
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 17:53:46 +08:00
pandamicro
51acfa8908
Merge pull request #14581 from xiaofeng11/v3_xf
...
Add missing lua engine export declaration.
2015-12-04 17:51:38 +08:00
CocosRobot
d5e54bdb81
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 09:48:13 +00:00
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
CocosRobot
6a0e1b323f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-20 02:42:17 +00:00
pandamicro
cde67d1261
Merge pull request #14162 from mogemimi/fix-warnings
...
Fix warnings on Xcode 7
2015-10-18 22:56:12 +08:00
pandamicro
c365fc5883
Merge pull request #14180 from pandamicro/v3
...
Fix issue for web engine upgrade
2015-10-18 22:48:16 +08:00
pandamicro
cfb1ee2b11
Improved logic of jsb_boot.js to sync with the web engine behavior
2015-10-18 22:45:53 +08:00
pandamicro
11890d6c4b
Fix issue for web engine upgrade
2015-10-18 00:19:02 +08:00
mogemimi
8af6531c94
Replace deprecated CCApplication with Application
2015-10-16 15:02:06 +09:00
mogemimi
4600c41f9b
Add override keywords
2015-10-16 15:01:10 +09:00
zhangting
27837e0615
return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile
2015-10-14 16:07:42 +08:00
mogemimi
59d7868d4c
Fix minor typos
2015-10-14 15:12:22 +09:00
pandamicro
8b0a6a6c29
Merge pull request #14099 from pandamicro/v3
...
[ci skip]Sync with CCBoot for web
2015-10-10 10:16:16 +08:00
pandamicro
5ae2812bf8
Sync with CCBoot for web
2015-10-10 10:15:36 +08:00
CocosRobot
216438fb9b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-10 01:40:55 +00:00
pandamicro
bc9b59b7f7
Merge pull request #14096 from pandamicro/v3
...
[ci skip]Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:07:27 +08:00
pandamicro
0ea54868e2
Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:01:49 +08:00
CocosRobot
1919d1a679
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-08 03:50:33 +00:00
pandamicro
57ac40b9bc
Fix simulator android x86 release compilation issue
2015-10-08 09:46:50 +08:00
Dale Stammen
32eeb560c3
clean up include files for WINRT platforms
2015-10-02 18:49:41 -07:00
CocosRobot
246fa7ffd8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-29 07:45:48 +00:00
CocosRobot
b082620d85
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-27 15:24:49 +00:00
pandamicro
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
WenhaiLin
f4c56e8605
Fixed compile errors
2015-09-26 19:43:36 +08:00
pandamicro
2a3526a3fd
Fix lua project
2015-09-26 19:43:36 +08:00
pandamicro
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
pandamicro
ddb636a022
Add ScriptComponent and ComponentJS
2015-09-26 19:43:36 +08:00
pandamicro
7e2b8c71a7
Improve lua script component
2015-09-26 19:43:35 +08:00
minggo
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
CocosRobot
c135587962
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-25 08:43:00 +00:00
江龙
9eb05707fb
add custom spine skeletonAnimation test
2015-09-25 13:36:48 +08:00
Nick
003920f826
fix loading pluginx when compile Android with --compile-script flag
2015-09-24 11:41:18 +07:00
CocosRobot
b09b146f97
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-22 09:23:14 +00:00
pandamicro
d3504a9216
Update versions and html5 engine
2015-09-22 02:31:21 +08: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
pandamicro
6ab7f3804e
Merge pull request #13960 from TimothyZhang/jsb-writeDataToFile
...
Add jsb.fileUtils.writeDataToFile()
2015-09-21 10:48:25 +08:00
pandamicro
44329d96ba
Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine
...
Refine lua/js binding tool
2015-09-20 16:42:40 +08:00
zhangting
caaf912a28
add writeDataToFile() for jsb
2015-09-20 15:38:15 +08:00
WenhaiLin
b77d04f593
Fixed link errors
2015-09-19 00:59:28 +08: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
ad65343814
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-18 13:51:58 +00:00
CocosRobot
79a7878687
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-18 07:41:46 +00:00
CocosRobot
fe41739584
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-18 04:07:18 +00:00
pandamicro
4aaf017e4c
Merge pull request #13890 from jianglong0156/addsetUniformLocationWithMatrix
...
add CCGLProgram function binding setUniformLocationWithMatrix
2015-09-17 17:45:16 +08:00
江龙
1b320ac248
add CCGLProgram function binding setUniformLocationWithMatrix
2015-09-17 15:34:41 +08:00
James Chen
0eaf4c6866
[lua] Wrong callback setting for webview:setOnDidFailLoading
2015-09-17 10:52:17 +08:00
pandamicro
0479cca364
Merge pull request #13832 from yangws/downloader
...
Restructure CCDownloader implement on iOS and Android don't use libcurl.
2015-09-16 14:01:28 +08:00
CocosRobot
ae8a35a726
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 10:36:16 +00:00
Vincent Yang
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
CocosRobot
19561ca84b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 06:32:52 +00:00
CocosRobot
c9b30bd391
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 05:45:47 +00:00
pandamicro
dbe3e062bc
Merge pull request #13801 from chengstory/OptimizateDoLayout
...
Move "ui::Helper::DoLayout" to "CreateNode"。
2015-09-15 13:37:00 +08:00
zhangcheng
fb104189d4
Multiplexing ccs.load.
2015-09-15 13:04:45 +08:00
zhangcheng
fa7f97b26e
Adjustment spaces.
2015-09-15 11:35:43 +08:00
zhangcheng
83f5f85f56
add loadWithVisibleSize js function.
2015-09-15 11:16:02 +08:00
CocosRobot
4b3e71e353
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-15 01:35:59 +00:00
pandamicro
89d81bd959
Merge pull request #12281 from lijinlong/v3
...
luabinding enumerateChildren bug
2015-09-14 22:32:56 +08:00
pandamicro
1fd2e65b48
Merge pull request #13799 from CocosRobot/update_lua_bindings_1442203019
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-14 13:12:36 +08:00
CocosRobot
a4cb98d993
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-14 04:01:38 +00:00
James Chen
6073456f23
[Lua] Life control fix for XMLHttpRequest
2015-09-12 17:49:30 +08:00
子龙山人
0e9ae83376
Merge pull request #13782 from CocosRobot/update_lua_bindings_1441965150
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-11 18:06:47 +08:00
CocosRobot
e79678454b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-11 09:59:04 +00:00
pandamicro
2795d0a488
Merge pull request #13779 from pandamicro/v3
...
Fix Chipmunk setCollisionType issue by initializing variables
2015-09-11 17:58:48 +08:00
pandamicro
5a918608c1
Fix Chipmunk setCollisionType issue by initializing variables
2015-09-11 15:23:29 +08: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
pandamicro
f31ebfe331
Merge pull request #13748 from jianglong0156/uniformConversion
...
add uniform conversion
2015-09-09 18:04:07 +08:00
江龙
4509a316cc
add uniform conversion
...
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
2015-09-09 16:03:57 +08:00
CocosRobot
b3976cdd63
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-09 06:08:45 +00:00
CocosRobot
2423f05024
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-09 02:37:17 +00:00
pandamicro
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
江龙
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
pandamicro
eab6dbe6fd
Merge pull request #13711 from minggo/crash-in-dynamic-library
...
don't define static variable in header file or each dynamic lib will have a copy
2015-09-08 11:45:12 +08:00
minggo
d86b256396
don't define static variable in header file or each dynamic lib will have a copy
2015-09-08 11:04:51 +08:00
minggo
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
pandamicro
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
pandamicro
86fb0fc3bc
[JS] Add common APIs for compatibility with web engine
2015-09-06 08:57:43 +08:00
linguofeng
7fc382055b
lua add UPDATE_FAILED ERROR_DECOMPRESS
...
add
cc.EventAssetsManagerEx.EventCode.UPDATE_FAILED
cc.EventAssetsManagerEx.EventCode.ERROR_DECOMPRESS
2015-09-02 11:27:47 +08:00
WenhaiLin
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
pandamicro
8f6f5c1191
Update engine versions
2015-08-31 13:52:15 +08:00
Liam
69da65d7a4
update for jsb_opengl_constants
2015-08-28 08:42:55 +08:00
Liam
ed49250b9b
update for reader
...
1.update for sprite3d cullface
2.sync js code
2015-08-27 18:29:45 +08:00
pandamicro
032bc590b7
Merge pull request #13593 from jianglong0156/fixActionParamError
...
fix Action:Place, RotateTo param wrong number error
2015-08-27 17:44:46 +08:00
江龙
a060a82d88
fix Action:Place, RotateTo param wrong number error
2015-08-27 17:35:09 +08: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
pandamicro
6ee33499b4
Update changelog and versions for v3.8 rc0
2015-08-22 11:56:25 +08:00
CocosRobot
6b6c6b242c
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-21 06:44:25 +00:00
pandamicro
66fbc33ccb
Merge pull request #13501 from pandamicro/camera
...
Add JS and Lua bindings for CCCameraBackgroundBrush
2015-08-21 14:35:15 +08:00
pandamicro
006f300ac9
Add JS and Lua bindings for CCCameraBackgroundBrush
2015-08-21 12:42:36 +08:00
CocosRobot
9a6c779580
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-21 03:59:12 +00:00
pandamicro
f377a9bff1
Merge pull request #13491 from zilongshanren/v3.8
...
add RadioButton and RadioButtonGroup event type
2015-08-21 09:17:46 +08:00
Dale Stammen
d55bc653e0
update c++ debug info settings
2015-08-20 13:25:17 -07:00
andyque
15156a015a
add RadioButton and RadioButtonGroup event type
2015-08-20 22:49:42 +08:00
pandamicro
a54f01ce2b
Merge pull request #13485 from VisualSJ/v3.8-webIndex
...
Update Studio js parser
2015-08-20 18:02:55 +08:00
pandamicro
5ef4f3159e
Merge pull request #13487 from jianglong0156/fixopenglErrorSquash
...
fix opengl test error
2015-08-20 17:47:08 +08:00
jianglong0156
10d5b73c7e
fix opengl test error
...
fix opengl test error, add the condition, when the data type is samewith long, it will reset data
relate pr:#13449
fix open gl show error
2015-08-20 17:42:26 +08:00
VisualSj
a4fec3a5e0
Update Studio js parser
2015-08-20 17:02:41 +08:00
子龙山人
5b0dcd8a10
Merge pull request #13484 from CocosRobot/update_lua_bindings_1440055948
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-20 15:42:06 +08:00
CocosRobot
a3b8423977
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-20 07:39:25 +00:00
子龙山人
f79d2c8a0a
Merge pull request #13483 from zilongshanren/fix-lua-ui-v3.8
...
[ci skip]add missing ui test in Lua
2015-08-20 15:28:25 +08:00
andyque
72496ae426
add missing ui test in Lua
2015-08-20 15:25:09 +08:00
pandamicro
2605865ca6
Fixed #12570 : Correct `cc.pIsSegmentIntersect` for lua
2015-08-19 16:21:31 +08:00
CocosRobot
bf723eab91
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-19 05:55:16 +00:00
子龙山人
1f735b4f0e
Merge pull request #13437 from fusijie/fix_lua_testcase_setPointer_error
...
Fixed setVertexAttribPointer luabinding and Test case.
2015-08-19 11:43:18 +08:00
fusijie
2dbb4ad50e
fixed JSB_glGetUniformfv uniform location is different from index.
2015-08-19 09:53:52 +08:00
fusijie
a799c99b1a
fix setVertexAttribPointer luabinding
2015-08-18 11:46:45 +08:00
CocosRobot
24a63e12ec
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-17 15:08:00 +00:00
pandamicro
81d5a8377f
Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError
...
Remove duplicate function definition, Add function adaptation
2015-08-17 22:56:59 +08:00
pandamicro
be165ef900
Permit webp image loading
2015-08-17 18:55:53 +08:00
jianglong0156
b19e02bdf6
Remove duplicate function definition, Add function adaptation
2015-08-17 18:18:38 +08:00
pandamicro
f2edb1c8f9
Merge pull request #13410 from ZhangMenghe/v3-retinaEffect
...
[ci skip] Fix invisiable testcase of effects
2015-08-17 17:51:04 +08:00
ZhangMenghe
eaa5643c7c
Fix invisiable testcase of effects
2015-08-17 17:26:25 +08:00
VisualSj
c52a81a2c2
Update JS parser
2015-08-17 17:25:17 +08:00
XiaoFeng
72d21ff810
Update reader, add BlendFrame supporting to Skeleton Animation
...
Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.
2015-08-17 13:05:29 +08:00
江龙
06ab98b0ac
improve the comment
2015-08-15 17:04:32 +08:00
jianglong0156
ae8332eb85
add NodeGrid bind
2015-08-14 17:46:34 +08:00
CocosRobot
9b003c9cfc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-14 03:34:30 +00:00
Ricardo Quesada
7047e0fbdb
Merge branch 'v3' into downloader_decouple_squash
2015-08-13 11:07:49 -07:00
CocosRobot
2de6b4ed4c
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-13 09:11:00 +00:00
Ricardo Quesada
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 13 00:13:38 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 61788a0b34188fed5367cab121817db97198bcd8
Merge: 8c1e211 5e21580
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:45:12 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f
Merge: 2ea66af 8d73883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:42:04 2015 -0700
Merge pull request #6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 09:14:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806
Merge: 9272765 08eeca9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 20:11:46 2015 -0700
Merge pull request #5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 10:39:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b
Merge: 5dddbb6 138df42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 06:53:48 2015 -0700
Merge pull request #4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:49:33 2015 -0700
Merge branch 'v3' into cocos_net
commit 0bbc62ee1fbfd107a935131d5d93994e87865afa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:46:55 2015 -0700
more tests... and works
but there is huge bug.
ProgData <vector> needs the position of DownloadUnits <unordered_map>
but <unordered_map> does not guaranty the order.
So in my next commit I"ll merge DownloadUnit with ProgressData
commit 389ed8639a1942f628773616a8e340bc66a0c1d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 13:47:07 2015 -0700
debugging info
commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:47:31 2015 -0700
sync and async tests working ok
commit 999fa7a7bfb28565492f47b39caef7f1a079c183
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:38:38 2015 -0700
adding tests
commit 91ee294942510718400edc0d00d3c744d00339ee
Merge: 76ab703 7f215e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 10:03:50 2015 -0700
Merge branch 'v3' into cocos_net
commit 76ab7032d3a21156f05395a021391a16649f755a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 00:22:20 2015 -0700
Downloader tests
commit b65c4dad7089660bfe697c0dab3e9290d1a6d013
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 21:34:54 2015 -0700
compiles on Xcode 7
commit ec0d66340b8daf0b042d36333dff759cd424f465
Merge: 878e4b5 0d77838
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 11:02:24 2015 -0700
Merge branch 'v3' into cocos_net
commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 18:07:02 2015 -0700
working, yeah!
commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 17:49:59 2015 -0700
code is more thread-safe friendly
commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 16:39:02 2015 -0700
fixes callbacks
commit ddab4d753106c6ff11304c1c69739c5611e3f20a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 15:43:51 2015 -0700
cleaner code
runs callbacks in cocos2d thread only if needed
commit ef75844aaa010633e6e27ae6e69460174460d5c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:58:04 2015 -0700
removed weak_ptr<> from ProgressData
that logic of the code is added in the callbacks
commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:54:07 2015 -0700
checks whether or not the callbacks are in the cocos2d thread
commit ae6594a6f866f6b5015ba293db23343887063d2f
Merge: 4c61069 6831e24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 10:48:34 2015 -0700
Merge branch 'v3' into cocos_net
commit 4c61069a7e0e33fa0332df700cc8df4807178caf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 21:36:50 2015 -0700
almost there...
Downloader has std::vector<FILE*> instead of FileDescriptors
code cleaner...
commit c34d04a8218d2be5c316e0487e5ac46792bbed76
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 20:38:44 2015 -0700
passes progressData to batch
no need to alloc memory for each ProgressData
commit f7e8bbd8b85f214b919bce6118d4158dd6d26368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 17:47:23 2015 -0700
tidier code and more optimizations
commit a486dc78aedcf9c6178e490292edd572f8a7b374
Merge: 4178327 a06421b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 14:03:22 2015 -0700
Merge branch 'v3' into cocos_net
commit 417832705910a6ebd16a876cd98064ea16f0f45c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 18:13:13 2015 -0700
not finished yet...
...but trying to have a common inteface with batched and non-batched
downloads
commit 1d0e4652763c2e1511ac102a62defae6c6a89220
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 16:29:39 2015 -0700
ErrorCallback compiles
starting the batching code
commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18
Merge: c180425 8d836da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 10:28:51 2015 -0700
Merge branch 'v3' into cocos_net
commit c180425d8181b8e6f53be766d8d2b94f908ae168
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 15:35:53 2015 -0700
More progress on migrating multiple-file downloader
to the implementation file
commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 14:00:02 2015 -0700
Dowloader moved to `cocos2d::network`
commit 14b1d0825106701b5435a266b255f09291b6486b
Merge: 13cfc8d f744383
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:13:55 2015 -0700
Merge branch 'v3' into cocos_net
commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:11:45 2015 -0700
DownloadUnits belong to network
commit e6e17564ead1fb7f6f7df343b0627a104cd756f8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 12:23:36 2015 -0700
adds `check for option`
commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 10:37:51 2015 -0700
Downloader: using URLDownload in one case.
3 more to go. Not tested yet
commit 9b26e9cfac425635027189ccab835054b68bc83d
Merge: 20fe063 253d9c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 08:35:53 2015 -0700
Merge branch 'v3' into cocos_net
commit 20fe0636e36ae7f1da048545b3345f526d5b64de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 17:36:07 2015 -0700
URLDownload: initial commit
HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d
guidelines
Adds `CCIRULDownload` interface.
Adds `CCURLDownload` implementation based on libcurl. Not working yet.
`Downloader` uses `URLDownload` for some of its functions.
WIP
commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0
Merge: e408fe0 642ccac
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 14:00:43 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into cocos_net
commit e408fe0b9303813d20bab2f7bf548f3b7af416a6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 13:59:46 2015 -0700
Adds more files to Xcode project
...even if they are not being compiled. Much easier to add missing
functionality to the rest of the platforms
commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 11:36:57 2015 -0700
removes unneeded headers
2015-08-13 00:14:10 -07:00
CocosRobot
9fd18f987e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-13 02:53:50 +00:00
andyque
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
CocosRobot
ef41cb27ca
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 08:02:58 +00:00
CocosRobot
aa6ac72405
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 01:58:29 +00:00
pandamicro
1471936c2f
Merge pull request #13249 from pandamicro/v3
...
Made SocketIO events correctly fired when compile in release mode
2015-08-10 13:32:09 +08: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
jianglong0156
2c3b9009cb
fix the node color property can not use
...
code example:
````
node.color = xxxx // fix it
````
2015-08-07 17:26:35 +08:00
XiaoFeng
91c88ec535
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
2015-08-06 18:12:08 +08:00
pandamicro
a170b1caf1
Made SocketIO events correctly fired when compile in release mode
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13248
Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode.
Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually.
I also did the following in this commit:
- Correct the coding style in jsb_socketio.cpp
- Remove android.mk in the Xcode project
2015-08-06 17:20:04 +08:00
子龙山人
47fe470647
Merge pull request #13213 from jianglong0156/improUtfFunction
...
add api getStringUTFCharsJNI newStringUTFJNI
2015-08-05 17:26:52 +08:00
jianglong0156
9a257d8136
fix lua pai error
2015-08-05 16:15:22 +08:00
jianglong0156
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
pandamicro
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
jianglong0156
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
VisualSj
b9b565e64a
Update JSON parser
2015-08-04 16:04:35 +08:00
pandamicro
744fa0b565
Merge pull request #13194 from VisualSJ/v3-boneTest
...
[ci skip] Update JSON parser
2015-08-04 15:35:27 +08:00
VisualSj
04465ac4f4
Update JSON parser
2015-08-04 15:15:46 +08:00
jianglong0156
979700e343
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
2015-08-04 11:30:30 +08:00
CocosRobot
3e71ce33c8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 10:09:10 +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
pandamicro
702e667143
Merge pull request #13152 from zilongshanren/addVerticalPageView
...
add PageView vertical scroll support
2015-08-03 13:00:48 +08:00
andyque
2427c15b60
modify vertical scroll direction
2015-08-03 11:38:23 +08: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
jianglong0156
5d281d45ef
recover the physics3DShape initHeightfield api
2015-08-01 18:29:48 +08:00
andyque
5f34c1f072
add PageView vertical scroll support
2015-08-01 18:18:46 +08:00
jianglong0156
69040ef472
add Physics3DHingeConstraint support constructor
...
add Physics3DSliderConstraint support constructor
add Physics3DConeTwistConstraint support constructor
add Physics3D6DofConstraint support constructor
add PhysicsSprite3D support constructor
2015-08-01 16:18:00 +08:00
jianglong0156
bcec599993
Merge branch 'v3' into constructedWith3D_3#12404
2015-08-01 15:38:26 +08:00
CocosRobot
90d578c6e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 02:16:33 +00:00
pandamicro
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
jianglong0156
dcda083efa
rename the initTerrain to initWithTerrainData
2015-07-31 18:35:47 +08:00
jianglong0156
80e812e5a0
add Physics3DShape support constructor
2015-07-31 18:17:35 +08: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
pandamicro
34724e41b2
Merge pull request #13092 from pandamicro/audioengine
...
Add AudioEngine js bindings
2015-07-31 00:22:04 +08:00
pandamicro
3fa016a280
Fix win32 project and add winrt support
2015-07-30 23:39:52 +08:00
pandamicro
c0066f9afd
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
2015-07-30 20:25:57 +08:00
CocosRobot
56b58a5839
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 10:50:00 +00:00
pandamicro
5aa8647309
Merge pull request #13117 from CocosRobot/update_lua_bindings_1438251761
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 18:45:15 +08:00
pandamicro
8542f8a7a9
Merge pull request #13067 from pandamicro/scrollviewbar
...
Bind UIScrollViewBar
2015-07-30 18:42:08 +08:00
CocosRobot
b167d29a80
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 10:27:28 +00:00
jianglong0156
113233b8df
add Camera support constructor
2015-07-30 18:00:51 +08:00
pandamicro
507a094653
Merge pull request #13108 from jianglong0156/constructedWith3D#12404
...
improve jsval_to_physics3DRigidBodyDes
2015-07-30 17:58:16 +08:00
CocosRobot
ef7318cf00
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 09:23:06 +00:00
jianglong0156
0f9483a0e3
add SpotLight support constructor
2015-07-30 15:21:35 +08:00
jianglong0156
8d3ceb7ac2
add PointLight support constructor
2015-07-30 15:11:37 +08:00
jianglong0156
52ed2e8d4e
add conversion function declare, use to the physics3d auto conversion the data
2015-07-30 14:56:24 +08:00
jianglong0156
b16ee0e45d
add file in project file with android, linux wp8.1 (reverted from commit 948628b800
)
2015-07-30 14:46:10 +08:00
jianglong0156
73125f46d2
add file in project file with android, linux wp8.1 (reverted from commit 948628b800
)
2015-07-30 14:38:20 +08:00
jianglong0156
a1a9e281a3
add conversion cpp file into iOS project (reverted from commit 439bc8a99f
)
2015-07-30 14:37:58 +08:00
CocosRobot
7a73c65208
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 05:53:20 +00:00
CocosRobot
f1adc2ffd2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 03:39:17 +00:00
CocosRobot
bd867311f1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-29 20:42:46 +00:00
Ricardo Quesada
642ccac5dc
Merge pull request #12927 from ricardoquesada/spine-2.3
...
Adds support for Spine runtime 2.3
2015-07-29 13:33:15 -07:00
pandamicro
f53ba42b3b
Fix test issues and Add audio engine to js templates
2015-07-29 21:22:44 +08:00
pandamicro
9972bfb98c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
...
# Conflicts:
# tests/js-tests/src/NativeTest/NativeTest.js
2015-07-29 21:01:56 +08:00
pandamicro
da4e062614
Add js wrapper for audio engine
2015-07-29 20:47:28 +08:00
VisualSJ
179266240f
Update js parser (timelineParser-2.x.js)
2015-07-29 19:49:54 +08:00
CocosRobot
8c642d966f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-29 07:45:19 +00:00
pandamicro
3089ac302e
Refine ui bindings and JS constants
2015-07-29 13:06:49 +08:00
CocosRobot
ac7729332a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-28 10:39:16 +00:00
pandamicro
8e883f9956
Merge pull request #13049 from jianglong0156/constructedWith3D#12404
...
Some 3d classes can't be constructed with new in JS
2015-07-28 18:31:04 +08:00
CocosRobot
c8f2514758
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-28 09:21:06 +00:00
jianglong0156
f71f9b2b15
improve the code
2015-07-28 16:32:56 +08:00
pandamicro
3fa9463ec7
Fix manual bindings for changed API in spine
2015-07-28 15:11:20 +08:00
pandamicro
ca54340982
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-28 13:00:10 +08:00
jianglong0156
439bc8a99f
add conversion cpp file into iOS project
2015-07-28 10:48:18 +08:00
jianglong0156
948628b800
add file in project file with android, linux wp8.1
2015-07-28 10:26:45 +08:00
jianglong0156
ec4d53fcf7
add 3d conversion
2015-07-28 10:08:58 +08:00
jianglong0156
d5a6522a37
Merge branch 'v3' into constructedWith3D#12404
2015-07-28 09:59:35 +08:00
jianglong0156
6d83a3cea4
add Physics3DWorld support new
2015-07-27 18:22:56 +08:00
jianglong0156
cb2b427eed
add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp
2015-07-27 18:19:10 +08:00
jianglong0156
9c6b5730d0
add Physics3DPointToPointConstraint support new
2015-07-27 16:02:13 +08:00
jianglong0156
1be5981d6a
add Physics3DComponent support new
2015-07-27 14:26:50 +08:00
jianglong0156
4005ef6588
add skybox support new
2015-07-27 11:19:17 +08:00
CocosRobot
d9b5ce8d28
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-27 03:17:29 +00:00
CocosRobot
e986aac617
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-27 03:14:03 +00:00
jianglong0156
48147ff08a
add the Animate3D and Animation3D js implements
2015-07-27 10:53:34 +08:00
dualface
bd39247192
Add Luabinding conversions for std::map<std::string, std::string>
2015-07-26 07:40:34 +08:00
pandamicro
5be905c181
Merge pull request #13017 from pandamicro/v3.7.1
...
[ci skip] Release docs for v3.7.1
2015-07-25 15:17:52 +08:00
pandamicro
a2a32ef58c
Release docs for v3.7.1
2015-07-25 15:16:39 +08:00
pandamicro
33007e832f
Merge pull request #13014 from CocosRobot/update_lua_bindings_1437802542
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-25 13:40:55 +08:00
CocosRobot
f7fced7b70
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-25 05:40:05 +00:00
pandamicro
fba892f4aa
Merge pull request #13002 from VisualSJ/v3.7.1-12940
...
[ci skip]Issue #12940 : Fixed a bug that is removing SimpleAudio play
2015-07-25 13:20:27 +08:00
pandamicro
fa46a0abb4
Merge pull request #12992 from yangws/v3.7.1
...
Fixed #12962 : Scene can't have std::vector member.
2015-07-25 09:52:00 +08:00
pandamicro
a666658764
Merge pull request #12998 from pandamicro/v3.7.1
...
Add BoneNode/SkeletonNode/SkinNode JS bindings
2015-07-24 23:42:38 +08:00
pandamicro
05bb775438
Sync timelineParser and fix issue
2015-07-24 20:16:56 +08:00
pandamicro
54330576e6
Fix JS binding issues for skeleton animation
2015-07-24 20:16:01 +08:00
VisualSj
cf70cb9c40
Issue #12940 : Fixed a bug that is removing SimpleAudio play
2015-07-24 17:41:01 +08:00
VisualSj
2b05ca731c
Issue #12941 : Fixed a bug that is ccs.Skin ctor error in jsb
2015-07-24 17:34:04 +08:00
pandamicro
29b9ed685f
Add BoneNode/SkeletonNode/SkinNode JS bindings
2015-07-24 15:48:34 +08:00
Vincent Yang
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
Ricardo Quesada
2deb492d36
compiles and runs on Xcode 7
2015-07-23 14:28:23 -07:00
pandamicro
6110700615
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
2015-07-23 15:25:33 +08:00
pandamicro
739befdc08
Add audio engine bindings in JSB
2015-07-23 14:43:01 +08:00
pandamicro
5b8371aaa2
Merge pull request #12958 from VisualSJ/v3.7.1-bindCallback
...
[ci skip] Parse Touch/Click callback in JS Studio parser
2015-07-23 09:30:40 +08:00
VisualSj
d4900493e2
JS Studio parser (Modify callback method)
2015-07-22 17:56:35 +08:00
VisualSj
b282d75346
Parse Touch/Click callback in JS Studio parser
2015-07-22 16:51:44 +08:00
VisualSj
1496224c6d
Add cc.affineTransformConcatIn
2015-07-22 15:21:13 +08:00
Vincent Yang
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
XiaoFeng
fcd7388936
Synchronize skybox parser with C++ version
2015-07-22 09:45:35 +08:00
pandamicro
25dff88ff4
Merge pull request #12922 from xiaofeng11/v3.7-release
...
[ci skip]Add Skybox parser to js
2015-07-22 09:12:38 +08:00
CocosRobot
6630157377
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-21 04:40:43 +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
pandamicro
65f647ce00
Merge pull request #12879 from pandamicro/v3.7-release
...
[ci skip] Update versions and docs for v3.7
2015-07-16 16:55:24 +08:00
pandamicro
e2068ab84a
Update versions and docs for v3.7
2015-07-16 16:53:43 +08:00
CocosRobot
f2567f498c
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-16 08:22:58 +00:00
pandamicro
b094367c94
Merge pull request #12874 from pandamicro/v3.7-release
...
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 16:15:26 +08:00
pandamicro
949eca2846
Improve some manual binding code
2015-07-16 14:34:14 +08:00
pandamicro
490d5a3747
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 14:09:26 +08:00
CocosRobot
8442fe5f89
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-16 06:04:17 +00:00
pandamicro
0b1d105803
Merge pull request #12870 from VisualSJ/v3.7-release-parser
...
[ci skip] Fixed parser's bug
2015-07-16 13:04:06 +08:00
VisualSj
0bb385f37c
Check texture for existence
2015-07-16 11:54:45 +08:00
VisualSj
ef70e1f996
Fixed a bug that is Armature parser
2015-07-16 10:30:22 +08:00
CocosRobot
be71b6d563
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 08:23:23 +00:00
pandamicro
436564f922
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
docs/RELEASE_NOTES.md
web
2015-07-15 14:39:40 +08:00
CocosRobot
4b418fe823
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 05:46:42 +00:00
pandamicro
c126aac35f
v3.7 rc1 release doc
2015-07-14 23:21:34 +08:00
pandamicro
eb56ad6d60
Merge pull request #12836 from pandamicro/v3.7-release
...
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 17:37:00 +08:00
pandamicro
a90a8b12c6
Merge pull request #12840 from pandamicro/path
...
[ci skip] Add cc.path.mainFileName
2015-07-14 16:41:16 +08:00
子龙山人
7e4e82da2c
Merge pull request #12835 from zilongshanren/improve-coding-style
...
add more descriptive message to ASSET macro.
2015-07-14 16:36:59 +08:00
pandamicro
41778f35fb
Add cc.path.mainFileName
2015-07-14 16:33:38 +08:00
pandamicro
658fe74141
Merge pull request #12838 from VisualSJ/v3.7-release-parser
...
[ci skip] Remove getRes (parser)
2015-07-14 16:20:42 +08:00
pandamicro
efffea5b91
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 15:35:29 +08:00
andyque
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
VisualSj
a9deb6dda5
Remove getRes (parser)
2015-07-14 15:26:13 +08:00
pandamicro
09775d6f2a
Ensure backward compatibility
2015-07-14 14:14:36 +08:00
CocosRobot
6b9a5b8264
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-14 05:41:48 +00:00
pandamicro
43a5b6f020
Fix jsb loaders issues
2015-07-14 13:40:09 +08:00
子龙山人
e1ae3631fc
Merge pull request #12818 from zilongshanren/v3
...
merge v3.7 back to v3
2015-07-14 13:32:56 +08:00
andyque
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
Vincent Yang
0a6933cc8c
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak.
2015-07-14 10:46:17 +08:00
andyque
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08: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
8b50c307e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-13 09:35:35 +00:00
XiaoFeng
a68835733f
Add Skybox parser to js
2015-07-13 16:02:19 +08:00
CocosRobot
0e8a3f14f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-10 09:11:50 +00:00
pandamicro
69cdaca306
Auto add extend to jsb need to extend classes
2015-07-10 09:49:39 +08:00
CocosRobot
2065e5b4a7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-09 07:45:43 +00:00
VisualSj
9f52b1e6fb
Fixed a bug that is SingleNode setColor is null
2015-07-09 11:49:11 +08:00
CocosRobot
bfe6db174e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-09 01:07:59 +00:00
CocosRobot
9638ae628a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-08 05:48:55 +00:00
pandamicro
8f0cf8c3e6
Merge pull request #12575 from ywxzm/v3
...
fix onTouch begin don't return value
2015-07-07 14:57:13 +08:00
pandamicro
e717155930
Merge pull request #12715 from VisualSJ/v3.7-release2
...
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
2015-07-07 14:13:31 +08:00
CocosRobot
4a486077c0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-07 06:05:39 +00:00
pandamicro
5970f56e1f
Merge pull request #12714 from VisualSJ/v3.7-release2
...
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
2015-07-07 13:55:12 +08:00
VisualSj
dd0edac171
Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
2015-07-07 13:36:47 +08:00
andyque
6238ddebf3
Merge remote-tracking branch 'upstream/v3.7-release' into v3
2015-07-07 10:18:43 +08:00
CocosRobot
4c88db3fb2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-07 00:44:47 +00:00
CocosRobot
a4bce56cca
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-06 10:37:24 +00:00
VisualSj
3b69a1726f
Fixed a bug that action texture address error
2015-07-06 17:17:20 +08:00
CocosRobot
ae860bd6ee
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-06 08:29:03 +00:00
CocosRobot
fbf98adc7a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-03 14:48:11 +00:00
CocosRobot
91dc2d22de
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-03 10:37:33 +00:00
pandamicro
1f48beee1e
Reorganize code
2015-07-03 12:55:55 +08:00
pandamicro
155b9b918c
Add retain/release for XMLHTTPReqest in JSB
2015-07-03 11:01:43 +08: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
pandamicro
dbd72d0123
Merge pull request #12646 from VisualSJ/v3.7-release
...
[ci skip] Fixed a bug that is don't analytical frame
2015-07-02 17:22:13 +08:00
Sijie.Wang
7818bfcc7a
Fixed a bug that is don't analytical frame
2015-07-02 14:30:44 +08:00
pandamicro
079ccbb0e2
Merge pull request #12639 from VisualSJ/v3.7-release
...
Fixed a bug that is LayoutComponent position error
2015-07-02 13:58:15 +08:00
VisualSJ
a475caf35a
Fixed a bug that is LayoutComponent position error
2015-07-02 11:52:31 +08:00
CocosRobot
bf3c970534
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-01 14:12:18 +00:00
pandamicro
3b9fd5502e
Fix cc.isArray for JSB
2015-07-01 21:57:39 +08:00
zhang
48c3466774
Update LayerEx.lua
2015-07-01 20:25:45 +08:00
pandamicro
4d95c8778b
Merge pull request #12598 from shinhirota/v3
...
Fixed iOS/JS-Bind callStaticMethod() with bool arg
2015-07-01 11:34:03 +08:00
Bin Zhang
d0db3aee98
Remove the plugin-x related files from the Xcode project of js-bindings .
2015-06-30 17:28:47 +08:00
子龙山人
077241eecf
Merge pull request #12599 from jianglong0156/jsbProjectMerge
...
merge the jsb project into cocos2d project
2015-06-30 17:04:12 +08:00
Bin Zhang
bb77101f0b
Solve the error when building simulator for android.
2015-06-30 16:45:13 +08:00
jianglong0156
185b4419be
merge job project into cocos2d-x project
2015-06-30 13:49:24 +08:00
Shin Hirota
221d33a431
Fixed iOS/JS-Bind callStaticMethod() with bool arg
2015-06-30 14:00:28 +09:00
子龙山人
29cccf631e
Merge pull request #12550 from kompjoefriek/v3-vibrate
...
Vibrate support in v3
2015-06-30 10:28:59 +08:00
Dale Stammen
38b687f8d8
enable support for keyboard on winrt platforms to fix back button
2015-06-29 09:13:19 -07:00
pandamicro
15c763d84a
Update engine version
2015-06-29 18:21:06 +08:00
zhang
43ea04da3c
fix onTouch begin don't return value
...
fix only receive "begin" envent,can't receive "moved" "ended"
2015-06-28 13:18:33 +08:00
kompjoefriek
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
jianglong0156
11ac928f59
winrt use touch event replace mouse event
2015-06-25 17:44:03 +08:00
jianglong0156
c60e9dfc9e
winrt not suppot mouse
2015-06-25 17:25:27 +08:00
pandamicro
04af5dfbe3
#12494 Upgrade platform constants for WP8 & WINRT
2015-06-23 23:23:25 +08:00
江龙
7ff383e4d2
add the return value
2015-06-23 20:27:30 +08:00
pandamicro
ac138a3287
Merge pull request #12474 from xiaofeng11/v3_xiaofeng
...
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
2015-06-23 16:27:32 +08:00
XiaoFeng
befe97a78b
Update js parser for compatible with CocosStudio 2.3.2 json format export
2015-06-23 16:24:53 +08:00
子龙山人
8ca0f18575
Merge pull request #12446 from pandamicro/v3
...
Add auto bindings for navmesh
2015-06-19 17:21:00 +08:00
pandamicro
7b1694bfeb
Merge pull request #12443 from VisualSJ/v3-aa
...
[ci skip]Studio parser: Code for defense
2015-06-19 14:24:39 +08:00
VisualSJ
8fa755d0e4
Studio parser: Code for defense
2015-06-19 13:15:10 +08:00
VisualSJ
ea0ab5c738
Studio parser: Code for defense
2015-06-19 11:13:07 +08:00
pandamicro
8e9fed936c
Add auto bindings
2015-06-19 10:36:36 +08:00
pandamicro
276ce3a0a7
Update versions
2015-06-19 09:56:19 +08:00
pandamicro
c6d4f283bb
Fix compilation issue in navmesh conversion
2015-06-19 08:11:45 +08:00
pandamicro
f405d00336
Fix linux compilation
2015-06-19 01:14:16 +08:00
江龙
91bc19fb29
Merge branch 'v3_origin' into navmesh
...
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
2015-06-18 23:50:19 +08:00
江龙
8fc5835dee
modify linux file
2015-06-18 23:29:04 +08:00
江龙
61db9ef103
modify cocos2d_specifics , add navmesh head file。 modify template。add navmesh head file and register code
2015-06-18 23:21:53 +08:00
江龙
8c97fec5af
add navmesh project file path
2015-06-18 23:17:49 +08:00
jianglong0156
618d8f01e8
Merge pull request #9 from pandamicro/navmesh
...
Improve bindings for navmesh
2015-06-18 23:15:05 +08:00
pandamicro
b757837239
Move NavMesh to jsb namespace
2015-06-18 22:57:41 +08:00
jianglong0156
56382aae37
winphone project
2015-06-18 22:50:24 +08:00
CocosRobot
ea2ec582f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 14:05:05 +00:00
CocosRobot
e2268bb16f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 22:00:57 +08:00
CocosRobot
c069da629e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 22:00:56 +08:00
pandamicro
e09ba8080f
Fix create Sprite with PolygonInfo issue
2015-06-18 21:48:57 +08:00
jianglong0156
05c40b13f9
fix the win32 head error
2015-06-18 21:30:30 +08:00
pandamicro
10a8adad53
Change physics3d api to jsb namespace
2015-06-18 20:39:40 +08:00
jianglong0156
e0b66707f9
add nerviest android file
2015-06-18 19:30:05 +08:00
jianglong0156
4fe1542d17
add navmesh tests
2015-06-18 19:22:27 +08:00
CocosRobot
6e849a158d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 08:18:00 +00:00
pandamicro
aa566a3722
Merge pull request #12424 from pandamicro/physics3d
...
Fix Physics3D test and js bindings
2015-06-18 16:09:49 +08:00
jianglong0156
85c40b6580
Merge pull request #8 from pandamicro/physics3d
...
Physics3d
2015-06-18 14:54:32 +08:00
pandamicro
811173ea3b
Fix Physics3D test and js bindings
2015-06-18 14:33:16 +08:00
CocosRobot
b76db94725
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 05:43:02 +00:00
pandamicro
7952477469
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d
2015-06-18 12:05:01 +08:00
pandamicro
3ffc0e6be6
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
2015-06-18 09:20:37 +08:00
pandamicro
a94b49bdef
Add nav mesh bindings
2015-06-17 23:41:12 +08:00
pandamicro
85e8a407b1
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
...
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
2015-06-17 19:58:24 +08:00
samuele3hu
683812d817
Update Physics3D test for js.
2015-06-17 18:50:55 +08:00
jianglong0156
b265033a41
add testcase and manual bindings
2015-06-17 18:38:18 +08:00
jianglong0156
897b5fd0e9
add navmesh test project file and binding file
2015-06-17 18:37:19 +08:00
CocosRobot
22f04da582
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-17 07:18:18 +00:00
CocosRobot
55c7de75e9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-17 06:48:41 +00:00
Jacky
3c5ab4f518
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
CocosRobot
6bed988354
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-17 03:47:36 +00:00
pandamicro
e4d5db30eb
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
2015-06-16 15:09:06 +08:00
samuele3hu
a547d6aa33
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation
...
Conflicts:
tools/bindings-generator
2015-06-16 11:36:11 +08:00
WuHao
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
Hao Wu
b4ca8c1489
Merge pull request #15 from pandamicro/spritepolygon
...
Add SpritePolygon JSB bindingsJSB bindings
2015-06-15 15:47:02 +08:00
CocosRobot
8ec924c206
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-15 05:46:51 +00:00
pandamicro
852b9b42b9
Remove jsb_cocos2dx_experimental_manual
2015-06-15 10:46:57 +08:00
pandamicro
032f231ed4
Add bindings for AutoPolygon and PolygonInfo
2015-06-13 11:14:57 +08:00
CocosRobot
60d68ab4de
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-12 13:27:20 +00:00
pandamicro
f9057b3f32
Merge pull request #12284 from pandamicro/v3
...
Fix template android compilation issue on physics3d
2015-06-12 21:10:40 +08:00
Jacky
29c108bdef
Merge remote-tracking branch 'origin' into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-12 16:28:41 +08:00
pandamicro
e9d648f151
Fix physics 3d macro include issue
2015-06-12 15:41:46 +08:00
pandamicro
df1219c92d
Update manual conversion for sprite polygon
2015-06-12 12:56:37 +08:00
pandamicro
9acc51a5eb
Merge pull request #12301 from jianglong0156/webviewCrash
...
fix webview crash in android
2015-06-12 08:12:14 +08:00
pandamicro
12de53726d
Merge pull request #12182 from VisualSJ/v3-jsb
...
[ci skip] Synchronization studio parser
2015-06-11 17:35:15 +08:00
jianglong0156
c317eb428a
fix webview crash in android
2015-06-11 17:28:02 +08:00
samuele3hu
1b20e463d8
Update the Lua binding about the Polygon and update the test case.
2015-06-11 14:38:38 +08:00
CocosRobot
94a47fabcf
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-11 06:16:36 +00:00
VisualSJ
2d12d6a295
Plist file parsing (action-2.x.js)
2015-06-11 11:14:10 +08:00
lijinlong
370845a738
luabinding enumerateChildren bug
...
第一次调用enumerateChildren的回调时将lua handler释放了,下次再进入回调时报错,将handler释放提到enumerateChildren调用完成后
2015-06-10 17:15:01 +08:00
VisualSJ
3306c7b072
Fixed control LayoutComponent positioning bug
2015-06-08 15:41:33 +08:00
CocosRobot
4fc0366e4d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-08 06:21:14 +00:00
VisualSJ
060ab85f22
Fixed UIText color settings bug
2015-06-08 13:58:08 +08: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
pandamicro
e0eff26674
Fix component function execution issue in JSB
2015-06-05 00:03:21 +08:00
pandamicro
25e047eb41
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into skipComponentFns
2015-06-04 23:29:45 +08:00
CocosRobot
8865bd488e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-04 12:52:41 +00:00
pandamicro
af756c50dc
Merge pull request #12184 from pandamicro/v3
...
Fix issue that __JSDownloaderDelegator::onError get called twice
2015-06-04 20:42:35 +08:00
pandamicro
e75dee6e7c
Remove C++ invocation functions of Component
2015-06-04 20:10:10 +08:00
pandamicro
2da754dcf2
Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode
...
Add onEnter and onExit of components to CCNode's onEnter and onExit function
2015-06-04 18:39:52 +08:00
pandamicro
ba1191f98f
Merge pull request #12132 from pandamicro/v3_origin
...
cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread
2015-06-04 17:51:11 +08:00
VisualSJ
a91fdd6b8e
Synchronization studio parser - (fixed: resPath and custom easing animation)
2015-06-04 16:59:42 +08:00
VisualSJ
587bd475e9
Synchronization studio parser - (fixed: resPath and custom easing animation)
2015-06-04 16:23:06 +08:00
pandamicro
2c168130ed
Fix jsbinding calls for CCComponent
2015-06-04 15:59:05 +08:00
pandamicro
83f7f30c1c
Fix issue that __JSDownloaderDelegator::onError get called twice
2015-06-04 15:03:20 +08:00
pandamicro
9c23126d9e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-06-04 13:14:34 +08:00
CocosRobot
76b151c281
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-03 20:25:32 +00:00
samuele3hu
0cccd6e765
Fix compile error on the Linux and update the test cases
2015-06-03 18:12:21 +08:00
samuele3hu
a20681aa21
Add Lua-bindings for NavMesh
2015-06-02 18:37:57 +08:00
jianglong0156
ac71777e97
add webview and videoplayer protect contidition.
2015-06-02 13:50:55 +08:00
jianglong0156
c46fea1f7a
Merge branch 'v3' into videoplayer
2015-06-02 11:26:48 +08:00
pandamicro
4c6f67fd7e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
tools/bindings-generator
web
2015-06-02 10:12:22 +08:00
pandamicro
fdec552ed7
Fix cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread and improve Downloader
2015-06-02 10:08:13 +08:00
江龙
a8b640f751
add videoplayer project
2015-06-02 09:04:15 +08: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
jianglong0156
722b6b1baf
add video player binding files
2015-05-29 11:39:47 +08:00
子龙山人
a968bc2d15
Merge pull request #12062 from jianglong0156/jsWebviewTest
...
Js webview test
2015-05-29 11:35:30 +08:00
jianglong0156
8b52563a8a
add videoplayer config ini and fix the url bug
2015-05-29 11:10:39 +08:00
jianglong0156
9a62d06091
add video player test and auto bindings
2015-05-28 18:10:07 +08:00
jianglong0156
ab124978aa
web view can not run in mac, remove it from project file
2015-05-28 14:46:29 +08:00
jianglong0156
379f536330
improve test case, remove the invalid testcase
2015-05-28 14:02:07 +08:00
jianglong0156
1dbaa5bb11
fix error log output
2015-05-28 11:56:07 +08:00
子龙山人
001614a9c5
Merge pull request #11908 from flashjay/patch-1
...
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
2015-05-28 10:58:46 +08:00
jianglong0156
c0b42fdfec
modify addEventListener to setEventListener
2015-05-28 10:12:58 +08:00
子龙山人
6f16965b06
Merge pull request #12060 from CocosRobot/update_lua_bindings_1432717405
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-27 22:43:28 +08:00
pandamicro
37f2d84675
Merge pull request #12056 from musikov/v3-jsb-cccolor-fix
...
cc.Color() and cc.color() don't replace 0 alpha with 255 no more
2015-05-27 21:31:29 +08:00
jianglong0156
7402295205
improve event key
2015-05-27 18:02:01 +08:00
jianglong0156
2dd7b9575b
iOS project add web view project
2015-05-27 17:53:50 +08:00
CocosRobot
3bf58ab401
[AUTO]: updating luabinding & jsbinding automatically
2015-05-27 09:08:33 +00:00
子龙山人
b8fd5ba290
Merge pull request #12052 from CocosRobot/update_lua_bindings_1432713396
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-27 16:59:50 +08:00
Mykyta Usikov
355381e0d8
cc.Color() and cc.color() don't replace 0 alpha with 255 no more
2015-05-27 11:25:04 +03:00
CocosRobot
3851e8356e
[AUTO]: updating luabinding & jsbinding automatically
2015-05-27 08:00:53 +00:00
samuele3hu
9934d73548
issue #12046 : Add Lua bindings for material systems and related test cases.
2015-05-27 15:37:59 +08:00
jianglong0156
83f34c23d8
fixed the code error
2015-05-27 15:22:03 +08:00
jianglong0156
579f122cb1
add webview jsb eventType
2015-05-27 15:11:12 +08:00
jianglong0156
521ce15cb6
add webview autobindings. modify webtest. adapt the web interface
2015-05-27 11:46:26 +08:00
CocosRobot
824456b073
[AUTO]: updating luabinding & jsbinding automatically
2015-05-26 21:56:01 +00:00
jianglong0156
7820610f13
Merge branch 'modifyTestResource' into jsWebviewTest
...
Conflicts:
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
tests/js-tests/project.json
tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
tools/tojs/genbindings.py
2015-05-26 17:49:17 +08:00
CocosRobot
7fa68d9b3a
[AUTO]: updating luabinding & jsbinding automatically
2015-05-25 08:37:59 +00:00
minggo
203203a92d
Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2
...
upgrade rapidjson to 1.0.2
2015-05-25 15:18:15 +08:00
andyque
81070a5299
fix lua project compile error
2015-05-25 13:42:54 +08:00
andyque
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +08:00
samuele3hu
074216bef9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
...
Conflicts:
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
tests/lua-tests/src/mainMenu.lua
2015-05-24 22:46:05 +08:00
CocosRobot
f18b8bfd95
[AUTO]: updating luabinding & jsbinding automatically
2015-05-22 06:55:54 +00:00
minggo
698428e0a1
Merge pull request #11971 from joshuastray/physics
...
Physics3d js binding
2015-05-22 14:42:34 +08:00
joshuastray
b1169c7d56
win32 and universal compile
2015-05-22 11:58:28 +08:00
joshuastray
1366f615dd
mac && ios works
2015-05-22 10:43:37 +08:00
CocosRobot
59807629d9
[AUTO]: updating luabinding & jsbinding automatically
2015-05-22 02:04:38 +00:00
joshuastray
342734e3b5
Merge remote-tracking branch 'upstream/v3' into physics
2015-05-21 21:15:42 +08:00
joshuastray
83237b8dbd
add physics3d js manual binding and tests
2015-05-21 18:05:49 +08:00
andyque
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
CocosRobot
ad301891f0
[AUTO]: updating luabinding & jsbinding automatically
2015-05-21 02:46:49 +00:00
minggo
69b6c9a3e5
Merge pull request #11906 from samuele3hu/v3_check
...
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
2015-05-21 10:35:38 +08:00
CocosRobot
cb6abaa14c
[AUTO]: updating luabinding & jsbinding automatically
2015-05-21 01:52:51 +00:00
Dale Stammen
3523173594
removed CC_PLATFORM_WP8
2015-05-20 07:58:39 -07:00
joshuastray
712ba4f64c
add physics3d auto binding
2015-05-20 10:36:26 +08:00
HuaYang Huang
acb29ed5a8
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
...
last version may filter modules like 'framework.luaj', 'framework.luaoc'
2015-05-20 10:36:05 +08:00
samuele3hu
dec9acfd87
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
2015-05-20 10:26:54 +08:00
CocosRobot
61aad4581a
[AUTO]: updating luabinding & jsbinding automatically
2015-05-19 23:02:24 +00:00
minggo
38773e2164
Merge pull request #11869 from samuele3hu/v3_updateccs
...
Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua
2015-05-19 09:26:09 +08:00
samuele3hu
349f9bde11
Fix the compile error in the release mode
2015-05-18 17:43:20 +08: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
samuele3hu
da2314b00a
Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua
2015-05-18 09:41:35 +08:00
minggo
2dbe375380
Merge pull request #11868 from joshuastray/bullet-preprocessor-macro
...
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
2015-05-18 09:33:00 +08:00
joshuastray
ead74ac89e
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
2015-05-17 23:11:17 +08:00
unknown
91432f0ddf
fixed include paths for arm builds
2015-05-15 15:35:36 -07:00
samuele3hu
71595898ed
Update the Lua binding for Physics3D ,related test cases and the template project
2015-05-15 16:25:07 +08:00
Dale Stammen
46c69c7793
added ignore warning 4996 to hide the 200 deprecated warnings in libcocos2d-jsb
2015-05-14 19:00:53 -07:00
samuele3hu
fa63471c0a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
...
Conflicts:
tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
2015-05-15 09:31:53 +08:00
samuele3hu
8db62c82f8
Add Lua bindings for Physics3D and related test cases
2015-05-15 09:28:03 +08:00
minggo
0a3e6338f1
Merge pull request #11834 from pandamicro/v3_origin
...
Sync fixes in Cocos2d-JS
2015-05-14 13:38:18 +08:00
pandamicro
4146a6edf4
Fix incorrect property of cc.Texture2D
2015-05-14 10:41:10 +08:00
pandamicro
2685df73f2
Fix spine crash issue
2015-05-14 10:40:37 +08: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
minggo
5e87bd307b
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
...
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
pandamicro
3190d0e5fb
Add localStorage.clear test case
2015-05-12 19:02:22 +08:00
pandamicro
c7f3c2fa8b
Fix Scale9Sprite's inheritance issue triggered by its constructor
2015-05-12 18:04:01 +08:00
pandamicro
ef0854545b
Fix cc.EventMouse constants issue
2015-05-12 18:02:36 +08:00
pandamicro
c9ee849a2c
Add localStorage.clear in JSB
2015-05-12 18:02:14 +08:00
WenhaiLin
e53a977439
Add support for visual studio 2015.
2015-05-12 16:46:09 +08:00
CocosRobot
dbb51e2367
[AUTO]: updating luabinding & jsbinding automatically
2015-05-12 05:59:42 +00:00
minggo
cdfce7fcae
Merge pull request #11791 from CocosRobot/update_lua_bindings_1431407875
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-12 13:51:32 +08:00
minggo
398d36b58a
Merge pull request #11788 from joshuastray/spritepolygon
...
SpritePolygon binding and tests for js
2015-05-12 13:46:22 +08:00
CocosRobot
a7fb56de69
[AUTO]: updating luabinding & jsbinding automatically
2015-05-12 05:23:45 +00:00
joshuastray
7a4ca3fe6a
add new files to project
2015-05-12 10:40:51 +08:00
jianglong0156
80326aa40e
add webiew jsb code
2015-05-12 10:30:51 +08:00
joshuastray
234f4db8a0
add SpritePolygon binding && js tests
2015-05-11 17:04:23 +08: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
minggo
bf93289718
Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012
...
Remove vs2012 support in v3
2015-05-08 14:11:13 +08:00
minggo
14cebf7150
Merge pull request #11750 from CocosRobot/update_lua_bindings_1431050321
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-08 10:42:31 +08:00
minggo
d587ffd5c0
Merge pull request #11736 from samuele3hu/v3_7_js
...
issue 10411:Bug in Physics manual Lua binding
2015-05-08 10:04:55 +08:00
CocosRobot
4195c4b250
[AUTO]: updating luabinding & jsbinding automatically
2015-05-08 02:03:02 +00:00
minggo
09ddf15b9f
Merge pull request #11740 from joshuastray/fix-debu
...
fix jsb debugger bug
2015-05-08 09:29:40 +08:00
Jialong Zhai
be923b5901
fix jsb debugger bug
2015-05-07 18:24:30 +08:00
samuele3hu
23e4e0d4e3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
2015-05-07 16:21:03 +08:00
samuele3hu
0d53065476
issue 10411:Bug in Physics manual Lua binding
2015-05-07 16:15:24 +08:00
andyque
db95034798
fix android compile error
2015-05-07 10:37:19 +08:00
samuele3hu
cc4fe9b746
Modify the configuration about js-tests.
2015-05-06 10:52:23 +08:00
CocosRobot
8470ab606b
[AUTO]: updating luabinding & jsbinding automatically
2015-05-06 01:07:26 +00:00
samuele3hu
f1b5729183
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
2015-05-05 16:14:57 +08:00
samuele3hu
037c17fe5d
Remove vs2012 support in v3
2015-05-05 16:11:26 +08:00
CocosRobot
534868368e
[AUTO]: updating luabinding & jsbinding automatically
2015-05-05 05:48:55 +00:00