Commit Graph

114 Commits

Author SHA1 Message Date
James Chen 046f573737
[iOS] Updates cocosanalytics lib to 1.0.5 (#56) 2018-01-10 16:14:50 +08:00
James Chen b70357b17a
[iOS] Updates cocosanalytics lib to 1.0.4 (#55) 2018-01-02 13:44:31 +08:00
James Chen b5cffcf601
Updates cocos analytics to 1.0.3. resolve library conflict. (#54) 2017-12-07 14:01:04 +08:00
James Chen 094a36f07c
Updates Cocos Analytics for iOS, fixes Reachability.o conflict (#53) 2017-12-07 11:19:59 +08:00
James Chen ad99d73452
Updates cocos analytics to 1.0.2 (#52) 2017-11-07 11:22:37 +08:00
James Chen dcf5ed15bb Merge pull request #51 from dumganhar/v1.7
Updates libuv for android, fixes getifaddrs freeifaddrs conflict with which in libwebsockets
2017-10-26 16:35:30 +08:00
James Chen 3bf997bf25 Updates libuv for android, fixes getifaddrs freeifaddrs conflict with which in libwebsockets 2017-10-26 16:31:24 +08:00
James Chen 7682d77047 Merge pull request #50 from dumganhar/adds-cocos-analytics-lib
Adds cocos analytics lib for iOS
2017-10-19 18:36:19 +08:00
James Chen 364cfe81b9 Adds cocos analytics lib 2017-10-19 18:35:04 +08:00
James Chen ff802f505d Merge pull request #49 from dumganhar/getpagesize-uv
[android] getpagesize -> PAGE_SIZE for libuv
2017-10-11 12:45:03 +08:00
James Chen c493c5ef62 getpagesize -> PAGE_SIZE for libuv 2017-10-11 12:35:19 +08:00
James Chen 1d7fc064ee Merge pull request #48 from dumganhar/libuv
Adds Libuv for win32 and android
2017-10-10 14:23:18 +08:00
James Chen e59275a30d Updates version.txt 2017-10-10 12:57:24 +08:00
James Chen b608028dac Adds libuv for android 2017-10-10 12:38:34 +08:00
James Chen a2e6d92d59 Adds libuv for win32 2017-10-09 17:25:32 +08:00
James Chen 979b5399f4 Merge pull request #47 from 2youyou2/develop
export xxtea functions to DLL
2017-09-28 20:27:57 -05:00
2youyou2 45c237fbe4 refine XXTEA_DLL macro 2017-09-28 17:40:02 +08:00
2youyou2 9638089278 define XXTEA_DLL macro for xxtea 2017-09-28 17:24:06 +08:00
2youyou2 db67f9b324 Merge branch 'develop' of https://github.com/2youyou2/cocos2d-x-lite-external into develop 2017-09-28 11:09:34 +08:00
2youyou2 808c57d01b export xxtea functions to DLL 2017-09-28 11:02:01 +08:00
James Chen b0da6174d5 Merge pull request #46 from dumganhar/fix/anysdk
Updates anysdk library
2017-09-22 04:58:25 -05:00
James Chen 82dd97d1d0 Updates anysdk library 2017-09-22 17:53:44 +08:00
James Chen 9d28237353 win32 box2d project fix. (#45) 2017-09-19 05:05:55 -05:00
James Chen 3c94680588 [android] Fixes undefined reference to '__page_size' for v8 (#44) 2017-09-18 04:25:29 -05:00
James Chen 4710400999 Remove redundant module import for v8 (#43) 2017-09-18 02:45:51 -05:00
James Chen 4d6ccead0b Merge pull request #40 from dumganhar/box2d-win32
Updates box2d project configuration for win32
2017-08-18 03:03:55 -05:00
James Chen c6c14b8463 Updates box2d project configuration for win32 2017-08-18 16:00:47 +08:00
James Chen 32c21bc388 Merge pull request #39 from dumganhar/jsb2.0-androidmk
[jsb2.0] Updates Android.mk to declare v8 library
2017-08-18 02:30:41 -05:00
James Chen 844509e61a Updates Android.mk to declare v8 library 2017-08-18 15:29:52 +08:00
James Chen 4ea54c180d Merge pull request #38 from dumganhar/jsb2.0-box2d
Hack box2d for jsb2.0
2017-08-18 01:04:09 -05:00
James Chen 306402354e Hack box2d for jsb2.0 2017-08-18 14:02:10 +08:00
James Chen 5c90ba54d3 Hack code in Box2D to notify the destruction of native object. 2017-08-16 15:43:48 +08:00
James Chen cd9b2c75e4 Merge pull request #37 from dumganhar/jsb2.0
[JSB2.0] Adds v8 prebuilt libraries for win32 and android.
2017-08-15 22:24:17 -05:00
James Chen 83e4396a92 Adds v8 library for win32 2017-08-16 10:22:27 +08:00
James Chen 987e15059a Add v8 library for Android 2017-08-16 10:22:16 +08:00
pandamicro f773c739b7 Merge pull request #35 from 2youyou2/develop
should use v140 for 15.0 VisualStudioVersion
2017-07-26 16:39:38 +08:00
2youyouo2 76d091c70f should use v140 for 15.0 VisualStudioVersion 2017-07-26 16:13:33 +08:00
Wang Nan c0a6955d61 Merge pull request #34 from cocos-creator/master
merge master
2017-07-20 17:57:26 +08:00
Wang Nan b43a5b345b Merge pull request #33 from dumganhar/fix/SRWebSocket-memory-leak
Memory leak fix and cancel connection timeout timer in scheduleCleanup
2017-07-20 17:56:25 +08:00
James Chen 4eb591a607 Memory leak fix and cancel connection timeout timer in scheduleCleanup 2017-07-20 15:50:06 +08:00
pandamicro 87575efb54 Merge pull request #32 from pandamicro/master
Fix new Uint8Array failure on iOS armv7
2017-07-18 23:20:50 +08:00
pandamicro cf01dcbc08 Fix new Uint8Array failure on iOS armv7 2017-07-18 23:18:48 +08:00
pandamicro c9d04fee8e Merge pull request #31 from pandamicro/master
Fix iOS mmap and TypedArray issue
2017-07-18 09:46:57 +08:00
pandamicro 1a0fd89c60 Fix iOS mmap and TypedArray issue 2017-07-18 09:46:04 +08:00
pandamicro 809ac852c5 Merge pull request #30 from pandamicro/master
Update arm64 spidermonkey .a
2017-07-06 10:23:27 +08:00
pandamicro c715b458cf Update arm64 spidermonkey .a 2017-07-06 10:19:13 +08:00
Wang Nan 29b2cfa238 Merge pull request #29 from dumganhar/socketrocket-master
Adds SocketRocket library for iOS/macOS
2017-07-05 18:10:01 +08:00
James Chen 9aacad356d Adds SocketRocket library for iOS/macOS 2017-07-05 16:55:34 +08:00
pandamicro d003c44451 Merge pull request #28 from pandamicro/master
Fix Spidermonkey android build issues
2017-07-05 11:29:32 +08:00
pandamicro ac6727a636 Fix Spidermonkey android build issues 2017-07-05 11:28:44 +08:00