afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
139 Commits 11 Branches 368 Tags 2.3 GiB
Commit Graph

139 Commits

Author SHA1 Message Date
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
pandamicro 7483966da7 Merge pull request #27 from pandamicro/master 
Sync 1.5 and Upgrade to Spidermonkey v52
 2017-06-30 17:42:55 +08:00
pandamicro d49a5a1ec6 Upgrade spidermonkey to v52 2017-06-30 16:22:04 +08:00
pandamicro 7fa906b85c Merge pull request #26 from dumganhar/fix/disable-async-for-ios 
Disable async in openssl for ios since apple forbit developers to use the API (setcontext, getcontext, makecontext).
 2017-05-24 11:32:41 +08:00
James Chen 14994c2752 Disable async in openssl for ios since apple forbit developers to use the API (setcontext, getcontext, makecontext). 2017-05-24 11:25:23 +08:00
Wang Nan 29794b4bb9 Merge pull request #25 from 2youyou2/v1.5 
support vs2017
 2017-05-19 11:28:09 +08:00
2youyouo2 717bb8c6d4 support vs2017 2017-05-19 11:19:33 +08:00
Wang Nan 2db1d8d784 Merge pull request #24 from 2youyou2/develop 
remove unused lib
 2017-04-25 10:00:43 +08:00
2youyouo2 266496ae15 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite-external into develop 2017-04-21 10:39:33 +08:00
2youyouo2 1e082d6942 remove unused lib 2017-04-21 10:37:38 +08:00
Wang Nan 2d5895cc49 Merge pull request #23 from 2youyou2/develop 
add Box2D 2.3.1
 2017-03-15 14:44:35 +08:00
2youyou2 b616189d2f add proj.win32 2017-03-14 16:32:22 +08:00
2youyouo2 011cbe9a6d fixed android build according to 43408de 2017-03-09 17:12:58 +08:00
2youyouo2 a03c09d797 add ClearDraw 2017-03-09 17:10:27 +08:00
2youyouo2 582e202912 add box2d 2017-03-09 17:09:58 +08:00
Wang Nan 46ff05eb4a Merge pull request #22 from dumganhar/develop 
Merge v1.4 branch
 2017-02-17 17:19:38 +08:00
James Chen 1475333af5 Merge branch 'v1.4' into develop 2017-02-16 11:25:26 +08:00
Wang Nan db556ac98d Merge pull request #21 from dumganhar/develop 
Adds openssl, updates curl, libwebsockets.
 2017-02-09 13:49:34 +08:00
James Chen 6bf9840dec Adds openssl, updates curl, libwebsockets. 2017-02-09 10:27:15 +08:00
Wang Nan b2f3f03fae Merge pull request #20 from dumganhar/mp3-ogg-decoder 
Disable ASM for tremolo since it may crashes while decoding same specific ogg audio files.
 2017-01-20 16:34:22 +08:00
James Chen 8680e9849f Disable ASM for tremolo since it may crashes while decoding same specific ogg audio files. 2017-01-20 16:28:39 +08:00
pandamicro 7b7fa095d0 Merge pull request #19 from pandamicro/master 
Add tinydir 1.2.1 for FileUtils::listFiles
 2017-01-13 10:26:36 +08:00
pandamicro 281ff7b42c Add tinydir 1.2.1 for FileUtils::listFiles 2017-01-13 10:25:30 +08:00
pandamicro f1c37c489d Merge pull request #18 from pandamicro/master 
Update rapidjson
 2017-01-10 11:46:24 +08:00
pandamicro 261f60ca73 Update rapidjson 2017-01-10 11:43:11 +08:00
Wang Nan fc07c78083 Merge pull request #17 from dumganhar/mp3-ogg-decoder 
Adds source code of tremolo(for decoding ogg), pvmp3dec source code
 2017-01-10 11:32:41 +08:00