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
James Chen
1ba17074d1
Uses SocketRocket to implement WebSocket for iOS. It has the following benefits:
...
1. The API of SocketRocket is easy for use, it's all asynchronous API.
2. No need to deal with thread communications, it's wrapped inside SocketRocket.
3. Network status change will not make connection closed, it just seems there isn't any status change.
4. Locking screen will trigger an error while libwebsockets or bsd socket will not.
5. Don't depend on openssl library which is a little big.
6. Don't need to use a local CA root certificate (curl ca file is over 2MB) for wss connection
7. Don't trigger signal pipe while closing wss connection
8. Easy to integrate SocketRocket to current WebSocket implementation
2017-07-05 16:32:57 +08:00
CocosRobot
045887e140
[AUTO][ci skip]: updating cocos2dx_files.json
2017-07-05 03:40:39 +00:00
pandamicro
450ad5b4d5
Add cocos ui static dependency
2017-07-05 11:34:53 +08:00
pandamicro
2b00307a44
Fix Spidermonkey Android build issue
2017-07-05 11:30:57 +08:00
pandamicro
d300701125
Fix android sub module dependency issue
2017-07-04 16:35:42 +08:00
pandamicro
99206af737
Remove useless module and preprocess macros
2017-07-04 16:35:17 +08:00
pandamicro
2b08a2e352
Fix compilation issues of mac simulator
2017-07-03 15:34:17 +08:00
James Chen
733d12c849
remove unneeded code.
2017-07-03 14:34:52 +08:00
pandamicro
adb33e711a
Update cocos2d-console ref
2017-07-03 11:06:22 +08:00
pandamicro
65a71c1c73
Remove duplicated jsb generation in travis task
2017-07-01 17:39:47 +08:00
CocosRobot
14a982b080
[AUTO][ci skip]: updating cocos2dx_files.json
2017-06-30 11:06:43 +00:00
pandamicro
6e7e614b84
Remove chipmunk backup logic in travis scripts
2017-06-30 18:49:47 +08:00
pandamicro
1add6fb725
Enable travis for develop
2017-06-30 18:38:12 +08:00
pandamicro
154e3cf863
Support windows Spidermonkey v52
2017-06-30 18:02:08 +08:00
pandamicro
f94fd18256
Use PersistentScript in ScriptingCore
2017-06-30 18:02:08 +08:00
pandamicro
ba23e966a7
Fix ScriptingCore::cleanup crash
2017-06-30 18:02:08 +08:00
pandamicro
cdf2b39412
Remove js_get_type_from_native usage as many as possible
2017-06-30 18:02:08 +08:00
pandamicro
6ce5691764
Update cocos2dx_files
2017-06-30 18:02:06 +08:00
pandamicro
dbd7367971
CameraNode auto bindings
2017-06-30 18:02:06 +08:00
pandamicro
32f9c7dc1f
Remove debugger
2017-06-30 18:02:05 +08:00
pandamicro
0768865461
Fix non ref finalize crash during app close
2017-06-30 18:02:05 +08:00
pandamicro
7974e6f7af
Use pure js event instead of native event
2017-06-30 18:02:05 +08:00
pandamicro
4e5886c8a1
Add build id for jsc files
2017-06-30 18:02:05 +08:00
pandamicro
089285b2d2
Fix crash issue caused by setting a pointer which is not proxy to private
2017-06-30 18:02:05 +08:00
pandamicro
31af3a1e4e
Remove useless module and made Android compilation pass
2017-06-30 18:02:05 +08:00
pandamicro
8d92378ec7
Fix Android compilation issues
2017-06-30 18:02:05 +08:00
pandamicro
ea877894f7
Fix anysdk auto bindings include
2017-06-30 18:02:05 +08:00
pandamicro
1e2bc5e1c4
Use sm52 for iOS
2017-06-30 18:02:05 +08:00
pandamicro
e23232ad4c
Upgrade anysdk bindings to sm52
2017-06-30 18:02:05 +08:00
pandamicro
a9c5e50745
Remove simple audio engine
2017-06-30 18:02:05 +08:00
pandamicro
ecafdac39a
Fix network new proxy fail issue
2017-06-30 18:02:04 +08:00
pandamicro
1762e86956
Fix compilation issues after rebase
2017-06-30 18:02:04 +08:00
knoxHuang
7b23aa6b92
Manual merge v1.5 jsb modification
2017-06-30 18:02:04 +08:00
pandamicro
211c50b6f5
Fix event dispatching issue (old value stay in event obj)
2017-06-30 18:02:04 +08:00