Commit Graph

91 Commits

Author SHA1 Message Date
pandamicro b531040ac4 Update licenses 2018-03-13 15:52:14 +08:00
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
pandamicro 5f09233526 Improve engine modules
s
2018-03-07 18:50:51 +08:00
pandamicro 283f5c17d6 Improve render data management by RenderComponent 2018-03-07 10:49:58 +08:00
pandamicro 3358b71f79 Improve batchData content setting 2018-03-07 10:41:11 +08:00
Jare Guo 6c809263e6 Merge 1.8 2018-02-24 14:58:57 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
Jare Guo bd15543093 updating license: Chukong Aipu -> Xiamen Yaji 2018-01-31 17:51:49 +08:00
yinkaile 96fc05e80b fixed dragon bones 2018-01-29 15:13:05 +08:00
James Chen eb3745c317 Reverts dragonBones CCFactory change to avoid assert. 2018-01-29 11:15:14 +08:00
Jare Guo ded7092432 Merge branch 'v1.8'
# Conflicts:
#	cocos2d/core/platform/deserialize.js
#	extensions/dragonbones/CCFactory.js
#	gulp/util/utils.js
2018-01-25 13:47:35 +08:00
James Chen bba9299dbb Rename CCFactory.getFactory to CCFactory.getInstance. 2018-01-18 14:18:35 +08:00
James Chen 715086e3a7 Resolve a FIXME in AramatureDisplay.js, CCFactory is a singlton for JSB either now. 2018-01-18 11:59:45 +08:00
yinkaile fe05892708 Merge branch 'next' of github.com:fireball-x/engine into next 2018-01-16 17:56:52 +08:00
yinkaile 8c18b5efa6 small fix some problems 2018-01-16 17:55:13 +08:00
pandamicro 444360c603 Fix dragonbones texture asset issue 2018-01-16 17:28:52 +08:00
pandamicro 7712da14f5 Merge remote-tracking branch 'fireball/master' into next 2018-01-15 17:51:33 +08:00
Jare Guo 935eea691e fix dragonbones api 2018-01-15 17:09:20 +08:00
pandamicro 2331c1f741 Fix byteOffset calculation based on the current vfmt
It should be incremented during batching process and store into batchData
2018-01-12 12:38:22 +08:00
yinkaile cb082ef121 fixed init dragonbones material 2018-01-09 16:33:14 +08:00
yinkaile aa41a196d0 fixed child armature display 2018-01-08 15:51:55 +08:00
yinkaile b059f1d4c9 support dragonbones debugdraw 2018-01-08 15:06:38 +08:00
shay_chen b96631a482 Merge remote-tracking branch 'cocos-creator/master' 2018-01-04 15:08:57 +08:00
yinkaile 9aca8c6485 fixed dragonbones bugs 2018-01-04 10:36:10 +08:00
yinkaile 2a998fde3c optimize dragonbones 2018-01-03 18:55:14 +08:00
yinkaile 977752f4ff fixed bugs 2018-01-03 18:43:56 +08:00
yinkaile 17f9b95b0e use cc.Node as slot's display 2018-01-03 17:21:22 +08:00
yinkaile 96ba2b9d4e upgrade dragonebones to 5.6.2 2018-01-02 18:52:16 +08:00
yinkaile 4679858010 refine code 2018-01-02 15:08:50 +08:00
yinkaile 2a5a5d7fdf support dragonbones 2018-01-01 20:59:41 +08:00
Jare Guo 7a49509dc2 refactor dragonbones asset managment 2017-12-31 02:26:31 +08:00
shay_chen b5c4f2fae6 Delete the calls for object.retain() and object.release() 2017-12-27 18:34:35 +08:00
yinkaile 5e78d1df2e remove unused code 2017-12-26 14:30:07 +08:00
Jare Guo 33f80773b7 Merge commit '87304f287ab53bfe091b6ded51def95b6904db6e'
# Conflicts:
#	cocos2d/core/platform/preprocess-class.js
#	extensions/dragonbones/ArmatureDisplay.js
2017-12-21 15:52:45 +08:00
knoxHuang ebd147890e fix ArmatureDisplay addEventListener invalid for fireball/issues/6718 2017-12-19 10:42:14 +08:00
pandamicro c8188b5211 Merge remote-tracking branch 'origin/v1.7' into next 2017-11-22 13:58:23 +08:00
Jare Guo 1f94081e95 sync branch 2017-11-21 20:36:39 +08:00
knoxHuang 5a774481c0 add notes 2017-11-17 16:29:31 +08:00
knoxHuang 7f63df5045 fix dragonbones bug for fireball/issues/6413 2017-11-17 15:58:54 +08:00
Jare Guo 993ebf091b Merge pull request #2078 from cocos-creator/asset
将 Texture 重构为 Asset
2017-10-30 11:35:22 +08:00
feijing566 d11eacb0fe [dragonbones]miss clone _hasListenerCache 2017-10-30 10:41:42 +08:00
pandamicro 8cc054c833 Fix super calls to old sg components 2017-10-26 11:09:58 +02:00
Jare Guo 36f2767e41 tweaks (+1 squashed commit)
Squashed commits:
[f2bb64e] tweaks
2017-10-07 16:18:51 +08:00
Jare Guo a1c535c6bb update texture in property 2017-10-07 16:18:51 +08:00
pandamicro 48faf3ca49 Removed SGComponent, ComponentInSG, ComponentUnderSG 2017-10-06 17:54:34 +08:00
Jare Guo 3742ab8f16 Revert "修复 DragonBones 名字相同,骨骼数据不同时无法正确加载的问题" 2017-09-28 04:58:07 -05:00
feijing566 3f63f50859 Determine whether there is a new armature 2017-09-26 14:32:05 +08:00
Jare Guo fbd473117c tweaks 2017-09-18 18:13:23 +08:00
Jare Guo 1c2fd007fb remove cc.DrawNode from core module 2017-09-10 23:09:34 +08:00
Jare Guo 760a379aa3 fix memory leaks of dragonbones on native 2017-08-25 21:44:55 +08:00