pandamicro
|
77febbfe3d
|
Merge branch 'master' into next
|
2018-03-13 15:07:21 +08:00 |
|
fusijie
|
23fc401c80
|
fixed error spriteFrame textureLoaded called
|
2018-02-26 15:19:08 +08:00 |
|
Jare Guo
|
a6fb92ad90
|
updating license
|
2018-02-01 09:38:54 +08:00 |
|
Jare Guo
|
bd15543093
|
updating license: Chukong Aipu -> Xiamen Yaji
|
2018-01-31 17:51:49 +08:00 |
|
pandamicro
|
3aa3d3ebce
|
Fix ParticleSystem property type issue
|
2018-01-16 17:28:28 +08:00 |
|
pandamicro
|
7712da14f5
|
Merge remote-tracking branch 'fireball/master' into next
|
2018-01-15 17:51:33 +08:00 |
|
pandamicro
|
3930bc8b1e
|
Fix blend function not updated issue
|
2018-01-12 18:34:38 +08:00 |
|
pandamicro
|
44a0472ebb
|
Life control & auto remove for particle system
|
2018-01-12 17:39:07 +08:00 |
|
pandamicro
|
13a4dc7e50
|
Walker supports multiple render data per component
|
2017-12-29 01:26:30 +08:00 |
|
Jare Guo
|
5706539bd5
|
remove cc._LogInfos, use cc._getError instead
|
2017-12-27 10:55:34 +08:00 |
|
pandamicro
|
120ac1f586
|
Fix color deserialize issue and support negative delta color
|
2017-12-25 20:05:35 +08:00 |
|
pandamicro
|
8aff292ab2
|
Fix ParticleSystem file config overload custom issue
|
2017-12-25 17:26:18 +08:00 |
|
pandamicro
|
eaa80dd779
|
Incomplete GPU based particle system support
|
2017-12-25 14:03:28 +08:00 |
|
pandamicro
|
8b70aec1df
|
Stablize ParticleSystem component
|
2017-12-18 17:35:49 +08:00 |
|
pandamicro
|
ec243da6d1
|
Basic refactorization of ParticleSystem, remove dep of SGParticleSystem
|
2017-12-18 16:14:44 +08:00 |
|
knoxHuang
|
2223dcd0c8
|
refine code
|
2017-12-18 11:09:48 +08:00 |
|
knoxHuang
|
cf512dd06e
|
remove error info from the engine release for fireball/issues/6721
|
2017-12-15 17:21:06 +08:00 |
|
knoxHuang
|
7de9e24340
|
perfect native md5 cache to JSB for fireball/issues/6656
|
2017-11-29 17:29:49 +08:00 |
|
pandamicro
|
8cc054c833
|
Fix super calls to old sg components
|
2017-10-26 11:09:58 +02:00 |
|
Jare Guo
|
a1c535c6bb
|
update texture in property
|
2017-10-07 16:18:51 +08:00 |
|
pandamicro
|
48faf3ca49
|
Removed SGComponent, ComponentInSG, ComponentUnderSG
|
2017-10-06 17:54:34 +08:00 |
|
pandamicro
|
1abfab8621
|
Refactor textureCache to textureUtil, only cache texture to loader
|
2017-10-06 17:53:07 +08:00 |
|
Jare Guo
|
c808371211
|
remove unused ParticleBatchNode
|
2017-09-07 16:26:38 +08:00 |
|
Jare Guo
|
bf79d94fe6
|
remove extname used in require
|
2017-07-05 16:32:41 +08:00 |
|
Jare Guo
|
98055d9074
|
should not include zip utils and tiled map in core module
|
2017-06-23 09:55:02 +08:00 |
|
zilongshanren
|
af07d514ed
|
finish engine modular
modular particle system
modular tiledmap
finish modular
|
2017-06-05 14:17:56 +08:00 |
|
zilongshanren
|
680a6f05b4
|
add missing CC_DEV macro to component tooltip
|
2017-05-02 10:16:28 +08:00 |
|
knoxHuang
|
66069604b1
|
fix cocos-creator/fireball/issues/5585
|
2017-04-19 10:17:54 +08:00 |
|
knoxHuang
|
df4e421c48
|
fix CCParticleSystem error for fireball/issues/5155
|
2017-02-07 22:46:48 +08:00 |
|
knoxHuang
|
a218ca9c9d
|
fix particleSystem bug for fireball/issues/5155
|
2017-02-06 11:45:27 +08:00 |
|
pandamicro
|
2e055f0908
|
Fix particle system loading issue
|
2017-01-23 12:09:14 +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 |
|
Jare Guo
|
7f70be3516
|
Merge commit 'e248709cf2e84be9b6e56005ff15a550af230bd4'
# Conflicts:
# cocos2d/core/platform/CCView.js
|
2016-12-08 17:50:26 +08:00 |
|
Jare Guo
|
7a8ad96098
|
support cc.Mat3/4
|
2016-12-02 00:47:24 +08:00 |
|
knoxHuang
|
cd98111312
|
Fixed a dead loop when the file texture uuid is undefined for fireball/issues/4822
|
2016-11-30 14:18:26 +08:00 |
|
knoxHuang
|
a2e39dc959
|
add tooltip for CCParticleSystem
|
2016-11-23 17:47:27 +08:00 |
|
Nan Wang
|
032d2d2abd
|
fix api doc reference
|
2016-10-20 18:36:01 +08:00 |
|
Jare Guo
|
41c5ffddea
|
minor tweaks
|
2016-09-23 11:25:27 +08:00 |
|
Jare Guo
|
6d56ef78fe
|
fallback particle texture to plist if non-existent
|
2016-09-13 11:04:36 +08:00 |
|
Johnny Wu
|
a462ce79e4
|
change inspector url
|
2016-07-12 18:22:28 +08:00 |
|
Jare Guo
|
142aeed175
|
add preload lifecycle method
|
2016-05-16 15:41:49 +08:00 |
|
Jare Guo
|
e5a2a60803
|
particle type should be able to set to custom during loading
|
2016-04-30 00:34:52 +08:00 |
|
knoxHuang
|
3e3bee3e87
|
update ParticleSystem API
|
2016-03-16 13:55:45 +08:00 |
|
knoxHuang
|
c3f08226fa
|
add ParticleSystem APi
|
2016-03-16 10:02:12 +08:00 |
|
Jare Guo
|
42bf8caf68
|
fix custom particle texture
|
2016-03-01 18:32:52 +08:00 |
|
Wang Nan
|
8c043208c2
|
Merge pull request #413 from nantas/master
update license file and source code header.
|
2016-03-01 12:05:44 +08:00 |
|
Huabing.Xu
|
350bede530
|
add blend for particle
|
2016-03-01 11:16:03 +08:00 |
|
Nan Wang
|
3a70ae6060
|
update license file and source code header.
|
2016-03-01 11:04:12 +08:00 |
|
Jare Guo
|
94da7696c5
|
update PR
|
2016-02-27 17:09:06 +08:00 |
|
Jare Guo
|
0d4022436c
|
rename ComponentInSG -> RendererBelowSG
|
2016-02-26 19:28:22 +08:00 |
|