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 |
|
James Chen
|
5d8111692e
|
Adds source code of tremolo(for decoding ogg), pvmp3dec source code
|
2017-01-09 17:39:11 +08:00 |
子龙山人
|
e5770511ff
|
Merge pull request #16 from zilongshanren/fixGLFW-10.12.2
update glfw
|
2016-12-30 14:45:40 +08:00 |
|
zilongshanren
|
71e428d64b
|
update glfw
|
2016-12-30 14:45:08 +08:00 |
|
子龙山人
|
d28204073f
|
Merge pull request #15 from natural-law/master
Update the version of glfw for Mac.
|
2016-12-26 16:30:01 +08:00 |
zhangbin
|
011f0d21ba
|
Update the version of glfw for Mac.
|
2016-12-26 16:26:00 +08:00 |
|
Wang Nan
|
28353a429d
|
Merge pull request #14 from hylthink/master
AnySDK 2.2.5 support https
|
2016-12-02 14:50:44 +08:00 |
yanli.huang
|
31a87cb46a
|
AnySDK 2.2.5 support https
|
2016-12-02 12:00:56 +08:00 |
|
子龙山人
|
7ed6ad08ea
|
Merge pull request #13 from zilongshanren/fixGLFW-macos-10-12
update glfw
|
2016-11-14 01:47:00 -08:00 |
|
zilongshanren
|
bcc7e77f92
|
update glfw
|
2016-11-14 17:41:41 +08:00 |
|
pandamicro
|
d4de3fff88
|
Merge pull request #12 from zilongshanren/upgrade-glfw
update glfw for macos 10.12
|
2016-11-01 22:44:56 +08:00 |
|
zilongshanren
|
d68154e7dd
|
update glfw for macos 10.12
|
2016-11-01 22:21:31 +08:00 |
|
pandamicro
|
0ded35b0c4
|
Merge pull request #11 from pandamicro/master
Add webp
|
2016-10-19 18:34:17 +08:00 |
|
pandamicro
|
3117fab222
|
Add webp
|
2016-10-19 18:29:02 +08:00 |
|
Wang Nan
|
03caae7773
|
Merge pull request #10 from hylthink/master
strip AnySDK 2.2.3
|
2016-09-20 10:37:13 +08:00 |
|
yanli.huang
|
eea0b81a21
|
strip AnySDK 2.2.3
|
2016-09-19 18:22:48 +08:00 |
|
Wang Nan
|
618f2d6dad
|
Merge pull request #9 from hylthink/master
update AnySDK 2.2.3
|
2016-09-19 17:25:33 +08:00 |
|
yanli.huang
|
b3432c4c29
|
update AnySDK 2.2.3
|
2016-09-19 14:23:42 +08:00 |
|
pandamicro
|
19845a8849
|
Merge pull request #8 from pandamicro/master
Update lib chipmunk and spider monkey for armeabi
|
2016-09-08 20:56:47 +08:00 |
|
pandamicro
|
0737f75745
|
Update lib chipmunk and spider monkey for armeabi
|
2016-09-08 20:54:24 +08:00 |
|
pandamicro
|
52409e59c0
|
Merge pull request #7 from pandamicro/master
Update android lib chipmunk and lib spidermonkey
|
2016-09-08 15:37:44 +08:00 |
|
pandamicro
|
d16c922475
|
Update android lib chipmunk and lib spidermonkey
|
2016-09-08 15:30:29 +08:00 |
|
pandamicro
|
051853a542
|
Merge pull request #6 from pandamicro/master
Update chipmunk to 7.0.1
|
2016-09-02 11:50:13 +08:00 |
|
pandamicro
|
7b70b5d552
|
Update chipmunk to 7.0.1
|
2016-09-02 11:44:34 +08:00 |
|
pandamicro
|
4189719df7
|
Merge pull request #5 from natural-law/update-rapidjson
Update rapid json to version 1.1.0
|
2016-08-30 10:55:03 +08:00 |
|
zhangbin
|
4af261b96e
|
Update rapid json to version 1.1.0
|
2016-08-29 18:15:19 +08:00 |
|
pandamicro
|
24c667c00a
|
Merge pull request #4 from pandamicro/master
Sync with cocos2d-x v3.13
|
2016-08-26 15:50:58 +08:00 |