Commit Graph

26 Commits

Author SHA1 Message Date
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
yinkaile 96fc05e80b fixed dragon bones 2018-01-29 15:13:05 +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
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
yinkaile aa41a196d0 fixed child armature display 2018-01-08 15:51:55 +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 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
Jare Guo 36f2767e41 tweaks (+1 squashed commit)
Squashed commits:
[f2bb64e] tweaks
2017-10-07 16:18:51 +08:00
zhangbin e7957b4f5c Solve the opacity & color errors of children armatures. 2017-02-15 14:58:39 +08:00
zhangbin 10a9c22079 Add interface setNodeToParentTransform for the rendering of DragonBones. 2016-12-28 16:48:53 +08:00
zhangbin 986b9f7de6 Update the wrapper implementation for DragonBones. 2016-12-21 17:18:47 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
zhangbin f6e0d6b21c Solve the reviewed issues. 2016-12-08 10:11:18 +08:00
zhangbin 6ecd9813a2 Support mesh of DragonBones in WebGL. 2016-12-07 16:34:50 +08:00
zhangbin 8fb69ed872 Solve the error when DragonBones resources using mesh. 2016-10-14 16:19:51 +08:00
zhangbin 4f53640c0a Solve the error in runtime environment. 2016-10-09 16:47:09 +08:00
zhangbin 814e923d65 Add component ArmatureDisplay for dragon bones. 2016-09-05 16:37:56 +08:00
zhangbin 3f94336b8c Add dragonbones support. 2016-09-02 14:57:34 +08:00