Commit Graph

4833 Commits

Author SHA1 Message Date
Jare Guo 47dc522e92 support formerlySerializedAs attribute 2017-08-31 12:27:49 +08:00
Wang Nan 81db0b1223 Merge pull request #1939 from 2youyou2/optimize-event-target
add event flag to optimize event target
2017-08-30 14:21:46 +08:00
2youyouo2 90317e8808 refine code 2017-08-29 11:34:46 +08:00
2youyouo2 c95e998fc9 refine code 2017-08-29 11:28:51 +08:00
2youyouo2 fc24942ae1 refine code 2017-08-29 11:28:09 +08:00
2youyouo2 67ebef5138 add event flag to optimize event target 2017-08-28 16:36:41 +08:00
Wang Nan a41856dd41 Merge pull request #1937 from cocos-creator/v1.6
merge V1.6
2017-08-28 10:56:58 +08:00
Wang Nan 6084eeeb22 Merge pull request #1911 from dumganhar/jsb2.0
Changes for jsb2.0
2017-08-28 10:09:21 +08:00
Wang Nan 71ecadb6d9 Merge pull request #1927 from jareguo/master
optimize deserialize
2017-08-28 10:08:43 +08:00
Wang Nan 9da82bc4e8 Merge pull request #1935 from jareguo/v1.6
fix memory leaks of DragonBones on native
2017-08-28 10:07:52 +08:00
Wang Nan ff593f9854 Merge pull request #1929 from VisualSJ/v1.6-audio
Can't cancel all events (audio engine)
2017-08-28 10:07:06 +08:00
Jare Guo 760a379aa3 fix memory leaks of dragonbones on native 2017-08-25 21:44:55 +08:00
Jare Guo 268a9d59e3 Merge pull request #1934 from knoxHuang/v1.6
add Layout and Widget warn for fireball/issues/6308
2017-08-25 13:55:33 +08:00
knoxHuang af627d3bd1 add Layout and Widget warn for fireball/issues/6308 2017-08-25 13:52:21 +08:00
Jare Guo c18bedc215 Merge pull request #1933 from knoxHuang/v1.6
add _updateLayout API for CCLayout
2017-08-25 11:17:36 +08:00
knoxHuang c4c2a7b569 refine api 2017-08-25 11:11:23 +08:00
knoxHuang 840c9f4b11 add _updateLayout API for CCLayout 2017-08-25 10:54:09 +08:00
Wang Nan 53ce5edc1f Merge pull request #1928 from VisualSJ/v1.6-loader
Loading-items 注销的问题
2017-08-24 17:31:46 +08:00
Jare Guo 545d31ab9d Merge pull request #1930 from pandamicro/v1.6
fix sort bug in Scale9Sprite data pool
2017-08-24 17:23:12 +08:00
pandamicro f34aa90803 Use static function 2017-08-24 17:19:25 +08:00
pandamicro 475ea35b0c fix sort bug in Scale9Sprite data pool 2017-08-24 17:15:23 +08:00
VisualSJ fc79b39141 Can't cancel all events (audio engine) 2017-08-24 14:26:10 +08:00
VisualSJ 3d787f028e Must be destroy loading-items 2017-08-24 13:38:23 +08:00
Jare Guo 78b7a0d149 optimize deserialize 2017-08-24 13:00:53 +08:00
Jare Guo 3055157fb7 Sync 1.6
# Conflicts:
#	cocos2d/core/platform/js.js
2017-08-24 11:56:36 +08:00
Jare Guo ce1abe9d2e Merge pull request #1909 from jareguo/master
remove antialias on mobile
2017-08-24 11:54:30 +08:00
Jare Guo b0f311ec0b Merge pull request #1926 from jareguo/v1.6
optimize prefab instantiation for the first time (+1 squashed commit)
2017-08-24 11:53:15 +08:00
Jare Guo 5d041319c3 optimize prefab instantiation for the first time (+1 squashed commit)
Squashed commits:
[6c4adde] optimize prefab instantiation for the first time
2017-08-24 11:47:58 +08:00
Wang Nan 9390f9e0a3 Merge pull request #1925 from knoxHuang/v1.6
fix label error for fireball/issues/6066
2017-08-24 11:27:37 +08:00
knoxHuang 55e49f62f7 fix label error for fireball/issues/6066 2017-08-24 11:25:47 +08:00
Jare Guo 86cb426f35 Merge pull request #1924 from jareguo/v1.6
sync jsb-director
2017-08-24 11:03:38 +08:00
Jare Guo c2a3ee32cb sync jsb-director 2017-08-24 11:01:05 +08:00
Jare Guo dbeb6c32d1 Merge pull request #1923 from knoxHuang/v1.6
The webView event will not respond under CC_EDTIOR for fireball/issue…
2017-08-23 16:26:55 +08:00
knoxHuang 0c093a8c3f The webView event will not respond under CC_EDTIOR for fireball/issues/6299 2017-08-23 16:10:08 +08:00
Jare Guo 7008631044 remove CCLogInfos_deprecated.js 2017-08-22 16:49:26 +08:00
Jare Guo 02cd3ea781 private cc.inputManager 2017-08-22 16:45:52 +08:00
Wang Nan 3ec11c0637 Merge pull request #1921 from jareguo/v1.6
Cherry pick from master
2017-08-22 14:59:34 +08:00
Jare Guo e62aad53fc update doc 2017-08-22 14:02:51 +08:00
Jare Guo 12295dfc94 fix default value of typescript after build 2017-08-22 14:02:44 +08:00
Jare Guo 91b42560da check if user overwrite destroy in component unexpectedly 2017-08-22 14:01:46 +08:00
Jare Guo 90833865e5 reviewed 2017-08-22 13:59:39 +08:00
Jare Guo 200c41a74b should not auto release assets used by persist nodes 2017-08-22 13:58:50 +08:00
Jare Guo 3cef7fdfab add cc.path.stripSep (+1 squashed commit)
Squashed commits:
[5c386cc] stash
2017-08-22 13:53:52 +08:00
Jare Guo 287cb7878b Merge pull request #1920 from cocos-creator/v1.5
Sync 1.5
2017-08-22 13:46:39 +08:00
Jare Guo 57b793104f Merge pull request #1919 from 2youyou2/cc._require
remove cc._require
2017-08-22 11:55:15 +08:00
pandamicro 950a83738f Merge pull request #1918 from jareguo/v1.6
V1.6
2017-08-22 11:52:44 +08:00
2youyouo2 fee17aee0e revert changes 2017-08-22 11:37:02 +08:00
2youyouo2 cf88a9b817 remove cc._require 2017-08-22 11:30:58 +08:00
Jare Guo 938bbc3767 off-topic: should not remove query of download url (reserve “?useDom=1”) 2017-08-22 10:09:02 +08:00
Jare Guo 076cf9e792 fix cache url of texture 2017-08-21 22:23:31 +08:00