knoxHuang
|
4352ca56d6
|
fix cc.Follow code error for jsb_create_apis
|
2016-06-24 17:00:19 +08:00 |
|
CocosRobot
|
1d6d76bb9b
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-06-14 03:22:41 +00:00 |
|
knoxHuang
|
28acc37ee0
|
add CCJavascriptJavaBridge.cpp for Android.mk
|
2016-06-13 19:02:41 +08:00 |
|
knoxHuang
|
fb6d6d7b8a
|
update CCJavascriptJavaBridge
|
2016-06-13 17:39:33 +08:00 |
|
Wang Nan
|
428364ec79
|
Merge pull request #161 from pandamicro/v1.1
Add JavascriptJavaBridge dependencies back
|
2016-06-08 10:01:54 +08:00 |
|
pandamicro
|
e826686499
|
Add JavascriptJavaBridge dependencies back
|
2016-06-08 09:56:31 +08:00 |
|
2youyouo2
|
39343dd9ef
|
add window resize event when resize
|
2016-06-06 15:28:48 +08:00 |
|
CocosRobot
|
dc3d4ce03b
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-05-27 06:06:47 +00:00 |
|
pandamicro
|
a21cbcdc72
|
Merge pull request #150 from pandamicro/develop
Fix bindings issues with AssetsManager
|
2016-05-27 13:59:43 +08:00 |
|
pandamicro
|
c7a975f8d1
|
Fix bindings issues with AssetsManager
|
2016-05-27 11:11:54 +08:00 |
|
CocosRobot
|
e7ca10567b
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-05-27 03:04:27 +00:00 |
|
zilongshanren
|
db1962a19d
|
revert cc.VideoPlayer polyfill
|
2016-05-24 18:10:12 +08:00 |
|
zilongshanren
|
91f852beef
|
adapt video player jsb
|
2016-05-23 16:02:52 +08:00 |
|
Wang Nan
|
26306350bf
|
Merge pull request #129 from cocos-creator/master
merge master
|
2016-05-19 09:56:18 +08:00 |
|
Wenhai Lin
|
b946197b7e
|
Merge pull request #131 from pandamicro/master
Add back AssetsManagerEx
|
2016-05-19 09:54:45 +08:00 |
|
Nan Wang
|
ae6b17ad72
|
merge master
|
2016-05-19 09:48:23 +08:00 |
|
Wenhai Lin
|
033cd4649f
|
IPV6 compatibility
|
2016-05-19 01:46:01 +08:00 |
|
Wenhai Lin
|
5935df42be
|
Fixed compile fail on Mac
|
2016-05-18 22:32:40 +08:00 |
|
pandamicro
|
5494977615
|
Merge pull request #124 from 2youyouo2/android
Android
|
2016-05-18 17:48:58 +08:00 |
|
Wenhai Lin
|
e571338580
|
Disable cc.log in release mode.(Redefine it in CocosRuntime)
|
2016-05-18 17:43:47 +08:00 |
|
CocosRobot
|
17102e25ea
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-05-18 15:22:13 +08:00 |
|
pandamicro
|
cac05f6128
|
Add AssetsManagerEx to extension
|
2016-05-18 15:21:56 +08:00 |
|
CocosRobot
|
00ba43da72
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-05-18 06:36:03 +00:00 |
|
pandamicro
|
87ca37f50f
|
Add AssetsManagerEx to extension
|
2016-05-18 14:19:55 +08:00 |
|
2youyouo2
|
dfbe1d2a2c
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into android
|
2016-05-18 10:37:25 +08:00 |
|
2youyouo2
|
1cb724543e
|
update android.mk
|
2016-05-18 00:10:07 +08:00 |
|
Wenhai Lin
|
b7f8bb7ab4
|
Enable cc.log in release mode.
|
2016-05-17 17:59:58 +08:00 |
|
pandamicro
|
9ce7955434
|
Some small fixes
|
2016-05-17 17:33:11 +08:00 |
|
knoxHuang
|
db921c300c
|
update cocos2d_specifics and jsb_cocos2d
|
2016-05-17 17:30:44 +08:00 |
|
knoxHuang
|
cf885823b7
|
update cocos2d_specifics and jsb_cocos2d
|
2016-05-17 17:26:44 +08:00 |
|
zhangbin
|
8633eb2210
|
Solve the crash in simulator if there is no return value of onTouchBegan.
|
2016-05-17 17:26:41 +08:00 |
|
CocosRobot
|
af8979aef2
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-05-17 17:26:12 +08:00 |
|
zilongshanren
|
866c396761
|
update js bindings
|
2016-05-17 17:23:26 +08:00 |
|
yinkaile
|
aa709267b4
|
fixed jsb DrawNode (#46)
Fixed jsb DrawNode
|
2016-05-17 17:12:21 +08:00 |
|
Wang Nan
|
bc96a2ee9d
|
Merge pull request #101 from cocos-creator/master
Master
|
2016-05-13 13:47:52 +08:00 |
|
Wenhai Lin
|
18d21ebdee
|
Fixed compile fail on WIN32
|
2016-05-13 11:54:38 +08:00 |
|
zhangbin
|
7b36208a0a
|
Solve the crash in simulator if there is no return value of onTouchBegan.
|
2016-05-12 18:22:43 +08:00 |
|
CocosRobot
|
de5ec7e839
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-05-11 09:50:45 +00:00 |
|
2youyouo2
|
96201232b8
|
Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-05-11 11:19:22 +08:00 |
|
Wenhai Lin
|
dd5b3674c6
|
stability improvements
|
2016-05-11 10:29:54 +08:00 |
|
zilongshanren
|
adc2a7c8b7
|
update js bindings
|
2016-05-10 14:17:32 +08:00 |
|
zilongshanren
|
c647536c0c
|
Merge branch 'develop' into syncMasterBranch
# Conflicts:
# gulpfile.js
# package.json
|
2016-05-10 14:12:59 +08:00 |
|
2youyouo2
|
ecab936f2a
|
fixed clog
|
2016-05-09 13:35:24 +08:00 |
|
Wenhai Lin
|
035e3677a8
|
1.Allow to use custom shader uniforms and attributes on drawNode
2.Remove duplicate definition of `cc.FontDefinition`
3.Warn if fontDef.charID exceeds 16bits
|
2016-05-03 15:49:17 +08:00 |
|
Wenhai Lin
|
d4481bfd5a
|
Refine (#48)
|
2016-04-28 11:58:34 +08:00 |
|
yinkaile
|
ac688a8b64
|
fixed jsb DrawNode (#46)
Fixed jsb DrawNode
|
2016-04-27 19:54:03 +08:00 |
|
Wenhai Lin
|
cdbd28ce43
|
[JSB]Fixed crash when WebSocket is closed.
|
2016-04-27 13:54:25 +08:00 |
|
Wenhai Lin
|
94501cc8f1
|
Bug fix and stability improvements
|
2016-04-25 15:56:03 +08:00 |
|
Wenhai Lin
|
1c5f974d78
|
Fixed generate error code for constructor
|
2016-04-22 14:10:02 +08:00 |
|
Wenhai Lin
|
a4bdfa270c
|
Fixed warns in JS bindings
|
2016-04-22 11:31:32 +08:00 |
|