James Chen
5aa4d68cab
updates external
2017-07-20 16:44:59 +08:00
James Chen
68be4dbbaf
Fix potential crash after WebSocket.close.
...
Since the finalize function will get a invalid pointer of WebSocket, invoking ws->closeAysnc() will generate unknown result, probably crash.
HOW TO FIX:
WebSocket and JSB_WebSocketDelegate inhert from Ref. After websocket is initialized successfully, retain websocket instance and delegate, they will both have 2 reference count.
release their reference both in onClose callback and finalize function. The reason is that the order of invoking onClose and finalize function will be unpredictable, ref count technique help to handle this.
Another fix is sending onclose event after onerror is received.
2017-07-20 16:43:24 +08:00
pandamicro
2cf6175ba4
Merge pull request #711 from pandamicro/develop
...
Fix new Uint8Array failure on iOS armv7
2017-07-18 23:23:38 +08:00
pandamicro
0c40e69d50
Fix new Uint8Array failure on iOS armv7
2017-07-18 23:22:12 +08:00
pandamicro
75efb10020
Merge pull request #710 from pandamicro/develop
...
Fix iOS mmap and TypedArray issue
2017-07-18 09:56:35 +08:00
pandamicro
ed103db2e3
Fix iOS mmap and TypedArray issue
2017-07-18 09:55:40 +08:00
Wang Nan
171c35292a
Merge pull request #709 from dumganhar/fix/binary-template-link-error
...
Fixes binary template compilation fairlure.
2017-07-14 17:43:13 +08:00
James Chen
070c1aabb7
Fixes binary template compilation fairlure.
...
https://github.com/cocos-creator/fireball/issues/6028
2017-07-14 17:36:26 +08:00
knoxHuang
dfb9e9fa9d
fix js_cocos2dx_TMXTiledMap_getPropertiesForGID error for fireball/issues/6035
2017-07-14 15:15:24 +08:00
Wang Nan
66e67e84de
Merge pull request #707 from 2youyou2/physics
...
fixed some physics jsb bugs
2017-07-13 09:40:10 +08:00
2youyouo2
e76f7837e3
fixed some physics jsb bugs
2017-07-12 17:36:53 +08:00
2youyouo2
373ee72e58
add const to getFixtures
2017-07-12 17:36:20 +08:00
pandamicro
71298100c0
Merge pull request #706 from pandamicro/develop
...
Remove SimpleAudioEngine dependency on android
2017-07-12 16:23:42 +08:00
pandamicro
807854ee7a
Remove SimpleAudioEngine dependency on android
2017-07-12 16:16:38 +08:00
pandamicro
3f535277b6
Merge pull request #705 from pandamicro/develop
...
Avoid restart crash in spidermonkey
2017-07-11 18:34:33 +08:00
pandamicro
856de64714
Avoid restart crash in spidermonkey
2017-07-11 18:33:39 +08:00
pandamicro
9234bdf0bc
Merge pull request #704 from pandamicro/develop
...
Small fixes
2017-07-11 15:36:37 +08:00
pandamicro
09cb88821b
Fix small issues in simulator win32 project
2017-07-11 15:36:04 +08:00
pandamicro
cbe4dc6f6d
Fix java oc reflection issue
2017-07-11 15:35:31 +08:00
Nan Wang
09d90d5dea
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
2017-07-11 10:05:21 +08:00
Nan Wang
9c118706d4
updated version to 1.6.0
2017-07-11 10:05:04 +08:00
pandamicro
869ee6c185
fix vs 2017 compilation issue with spidermonkey
2017-07-11 00:52:37 +08:00
pandamicro
d32214f0d2
Fix simulator crash during app close
2017-07-10 18:30:55 +08:00
pandamicro
144c49a6d7
Fix js oc reflection issue
2017-07-10 18:30:33 +08:00
pandamicro
9765d2d039
Fix win32 simulator issue
2017-07-10 14:26:50 +08:00
pandamicro
9e65519899
Readd ide support for win32 simulator
2017-07-10 10:38:45 +08:00
pandamicro
22109f8e8d
Fix gc crash during app closing
2017-07-09 14:34:02 +08:00
pandamicro
66897d4f3f
Add back ide-support and fix compilation issues
2017-07-09 10:52:37 +08:00
pandamicro
1ad2d9f6f5
Fix git-archive-all for real
2017-07-07 16:01:47 +08:00
pandamicro
9864309625
Merge pull request #697 from pandamicro/develop
...
Fix git archive all
2017-07-07 11:14:48 +08:00
pandamicro
006b570479
Fix git archive all
2017-07-07 10:58:15 +08:00
pandamicro
1bb26ebd37
Merge pull request #696 from pandamicro/develop
...
Fix android gen libs issue
2017-07-06 16:02:14 +08:00
pandamicro
7194ea7611
Fix android gen libs issue
2017-07-06 16:01:35 +08:00
pandamicro
8d9633824d
Merge pull request #695 from pandamicro/develop
...
Fix simulator win32 debug post build event
2017-07-06 11:24:40 +08:00
pandamicro
449002a431
Fix simulator win32 debug post build event
2017-07-06 11:23:59 +08:00
Nan Wang
e1f0462073
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
2017-07-06 11:12:59 +08:00
Wang Nan
55f53226f4
Merge pull request #692 from 2youyou2/anysdk
...
update template for anysdk
2017-07-06 11:11:35 +08:00
Nan Wang
ed08907c1e
fix websocket include
2017-07-06 11:07:10 +08:00
pandamicro
56899393c9
Fix simulator win32 post build event
2017-07-06 11:04:07 +08:00
pandamicro
794245e844
Fix win32 simulator build issue
2017-07-06 10:53:23 +08:00
2youyouo2
d0f80a3a46
update template for anysdk
2017-07-06 10:36:48 +08:00
pandamicro
7de0b31f22
Update arm64 spidermonkey .a
2017-07-06 10:26:05 +08:00
CocosRobot
0b396756d8
[AUTO][ci skip]: updating cocos2dx_files.json
2017-07-06 01:41:49 +00:00
James Chen
e953a5b436
Adds socketrocket license.
2017-07-06 09:29:35 +08:00
CocosRobot
6353b76f31
[AUTO][ci skip]: updating cocos2dx_files.json
2017-07-05 10:21:37 +00:00
James Chen
8edfc1acbe
Updates external/config.json
2017-07-05 18:09:55 +08:00
James Chen
da17c672c1
fixes include in WebSocket-libwebsockets.cpp.
2017-07-05 18:06:44 +08:00
CocosRobot
51903485e1
[AUTO][ci skip]: updating cocos2dx_files.json
2017-07-05 10:00:11 +00:00
Wang Nan
e9617ca0a6
Merge pull request #685 from dumganhar/fix/socketrocket
...
Uses SocketRocket to implement WebSocket for iOS
2017-07-05 17:55:46 +08:00
James Chen
4ee7a5f3e9
Updates template for ios/mac
2017-07-05 16:43:22 +08:00