minggo
|
165b2e52aa
|
Merge pull request #220 from minggo/sync-15085
fix wrong behavior of 'cc.isObject' function for undefined and null
|
2016-07-18 18:00:35 +08:00 |
|
minggo
|
f922c9a798
|
avoid accessing invalid memory
|
2016-07-18 17:02:32 +08:00 |
|
minggo
|
a28fbe5222
|
fix wrong behavior of 'cc.isObject' function for undefined and null
|
2016-07-18 16:55:56 +08:00 |
|
Wang Nan
|
414592b8ea
|
Merge pull request #205 from cocos-creator/v1.1
merge V1.1
|
2016-07-12 14:03:48 +08:00 |
|
Wang Nan
|
9b33aa98be
|
Merge pull request #200 from pandamicro/v1.1
Fix jsb.loadRemoteImg
|
2016-07-08 13:44:37 +08:00 |
|
pandamicro
|
2c5c37a610
|
Fix jsb.loadRemoteImg
|
2016-07-07 10:35:42 +08:00 |
|
Wang Nan
|
4efc6045a1
|
Merge pull request #198 from 2youyou2/errorHandler
fixed errorHandler
|
2016-07-06 16:26:51 +08:00 |
|
knoxHuang
|
4da24170b6
|
fix used spine.getCurrent cause the emulator to crash for #fireball/issues/3546
|
2016-07-06 16:17:49 +08:00 |
|
2youyouo2
|
0f966efbb0
|
fixed errorHandler
|
2016-07-06 14:36:03 +08:00 |
|
Wang Nan
|
c51554f7d4
|
Merge pull request #196 from 2youyou2/develop
fixed windows graphics
|
2016-07-06 14:34:52 +08:00 |
|
2youyouo2
|
10111b0cd4
|
fixed errorHandler
|
2016-07-06 14:21:49 +08:00 |
|
2youyouo2
|
bc038a61a3
|
fixed graphics roundRect api
|
2016-07-06 14:02:10 +08:00 |
|
Nan Wang
|
69bd9f1227
|
merged
|
2016-07-05 11:46:31 +08:00 |
|
knoxHuang
|
07f1344db5
|
fix JSB Label does not support Boolean value. for #fireball/issues/3519
|
2016-07-04 18:27:24 +08:00 |
|
knoxHuang
|
ce4ea88297
|
add isScheduled for JSB #fireball/issues/3510
|
2016-07-04 18:16:48 +08:00 |
|
knoxHuang
|
8f1026d667
|
add isScheduled for JSB #fireball/issues/3510
|
2016-07-04 18:09:08 +08:00 |
|
2youyouo2
|
c4fc8d0e84
|
add graphics
|
2016-06-30 14:56:31 +08:00 |
|
knoxHuang
|
94bec4a581
|
fix ScriptingCore code error
|
2016-06-30 13:06:59 +08:00 |
|
knoxHuang
|
06bf021143
|
merge code for #/fireball/issues/2787
|
2016-06-28 14:22:22 +08:00 |
|
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 |
|