Commit Graph

5571 Commits

Author SHA1 Message Date
pandamicro 4e4df6675e Fix spine texture asset issue 2018-01-16 17:29:22 +08:00
pandamicro 444360c603 Fix dragonbones texture asset issue 2018-01-16 17:28:52 +08:00
pandamicro 3aa3d3ebce Fix ParticleSystem property type issue 2018-01-16 17:28:28 +08:00
pandamicro 514906576c Fix mask image stencil issue 2018-01-16 17:28:15 +08:00
pandamicro 027274708f Fix issues caused by merging master 2018-01-16 17:28:05 +08:00
pandamicro 7712da14f5 Merge remote-tracking branch 'fireball/master' into next 2018-01-15 17:51:33 +08:00
pandamicro b09613a96b Merge pull request #2255 from 2youyou2/next
support edit box
2018-01-12 18:42:04 +08:00
pandamicro 8d5f503570 Merge pull request #2256 from pandamicro/next
Fix blend function not updated issue
2018-01-12 18:39:24 +08:00
yinkaile 520650d579 update ttf-assembler 2018-01-12 18:37:39 +08:00
pandamicro 3930bc8b1e Fix blend function not updated issue 2018-01-12 18:34:38 +08:00
yinkaile c8038d6a00 Merge branch 'next' of github.com:fireball-x/engine into next 2018-01-12 18:33:57 +08:00
yinkaile ae7d762bd7 support edit box 2018-01-12 17:54:14 +08:00
pandamicro 5d90ba9309 Merge pull request #2254 from pandamicro/next
Life control & auto remove for particle system
2018-01-12 17:54:04 +08:00
pandamicro 44a0472ebb Life control & auto remove for particle system 2018-01-12 17:39:07 +08:00
pandamicro 2d0435db12 Fix issue caused by render data effect absent 2018-01-12 17:38:38 +08:00
Jare Guo ff97584159 Merge pull request #2249 from VisualSJ/master
Add  node locked flag
2018-01-12 17:15:33 +08:00
VisualSJ 2d4a67b64a Add node locked flag 2018-01-12 17:13:13 +08:00
Jare Guo 0b0a4ccb3d Merge pull request #2253 from knoxHuang/master
add path api and refine code format
2018-01-12 16:36:22 +08:00
knoxHuang 9a092f8882 add path api and refine code format 2018-01-12 16:26:21 +08:00
pandamicro fde9b2dabb Merge pull request #2251 from pandamicro/next
Fix event manager not enabled issue
2018-01-12 16:16:37 +08:00
pandamicro 0b307fe70a Fix event manager not enabled issue 2018-01-12 14:11:35 +08:00
pandamicro 3d69ba8810 Merge pull request #2248 from pandamicro/next
Fix byteOffset calculation based on the current vfmt
2018-01-12 12:41:31 +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
pandamicro 00e002a4dc Merge pull request #2240 from pandamicro/next
Support Spine rendering
2018-01-11 13:48:28 +08:00
pandamicro 2290b830e5 Support spine debug draw 2018-01-11 13:45:35 +08:00
pandamicro 204b27c347 Use renderData to host all graphic data
removed _indicesBuffer and _colorBuffer
2018-01-11 13:44:16 +08:00
pandamicro 74b312ce50 Merge remote-tracking branch 'origin/next' into next 2018-01-11 11:00:23 +08:00
pandamicro 6b807a2707 Merge pull request #2245 from knoxHuang/fix_bug
fix slider bug for fireball/issues/6830
2018-01-11 10:15:38 +08:00
pandamicro 60cb50f8ae Merge pull request #2242 from 2youyou2/next
support dragonbones debugdraw
2018-01-11 10:12:23 +08:00
pandamicro 282ae5f756 Merge pull request #2241 from knoxHuang/master
add Volume and Mute to CCVideoPlayer for fireball/issues/6811
2018-01-11 09:50:11 +08:00
knoxHuang 8362245151 fix slider bug for fireball/issues/6830 2018-01-10 17:13:28 +08:00
Jare Guo b31566d75f Merge 1.8 2018-01-09 18:40:43 +08:00
Jare Guo df36e5dc9c Merge branch 'v1.8-release' into v1.8 2018-01-09 18:25:55 +08:00
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
Jare Guo 57934a1310 Merge pull request #2244 from knoxHuang/v1.8
fix  __ctor__ api for fireball/issues/6806
2018-01-09 10:07:32 +08:00
knoxHuang d05ffd3b53 fix __ctor__ api for fireball/issues/6806 2018-01-09 09:50:33 +08:00
yinkaile aa41a196d0 fixed child armature display 2018-01-08 15:51:55 +08:00
knoxHuang 767b363854 refine videoplayer code 2018-01-08 15:46:20 +08:00
yinkaile b059f1d4c9 support dragonbones debugdraw 2018-01-08 15:06:38 +08:00
knoxHuang 3a6a7b6020 Merge remote-tracking branch 'origin/master' 2018-01-08 10:52:11 +08:00
Jare Guo 1204fa7db7 Merge pull request #2218 from cyy641278529/master
Delete  the calls for object.retain() and object.release()
2018-01-06 21:38:45 +08:00
pandamicro d9b4303d67 Fix gulp build issue 2018-01-05 17:52:26 +08:00
pandamicro 2e65d8ab7b Support Spine rendering 2018-01-05 16:54:16 +08:00
pandamicro e64365bf33 walker updateRenderData with _batchData
Update render engine
2018-01-05 16:54:16 +08:00
pandamicro 94b2e24055 Improve texture 2d setters 2018-01-05 16:54:16 +08:00
pandamicro 0e303f464a Fix macro boolean type 2018-01-05 16:54:16 +08:00
pandamicro 0e308eaac6 Merge pull request #2239 from 2youyou2/next
fixed tiledmap remder issue
2018-01-05 16:42:40 +08:00
yinkaile c2446f1dd0 fixed tiledmap remder issue 2018-01-05 14:39:53 +08:00
knoxHuang a39257030e add Volume and Mute to CCVideoPlayer for fireball/issues/6811 2018-01-05 13:14:20 +08:00