Commit Graph

1676 Commits

Author SHA1 Message Date
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
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
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 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 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 11e0e21267 Adds Downloader binding comment. 2017-09-25 16:48:02 +08:00
James Chen 47c9e74346 fix console.log doesn't output in creator console. 2017-09-25 16:35:00 +08:00
James Chen 17a97d0aff fixed #839: Adds event.target for websocket callback. 2017-09-25 11:54:20 +08:00
James Chen cf935f484c fix XMLHttpRequest.open binding. 2017-09-25 10:04:10 +08: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
CocosRobot 09476fdfa6 [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-22 10:11:21 +00: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 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
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
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
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
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
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
CocosRobot 54410fb4a3 [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-19 08:45:53 +00: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