James Chen
|
24efeae53d
|
Merge pull request #846 from jareguo/develop
load image for existing texture
|
2017-09-26 01:59:32 -05:00 |
|
Jare Guo
|
2cca661439
|
tweaks
|
2017-09-26 14:57:51 +08:00 |
|
Jare Guo
|
da67ded746
|
Merge pull request #1 from dumganhar/pull/846
Adds CCThreadPool.cpp/.h to vs project.
|
2017-09-26 01:46:31 -05:00 |
|
James Chen
|
5c5a0a257a
|
Adds CCThreadPool.cpp/.h to vs project.
|
2017-09-26 14:34:22 +08:00 |
|
Jare Guo
|
7ffb0d40db
|
avoid multi-thread issue
|
2017-09-26 14:24:04 +08:00 |
|
James Chen
|
c968b315ec
|
Merge pull request #858 from CocosRobot/update_js_bindings_1506396361
[ci skip][AUTO]: updating jsbinding automatically
|
2017-09-26 00:36:13 -05:00 |
|
Jare Guo
|
c001b9db63
|
sync develop branch
|
2017-09-26 11:30:15 +08:00 |
|
CocosRobot
|
4523e9aee3
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-09-26 03:27:35 +00:00 |
|
James Chen
|
a314c520ff
|
Merge pull request #854 from knoxHuang/develop
fix editorbox bug for fireball/issues/6408
|
2017-09-25 22:22:41 -05:00 |
|
James Chen
|
989133df33
|
Merge pull request #856 from dumganhar/jsb2.0
Warning fix in CCConsole and dragonbones.
|
2017-09-25 22:18:40 -05:00 |
|
James Chen
|
22a4f8da15
|
Warning fix in CCConsole and dragonbones.
|
2017-09-26 11:16:20 +08:00 |
|
Jare Guo
|
21011d38d9
|
Merge commit 'ee808929a67ee7ad3b38f135cb2a67b8e32c89eb' into develop
|
2017-09-26 11:04:56 +08:00 |
|
knoxHuang
|
4e0d4f2711
|
fix editorbox bug for fireball/issues/6408
|
2017-09-26 10:52:42 +08:00 |
|
James Chen
|
ee808929a6
|
Merge pull request #852 from dumganhar/jsb2.0
Image refactor
|
2017-09-25 21:51:42 -05:00 |
|
James Chen
|
3c67a5b9ca
|
Adds delete keyword for nonmoveable and noncopyable constructor and assignment.
|
2017-09-26 10:36:53 +08:00 |
|
Jare Guo
|
1ea2fc1715
|
revert TextureCache, use ThreadPool instead
|
2017-09-26 10:18:01 +08:00 |
|
James Chen
|
d043cdb57b
|
CC_SAFE_DELETE -> CC_SAFE_RELEASE
|
2017-09-26 09:55:14 +08:00 |
|
James Chen
|
7fae7201d7
|
initWithImageFileThreadsafe -> initWithImageFile.
|
2017-09-26 09:55:00 +08:00 |
|
James Chen
|
c7089bfa86
|
Image refactor
|
2017-09-26 04:57:49 +08:00 |
|
James Chen
|
e675fcb82a
|
Merge pull request #851 from dumganhar/jsb2.0
Adds Downloader binding comment.
|
2017-09-25 03:55:15 -05:00 |
|
James Chen
|
11e0e21267
|
Adds Downloader binding comment.
|
2017-09-25 16:48:02 +08:00 |
|
James Chen
|
b0185520db
|
Merge pull request #850 from dumganhar/jsb2.0
[win32] fix console.log doesn't output in creator console.
|
2017-09-25 03:45:29 -05:00 |
|
James Chen
|
47c9e74346
|
fix console.log doesn't output in creator console.
|
2017-09-25 16:35:00 +08:00 |
|
James Chen
|
620edea655
|
Merge pull request #849 from dumganhar/jsb2.0
fixed #839: Adds event.target for websocket callback.
|
2017-09-25 02:56:39 -05:00 |
|
James Chen
|
17a97d0aff
|
fixed #839: Adds event.target for websocket callback.
|
2017-09-25 11:54:20 +08:00 |
|
James Chen
|
dc74c0d1e3
|
Merge pull request #848 from dumganhar/jsb2.0
fix XMLHttpRequest.open binding.
|
2017-09-24 21:33:09 -05:00 |
|
James Chen
|
cf935f484c
|
fix XMLHttpRequest.open binding.
|
2017-09-25 10:04:10 +08:00 |
|
James Chen
|
add2720b56
|
Merge pull request #847 from dumganhar/jsb2.0
Implements seval_to_TTFConfig, don't ignore createWithTTF and setTTFConfig in auto bindings.
|
2017-09-23 04:57:53 -05:00 |
|
James Chen
|
8b1ba02f9f
|
Implements seval_to_TTFConfig, don't ignore createWithTTF and setTTFConfig in auto bindings.
|
2017-09-23 17:53:24 +08:00 |
|
Jare Guo
|
769628d414
|
load image for existing texture
|
2017-09-23 09:18:51 +08:00 |
|
James Chen
|
b2f1d640ae
|
Merge pull request #845 from CocosRobot/update_cocosfiles_1506075080
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-22 05:32:38 -05:00 |
|
CocosRobot
|
09476fdfa6
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-22 10:11:21 +00:00 |
|
James Chen
|
cdb01da6dc
|
Merge pull request #844 from dumganhar/fix/jsb2.0-anysdk
[JSB2.0] anysdk works again.
|
2017-09-22 05:05:56 -05:00 |
|
James Chen
|
16655c21fb
|
updates external
|
2017-09-22 17:48:10 +08:00 |
|
James Chen
|
235be1ec8a
|
Updates bindings.
|
2017-09-22 17:47:38 +08:00 |
|
James Chen
|
8f036fbbb0
|
Anysdk works again.
|
2017-09-22 17:39:12 +08:00 |
|
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 |
|