Commit Graph

245 Commits

Author SHA1 Message Date
pandamicro c8188b5211 Merge remote-tracking branch 'origin/v1.7' into next 2017-11-22 13:58:23 +08:00
Jare Guo dbfd31631f Merge pull request #2125 from cocos-creator/v1.7-release
sync branches
2017-11-21 20:26:35 +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
pandamicro ee81c3870b Reset bound texture each frame 2017-11-09 11:25:31 +08:00
Jare Guo 364f830a9c spine's __preload should not reinvoked in dev mode 2017-11-06 16:12:32 +08:00
pandamicro 8cc054c833 Fix super calls to old sg components 2017-10-26 11:09:58 +02:00
pandamicro 553e62c5bc Fix Texture width / height API usage 2017-10-11 13:49:28 +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
Jare Guo e0468ff9f9 Merge pull request #1 from feijing566/master
[dragonBones] Determine whether there is a new armature
2017-09-27 02:37:25 -05:00
feijing566 3f63f50859 Determine whether there is a new armature 2017-09-26 14:32:05 +08:00
Jare Guo 391070653b fix anysdk getIAPPlugins 2017-09-22 12:00:34 +08:00
Jare Guo 1c2fd007fb remove cc.DrawNode from core module 2017-09-10 23:09:34 +08:00
Jare Guo e0e8169759 remove cc._drawingUtil from core module
private cc.DrawingPrimitiveCanvas and cc.DrawingPrimitiveWebGL
2017-09-10 22:46:25 +08:00
Jare Guo 760a379aa3 fix memory leaks of dragonbones on native 2017-08-25 21:44:55 +08:00
Jare Guo 363aed3e2f update doc 2017-08-12 10:28:53 +08:00
Jare Guo d872e93ea9 Merge pull request #1837 from jareguo/master
优化单元测试编译速度
2017-07-26 18:10:32 +08:00
pandamicro 6533180e9d Remove ...args in engine 2017-07-26 18:03:58 +08:00
Jare Guo d04a9dcc37 fix spine addAnimation on native 2017-07-25 11:17:36 +08:00
pandamicro d6408b08fc Fix spine rotation calculation mistake 2017-07-24 18:36:12 +08:00
pandamicro 0779e5a3c6 Fix spine empty slot breaking batch issue and cleanup code 2017-07-13 23:39:43 +08:00
pandamicro 33b0ef954f Fix skeleton batching issue 2017-07-13 14:26:35 +08:00
pandamicro 147952966a Support skeletons batching for spine 2017-07-13 12:56:59 +08:00
pandamicro df1825116d Fix spine breaking batch rendering issue 2017-07-11 18:06:39 +08:00
Wang Nan aef0fbdf66 Merge pull request #1775 from cocos-creator/v1.5
merge V1.5
2017-06-30 10:15:31 +08:00
Jare Guo 961920d9e1 fix ts def 2017-06-28 10:25:45 +08:00
Jare Guo d936b9628b fix CC_DEV in build worker 2017-06-21 17:34:17 +08:00
Jare Guo cf92fc7c78 fix api doc 2017-06-09 09:53:48 +08:00
knoxHuang 06a96937d4 fix spine opacity err for #fireball/issues/5868 2017-06-08 14:42:17 +08:00
knoxHuang 922187e3be add dragonBones.d.ts 4.5 2017-06-08 13:21:04 +08:00
Nan Wang 32a90f5ad6 update api doc for anysdk and systemEvent 2017-05-16 17:35:38 +08:00
zilongshanren 680a6f05b4 add missing CC_DEV macro to component tooltip 2017-05-02 10:16:28 +08:00
Jare Guo f054f504b6 fix typescript api 2017-04-26 17:17:59 +08:00
pandamicro 34cd3c30b7 Remove arguments usage in jsb 2017-03-12 15:25:36 +08:00
zhangbin ea2d9af39b Init the event listeners when the sgNode of spine is re-created. 2017-03-06 12:01:54 +08:00
zhangbin 71ea7572a0 Fix that playTimes parameter of playAnimation is no effect sometimes. 2017-03-03 12:06:44 +08:00
zhangbin ebb5f5f60a Improve the implementation of the Spine event callback. 2017-02-22 18:04:58 +08:00
zhangbin af49fd7fe7 Solve the error format of DragonBones API documents. 2017-02-21 16:01:14 +08:00
Jare Guo 846e83b467 Merge pull request #1493 from natural-law/db-hot-fix
Solve the error logic of CCSlot._updateZOrder.
2017-02-16 15:44:07 +08:00
Jare Guo a51c20d0f4 Merge pull request #1497 from natural-law/solve-spine-issue
Solve the error effect when a spine node with custom color.
2017-02-15 15:37:18 +08:00
zhangbin 7065902c00 Reviewed issue. 2017-02-15 15:28:57 +08:00
zhangbin c1a5bdd97d Solve the error effect when a spine node with custom color. 2017-02-15 15:28:57 +08:00
zhangbin e7957b4f5c Solve the opacity & color errors of children armatures. 2017-02-15 14:58:39 +08:00
zhangbin 77c349cd96 Solve the error logic of CCSlot._updateZOrder. 2017-02-15 14:12:18 +08:00
zhangbin d0e88c80c0 Modify the callback argument of spine event listener.
Change the argument trackIndex to trackEntry.
2017-02-10 17:18:45 +08:00
pandamicro 38226ea61f Flat visit call stack by move visit from render command to node 2017-01-22 17:35:38 +08:00
pandamicro a9aaaec6ab Improve RenderCmd construction performance 2017-01-22 17:34:22 +08:00
pandamicro eb71e44cb8 Remove useless modules 2017-01-22 17:34:22 +08:00
zhangbin 06f0a0422e Solve the DragonBones event listeners will be missed when armature is changed in JSB. 2017-01-20 16:50:34 +08:00