Commit Graph

42 Commits

Author SHA1 Message Date
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
knoxHuang 0b164bdfe9 fix create particleSystem error 2016-02-26 14:57:50 +08:00
pandamicro 4048a6fbb0 Polish single file loading API for cc.loader.load 2016-02-25 17:38:58 +08:00
pandamicro 0ea99226cc Replace cc.loader with pipeline loader 2016-02-25 10:34:09 +08:00
Jare Guo 5ec7de656a fix api doc for particle 2016-02-19 16:03:52 +08:00
knoxHuang 5fd7f5d73b fix #1873 code 2016-02-17 15:14:54 +08:00
knoxHuang c9a462601f request #1873 Adding components to save data ParticleSystem plist file function 2016-02-17 14:01:46 +08:00
knoxHuang 07f2b4279b remove sourcePosition tip 2016-02-16 09:45:18 +08:00
Jare Guo e14f2fa336 particle should not auto remove in editor 2016-02-01 17:37:55 +08:00
Jare Guo 077b6638eb make it likely to initialize comp._sgNode just in constructor 2016-01-27 16:10:51 +08:00
2youyouo2 628aeb7737 add animatable: false for component 2016-01-25 12:08:10 +08:00
Jare Guo 87220547fe allows to replace scene for prefab edit mode 2016-01-21 01:23:26 +08:00
Jare Guo 6604053da8 add _initSgNode for ComponentInSG 2016-01-13 14:05:24 +08:00
Jare Guo 2fbe33bfb9 SGNode.onExit should not be null 2016-01-05 10:36:00 +08:00
Nan Wang 1d0b14b32f add i18n updates to components. 2015-12-16 20:43:55 +08:00
knoxHuang d2a9cbc361 CCEParticleSystem Renamed CCParticleSystem 2015-12-16 15:28:02 +08:00
knoxHuang 1281a5ac29 CCParticleSystem file name Renamed CCSGParticleSystem
CCParticleSystemCanvasRenderCmd file name  Renamed  CCSGParticleSystemCanvasRenderCmd
CCParticleSystemWebGLRenderCmd file name  Renamed  CCSGParticleSystemWebGLRenderCmd
CCParticleExamples  file name  Renamed  CCSGParticleExamples
2015-12-16 15:16:26 +08:00
knoxHuang 665afbe370 cc.ParticleSystem Renamed _ccsg.ParticleSystem 2015-12-16 14:55:24 +08:00
knoxHuang aef994d632 cc.ParticleSystem Renamed _ccsg.ParticleSystem 2015-12-16 14:40:15 +08:00
knoxHuang ebeb018a97 fix fireball-x/fireball#433: Shielding original cc.Node and cc.Scene 2015-12-09 14:52:41 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00