James Chen
|
db53549dfc
|
Adds anysdk bindings configuration.
|
2017-09-22 17:39:00 +08:00 |
|
James Chen
|
9bd655dbc6
|
Merge pull request #842 from dumganhar/fix/jsb2.0-sync-v1.6
jsb2.0 sync v1.6
|
2017-09-22 04:36:36 -05:00 |
|
James Chen
|
a0a312814d
|
Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into fix/jsb2.0-sync-v1.6
|
2017-09-22 17:32:36 +08:00 |
|
Knox
|
5e44f1c1f1
|
fix EditorBox set text color error for fireball/issues/6404 (#840)
|
2017-09-22 03:39:41 -05:00 |
|
Wang Nan
|
686f6e9f90
|
Merge pull request #838 from knoxHuang/v1.6
fix webview bug for ios for fireball/issues/6328
|
2017-09-22 10:31:52 +08:00 |
|
knoxHuang
|
de909410be
|
fix webview bug for ios for fireball/issues/6328
|
2017-09-21 16:42:10 +08:00 |
|
James Chen
|
1554d7b0c0
|
Updates download-deps.py (#837)
|
2017-09-20 23:39:55 -05:00 |
|
Wang Nan
|
ec8152f726
|
Merge pull request #836 from dumganhar/v1.6
Updates download-deps.py
|
2017-09-21 12:04:55 +08:00 |
|
James Chen
|
866ac36840
|
Updates download-deps.py
|
2017-09-21 12:02:02 +08:00 |
|
CocosRobot
|
e6467c3299
|
[ci skip][AUTO]: updating jsbinding automatically (#835)
|
2017-09-20 22:30:56 -05:00 |
|
Wang Nan
|
b6446424df
|
Merge pull request #834 from jareguo/v1.6
try to fix crash of dragonbones
|
2017-09-21 11:10:51 +08:00 |
|
James Chen
|
b4b07dbf99
|
Duplicated which will cause simulator compilation failed in release mode. (#833)
* Duplicated which will cause simulator compilation failed in release mode.
It comes from https://github.com/cocos-creator/cocos2d-x-lite/pull/700
* Simulator project fix for android.
* Updates cocos2d-console.
|
2017-09-20 22:08:42 -05:00 |
|
Jare Guo
|
9d8ed05932
|
[DragonBones] try to fix crash in AnimationState::_fadeIn
|
2017-09-21 11:01:31 +08:00 |
|
Wang Nan
|
f1b7483427
|
Merge pull request #832 from dumganhar/jsb2.0
Updates cocos2d-console and a warning fix in UrlAudioPlayer.cpp
|
2017-09-21 09:51:29 +08:00 |
|
James Chen
|
753c1fa352
|
Updates cocos2d-console and a warning fix in UrlAudioPlayer.cpp
|
2017-09-21 09:38:07 +08:00 |
|
Jare Guo
|
6f5c4760ba
|
[DragonBones] revert wrong optimization in 59905b8eb6
see https://github.com/DragonBones/DragonBonesCPP/issues/163
|
2017-09-21 00:27:56 +08:00 |
|
James Chen
|
b3018f029d
|
update win32 simulator project configuration. (#831)
|
2017-09-20 05:07:03 -05:00 |
|
pandamicro
|
01004b8d5f
|
Merge pull request #830 from pandamicro/v1.6
Fix screen resolution issue on iOS
|
2017-09-20 17:50:51 +08:00 |
|
pandamicro
|
c7e63f3769
|
Adjust png refs in xcode project
|
2017-09-20 17:49:33 +08:00 |
|
pandamicro
|
a83f52142f
|
Fix screen resolution issue on iOS
|
2017-09-20 17:25:26 +08:00 |
|
James Chen
|
8230176ccb
|
Fixes crash while click restart button in network test. (#829)
* Sync PR(https://github.com/cocos2d/cocos2d-x/pull/17921): remove "system" usage which is removed from iOS11.
* Fixes crash while click `restart` button in network test.
* printf -> LOGD
* Memory leak fix in XMLHttpRequest binding code.
|
2017-09-20 01:48:15 -05:00 |
|
pandamicro
|
4926b057e9
|
Merge pull request #828 from dumganhar/v1.6
Sync PR(https://github.com/cocos2d/cocos2d-x/pull/17921): remove "system" usage which is removed from iOS11.
|
2017-09-20 10:30:42 +08:00 |
|
James Chen
|
8a9251c91a
|
Sync PR(https://github.com/cocos2d/cocos2d-x/pull/17921): remove "system" usage which is removed from iOS11.
|
2017-09-20 10:16:10 +08:00 |
|
CocosRobot
|
d334a076c1
|
[AUTO][ci skip]: updating cocos2dx_files.json (#827)
|
2017-09-19 05:14:09 -05:00 |
|
James Chen
|
7f4088eb4a
|
Win32 template fix, LOGD could output log in vs in se module. (#826)
* Win32 template fix, LOGD could output log in vs in se module.
* Updates config.json
|
2017-09-19 05:09:07 -05:00 |
|
James Chen
|
bd694e9f88
|
Merge pull request #825 from CocosRobot/update_cocosfiles_1505810752
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-19 03:56:01 -05:00 |
|
CocosRobot
|
54410fb4a3
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-19 08:45:53 +00:00 |
|
James Chen
|
5a3c416371
|
Merge pull request #824 from 2youyou2/ccui
remove unused modules
|
2017-09-19 03:40:46 -05:00 |
|
2youyou2
|
8a808e4cdc
|
Merge branch 'ccui' of github.com:2youyouo2/cocos2d-x-lite into ccui
|
2017-09-19 15:53:34 +08:00 |
|
2youyou2
|
2bd4621a81
|
remove ccui headers
|
2017-09-19 15:52:07 +08:00 |
|
2youyouo2
|
6a5012df16
|
remove cocostudio files
|
2017-09-19 15:29:32 +08:00 |
|
2youyouo2
|
e642e4a7bb
|
remove unused code
|
2017-09-19 15:19:26 +08:00 |
|
2youyouo2
|
4547860b72
|
Merge branch 'ccui' of github.com:2youyouo2/cocos2d-x-lite into ccui
|
2017-09-19 13:38:04 +08:00 |
|
2youyouo2
|
6d0c528d3b
|
revert changes
|
2017-09-19 13:37:17 +08:00 |
|
2youyou2
|
276c8d2b37
|
remove unused ccui files
|
2017-09-19 11:25:39 +08:00 |
|
pandamicro
|
10bfe7a407
|
Merge pull request #823 from pandamicro/v1.6
Fix JSB potential issues
|
2017-09-19 09:56:17 +08:00 |
|
pandamicro
|
d54cdb6f4d
|
Fix incorrect usage of PersistentRootedObject in jsb websocket
|
2017-09-19 09:55:21 +08:00 |
|
pandamicro
|
21ce3ba37d
|
Avoid Spidermonkey debug mode crash in jsb::Object
|
2017-09-19 09:54:46 +08:00 |
|
2youyouo2
|
6771164c5d
|
remove unused ccui
|
2017-09-18 18:16:51 +08:00 |
|
James Chen
|
35107e743a
|
Update config.json
|
2017-09-18 04:28:21 -05:00 |
|
James Chen
|
4a34bf238c
|
Merge pull request #822 from dumganhar/jsb2.0
attachChild -> attachObject for anysdk bindings.
|
2017-09-18 04:05:41 -05:00 |
|
James Chen
|
fcd6568b91
|
attachChild -> attachObject for anysdk bindings.
|
2017-09-18 17:04:23 +08:00 |
|
James Chen
|
d9b5047bfd
|
Merge pull request #821 from dumganhar/jsb2.0
macOS and iOS use JavaScriptCore, windows and android use V8.
|
2017-09-18 03:15:34 -05:00 |
|
James Chen
|
7dc8737e33
|
Updates external/config.json to 42.
|
2017-09-18 16:12:04 +08:00 |
|
James Chen
|
9dafab9c49
|
macOS and iOS use JavaScriptCore, windows and android use V8.
|
2017-09-18 16:11:50 +08:00 |
|
pandamicro
|
f46b42a458
|
Merge pull request #820 from CocosRobot/update_cocosfiles_1505465735
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-15 17:59:30 +08:00 |
|
CocosRobot
|
7469fc4911
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-15 08:55:35 +00:00 |
|
James Chen
|
7539ccdad5
|
Merge pull request #819 from dumganhar/jsb2.0
[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.
|
2017-09-15 03:50:43 -05:00 |
|
James Chen
|
c3a0f7e5bd
|
Merge pull request #818 from CocosRobot/update_js_bindings_1505442593
[ci skip][AUTO]: updating jsbinding automatically
|
2017-09-15 03:47:07 -05:00 |
|
James Chen
|
36b79452a2
|
update bindings-generator.
|
2017-09-15 10:47:03 +08:00 |
|