pandamicro
|
1f5cda12e2
|
Remove scheduleCallbackForTarget with selector usage
|
2017-10-06 15:25:06 +08:00 |
|
pandamicro
|
ace6e0bee3
|
Merge pull request #871 from pandamicro/develop
Add CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL_TMX to control texture shrink…
|
2017-10-01 20:49:47 +08:00 |
|
James Chen
|
37e0865cbf
|
Adds docs for JSB2.0
|
2017-09-30 15:53:35 +08:00 |
|
pandamicro
|
18350c5451
|
Add CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL_TMX to control texture shrink in tiled map
|
2017-09-30 12:54:48 +08:00 |
|
2youyouo2
|
859b9b1302
|
remove copy_resources from android-studio build-cfg.json
|
2017-09-29 16:10:56 +08:00 |
|
James Chen
|
7c0b328dd3
|
typo fix in sm/ScriptEngine.cpp
|
2017-09-29 10:30:40 +08:00 |
|
James Chen
|
d6a177ea65
|
Include file tweak.
|
2017-09-29 10:19:57 +08:00 |
|
Wang Nan
|
7dff34ee6d
|
Merge pull request #867 from dumganhar/jsb2.0
Fixes hAlignment argument isn't used in Label::initWithTTF and refactor few code in Label constructor.
|
2017-09-28 04:55:17 -05:00 |
|
James Chen
|
066a32da8b
|
Merge pull request #866 from 2youyou2/xxtea
use xxtea to decode compiled js files
|
2017-09-28 04:54:50 -05:00 |
|
2youyouo2
|
a0b5a77b40
|
update external version
|
2017-09-28 17:49:43 +08:00 |
|
2youyouo2
|
5cfc3ec097
|
change onGetDataFromFile param to callback function
|
2017-09-28 17:06:55 +08:00 |
|
2youyouo2
|
6ede326e83
|
Merge branch 'xxtea' of github.com:2youyouo2/cocos2d-x-lite into xxtea
|
2017-09-28 15:32:54 +08:00 |
|
2youyouo2
|
f4fcf75547
|
Adds static keyword for removeFileExt function.
|
2017-09-28 15:32:00 +08:00 |
|
James Chen
|
eed4b2fda6
|
Fixes hAlignment argument isn't used in Label::initWithTTF and refactor few code in Label constructor.
|
2017-09-28 15:27:59 +08:00 |
|
2youyou2
|
97f7aacebd
|
add xxtea files to vs project
|
2017-09-28 11:26:14 +08:00 |
|
James Chen
|
ede0182d21
|
Sync projection bug fix from cocos2d-x pull/17487
|
2017-09-27 16:06:27 +08:00 |
|
2youyouo2
|
bc8c5c1bee
|
add xxtea support
|
2017-09-27 16:03:07 +08:00 |
|
James Chen
|
4261b900f2
|
Removes old png file in ios project
|
2017-09-27 11:51:19 +08:00 |
|
James Chen
|
5f19e5d7c2
|
iPhone X fullscreen support. Uses Images.xcassets for AppIcon and storyboard for launchscreen.
|
2017-09-26 18:12:30 +08:00 |
|
James Chen
|
5ceb676990
|
Merge pull request #863 from dumganhar/jsb2.0
iOS project configuration fix after merging pull/846
|
2017-09-26 04:50:57 -05:00 |
|
James Chen
|
0e951c20ae
|
iOS project configuration fix.
|
2017-09-26 17:48:24 +08:00 |
|
James Chen
|
4c7a724b0e
|
Merge pull request #862 from CocosRobot/update_cocosfiles_1506410132
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-26 03:58:46 -05:00 |
|
James Chen
|
d031718857
|
Merge pull request #861 from knoxHuang/develop
fix editorBox setText error for engine/issues/1961
|
2017-09-26 03:58:18 -05:00 |
|
CocosRobot
|
dc78ef2d90
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-09-26 07:15:32 +00:00 |
|
James Chen
|
28d9ad258b
|
Removes unused \n string ending since LOGD and LOGE in jswrapper need \n at the end of string.
|
2017-09-26 15:09:16 +08:00 |
|
knoxHuang
|
3b3f80712e
|
fix editorBox setText error for engine/issues/1961
|
2017-09-26 15:00:50 +08:00 |
|
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 |
|
CocosRobot
|
40ce4bc971
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-09-26 03:05:45 +00: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
|
b83ce1e69e
|
minor tweak for #834
|
2017-09-26 10:27:25 +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 |
|