Commit Graph

5327 Commits

Author SHA1 Message Date
yinkaile cb082ef121 fixed init dragonbones material 2018-01-09 16:33:14 +08:00
yinkaile c1f88405b5 support sprite gray state 2018-01-09 16:12:25 +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
yinkaile c2446f1dd0 fixed tiledmap remder issue 2018-01-05 14:39:53 +08:00
pandamicro bc28868b0c Merge pull request #2237 from 2youyou2/next
support dragonbones for new renderer
2018-01-05 09:43:29 +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 5f67077ac0 Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
#	extensions/dragonbones/CCArmatureDisplay.js
2018-01-03 17:23:37 +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
pandamicro a63792622c Merge pull request #2226 from pandamicro/next
Walker supports multiple render data per component
2017-12-29 01:31:33 +08:00
pandamicro 13a4dc7e50 Walker supports multiple render data per component 2017-12-29 01:26:30 +08:00
pandamicro f4c589d8c1 Remove useless files
- DrawingPrimitives
- Scale9Sprite
- SpriteBatchNode
- RenderTexture
- DrawNode
2017-12-26 16:46:06 +08:00
pandamicro 035f82b4a3 Merge pull request #2212 from 2youyou2/next
fixed several bugs
2017-12-26 16:42:54 +08:00
yinkaile 2efc147fe2 Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
#	cocos2d/core/CCDirectorCanvas.js
#	cocos2d/core/CCDirectorWebGL.js
#	cocos2d/core/base-nodes/CCSGNode.js
#	cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js
#	cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js
#	cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js
#	cocos2d/particle/CCParticleSystem.js
2017-12-26 16:11:50 +08:00
yinkaile 99cdd33327 fixed crashed when switch to the same scene again 2017-12-26 15:54:42 +08:00
yinkaile 4dba8b20b4 fixed auto-release warning 2017-12-26 15:53:58 +08:00
pandamicro 8de69cc185 Merge pull request #2210 from pandamicro/next
Support GPU based ParticleSystem in new renderer
2017-12-26 15:27:22 +08:00
yinkaile 5e78d1df2e remove unused code 2017-12-26 14:30:07 +08:00
yinkaile a8abf934ae fixed deprecated function 2017-12-26 14:29:39 +08:00
yinkaile 99f7edc461 add Rect.transformMat4 2017-12-26 14:23:00 +08:00
pandamicro 97f25414cf Remove old ParticleSystem implementation 2017-12-25 20:07:28 +08:00
pandamicro 120ac1f586 Fix color deserialize issue and support negative delta color 2017-12-25 20:05:35 +08:00
yinkaile fed14c2b07 fixed touch event order not right 2017-12-25 19:01:50 +08:00
pandamicro f292a949c8 Improve code and comment in renderer/index 2017-12-25 17:28:36 +08:00
pandamicro c0a93ee689 Update render engine 2017-12-25 17:27:18 +08:00
pandamicro 6c83d3fb93 Fix indexBuffer of particle assembler 2017-12-25 17:26:38 +08:00
pandamicro 8aff292ab2 Fix ParticleSystem file config overload custom issue 2017-12-25 17:26:18 +08:00
pandamicro 226039e41b Fix node not restored to dummyNode in walker 2017-12-25 17:23:53 +08:00
yinkaile e3ff6f6fb3 fixed node hitTest 2017-12-25 16:01:56 +08:00
yinkaile d85ca563f7 fixed node data type 2017-12-25 16:01:45 +08:00
pandamicro 706f637b34 Add useModel to assemblers, use comp.node as model 2017-12-25 14:34:35 +08:00
pandamicro a31c515557 Merge remote-tracking branch 'fireball/next' into next 2017-12-25 14:04:34 +08:00
pandamicro eaa80dd779 Incomplete GPU based particle system support 2017-12-25 14:03:28 +08:00
pandamicro 8cf1591e3a Use cc.renderer to point at new renderer 2017-12-25 14:02:15 +08:00
Jare Guo ebad7082bf add gulp build-html5-preview-dev to optimize build time for development preview 2017-12-22 18:16:10 +08:00
pandamicro d3f25aee31 Merge pull request #2204 from 2youyou2/next
refactor sprite assembler structure
2017-12-22 16:01:53 +08:00
yinkaile e5344a013f refactor sprite assembler structure 2017-12-22 15:38:31 +08:00
yinkaile e23a97d790 fixed node matrix is wrong when undo/redo 2017-12-22 15:05:20 +08:00
pandamicro 90b79d9295 Merge pull request #2198 from 2youyou2/next
support tiledmap for new renderer
2017-12-21 13:55:44 +08:00
yinkaile 6ceb4c36de fixed global variable 2017-12-21 11:55:30 +08:00
yinkaile 7cfae81e51 support tiledmap 2017-12-21 11:39:19 +08:00
yinkaile 2bd439e890 fixed motion streak 2017-12-21 11:38:11 +08:00
pandamicro 1d343895f8 Merge pull request #2191 from 2youyou2/next
add label assembler
2017-12-19 14:43:29 +08:00
yinkaile e30ce09da4 small fix 2017-12-19 10:26:10 +08:00
yinkaile 186910d426 Merge branch 'next' of github.com:fireball-x/engine into next 2017-12-18 18:05:57 +08:00