Commit Graph

75 Commits

Author SHA1 Message Date
zhangbin edc6940902 Update the class SkeletonBatch in spine runtime. 2017-02-03 13:44:30 +08:00
Wang Nan 62a55fa172 Merge pull request #520 from zilongshanren/fix-bmfont-use-same-texture-issue
fix memory leaks of graphics node
2017-01-24 14:16:56 +08:00
zilongshanren 052e40a9f8 fix memory leaks of graphics node 2017-01-24 11:45:39 +08:00
zhangbin 6d80e8a931 Solve the error effect in the spine runtime. 2017-01-18 09:34:07 +08:00
zhangbin 8f9b57c1c7 Destroy the SkeletonBatch instance when the director is reset. 2017-01-06 15:21:30 +08:00
zhangbin 34b5595d3a Update the Spine runtime to version 3.5.35. 2017-01-05 14:36:52 +08:00
zhangbin 08632448fd Solve the crash when using DragonBones on Android. 2017-01-03 18:29:56 +08:00
zhangbin c473adea7c Improve the usage of addEvent & removeEvent of CCArmatureDisplay. 2016-12-22 16:38:21 +08:00
Wang Nan 7e9973a8b5 Merge pull request #450 from natural-law/issue4891
Update the runtime version of DragonBones.
2016-12-22 14:14:27 +08:00
zhangbin de4054208f Add js binding for CCFactory::getFactory. 2016-12-21 17:16:46 +08:00
zilongshanren 83d61dcbf7 add bitmap font batch rendering 2016-12-21 16:51:04 +08:00
zhangbin 0b0bc1121c Update the runtime version of DragonBones. 2016-12-20 11:19:07 +08:00
zhangbin ab293df6bd Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into dragonbones
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
2016-09-22 17:42:48 +08:00
zhangbin c981f0e488 Improve the implementation of dragonbones. 2016-09-22 17:37:35 +08:00
zhangbin eb4ce7d13a Solve the errors in jsbindings. 2016-09-21 15:23:35 +08:00
2youyouo2 1d856b396c fixed graphics crash when line cap is round 2016-09-20 17:00:18 +08:00
zhangbin 070bada185 Solve the errors in js bindings. 2016-09-19 17:44:12 +08:00
zhangbin bbae20da07 Add config for dragonbones jsbinding. 2016-09-09 16:02:33 +08:00
zhangbin ed591faa19 Merge branch 'develop' into dragonbones
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	external/config.json
2016-09-08 09:52:09 +08:00
Nan Wang ef368ef409 merged v1.2 2016-09-07 18:47:59 +08:00
zilongshanren e8f195cf82 refactoring scale9sprite and fix gray scale shader 2016-09-07 14:52:50 +08:00
natural-law a240bef9bc Add dragonbones project for win32. 2016-08-30 15:21:48 +08:00
zhangbin ae0e94825b Solve the error of using camera in Dragon Bones. 2016-08-30 11:49:23 +08:00
zhangbin 66289d5cf5 Add source code for dragon bones runtime 2016-08-29 18:39:30 +08:00
pandamicro 9bf561baee Upgrade to v3.13 release 2016-08-26 14:30:32 +08:00
pandamicro 7bfc19497b Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-08-16 11:34:42 +08:00
2youyouo2 b7c07b6b6c fixed graphics arc 2016-08-15 12:01:57 +08:00
pandamicro 1dd701936b Fix compilation issues on Mac 2016-08-11 13:57:51 +08:00
2youyou2 5172ec698d tab to 4 spaces 2016-08-09 15:59:19 +08:00
2youyou2 7dc1869a41 fixed graphics crash on windows 2016-08-09 15:54:40 +08:00
pandamicro 4afa545394 Upgrade cocos/editor-support/spine to v3.13 2016-08-05 16:03:41 +08:00
pandamicro 46fd733efb Upgrade cocos/editor-support/cocostudio to v3.13 2016-08-05 14:57:18 +08:00
pandamicro b0287ce6de Upgrade cocos/editor-support/cocosbuilder to v3.13 2016-08-04 17:30:55 +08:00
2youyouo2 bd6ab8f06c fixed typo 2016-07-22 15:20:49 +08:00
pandamicro 52fba54022 Merge pull request #242 from dabingnn/fix_s9Sprite_texel_strech
fix texel strech in scale9 sprite
2016-07-22 10:56:22 +08:00
Huabing.Xu 3c45d2fc48 fix texel strech in scale9 sprite 2016-07-21 16:59:54 +08:00
2youyouo2 be71d21e7f convert tab to 4 space 2016-07-19 16:04:09 +08:00
2youyou2 edd5f3c93d fixed crash on windows 2016-07-19 15:57:49 +08:00
Wang Nan 9c9cc23bcf Merge pull request #209 from cocos-creator/v1.1
merge V1.1
2016-07-18 10:21:42 +08:00
zhangbin b397ac686e Solve the errors in simulator project. 2016-07-12 14:00:09 +08:00
2youyouo2 6ec312d892 Merge branch 'develop' of github.com:2youyouo2/cocos2d-x-lite into develop 2016-07-06 14:02:27 +08:00
2youyouo2 bc038a61a3 fixed graphics roundRect api 2016-07-06 14:02:10 +08:00
2youyou2 c0dee4ed6e fixed windows graphics 2016-07-06 09:36:55 +08:00
2youyouo2 c4fc8d0e84 add graphics 2016-06-30 14:56:31 +08:00
Huabing.Xu 9f9c813e22 fix tiled sprite exceed 65536 vertices 2016-06-08 13:35:27 +08:00
Huabing.Xu 57037c1cbe uniform works 2016-05-27 10:49:07 +08:00
Huabing.Xu 1f0262622f add uniform settings 2016-05-27 10:43:08 +08:00
Huabing.Xu 2ce14b8b10 add distortion shader 2016-05-26 16:53:57 +08:00
Wenhai Lin 5935df42be Fixed compile fail on Mac 2016-05-18 22:32:40 +08:00
Wenhai Lin 7c57507422 Use const references whenever possible 2016-05-18 14:55:47 +08:00