knoxHuang
d2a9cbc361
CCEParticleSystem Renamed CCParticleSystem
2015-12-16 15:28:02 +08:00
pandamicro
675f946459
Merge pull request #56 from knoxHuang/master
...
CCParticleSystem file renamed
2015-12-16 15:23:08 +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
Jare Guo
b27ef91621
Merge pull request #55 from knoxHuang/master
...
cc.ParticleSystem Renamed _ccsg.ParticleSystem
2015-12-16 14:56:31 +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
2youyouo2
769fd4bde6
Merge branch 'master' of github.com:fireball-x/engine
2015-12-16 14:36:12 +08:00
2youyouo2
546b5168d4
should always initClipData in reloadClip
2015-12-16 14:35:30 +08:00
Jare Guo
829c8de3d6
Merge pull request #54 from jareguo/master
...
should not call onEnable if not executeInEditMode
2015-12-16 11:06:49 +08:00
Jare Guo
9959210cd0
should not call onEnable if not executeInEditMode
2015-12-16 11:05:50 +08:00
Wang Nan
3f58254507
Merge pull request #53 from nantas/master
...
hotfix: disable sourcemap for uglified cocos2d-js library.
2015-12-16 10:17:29 +08:00
Nan Wang
1a2cc4f378
hotfix: disable sourcemap for uglified cocos2d-js library.
2015-12-16 10:16:57 +08:00
Jare Guo
740c77bdb7
Merge pull request #52 from knoxHuang/master
...
cc.AnimationComponent Renamed cc.Animation
2015-12-16 09:57:28 +08:00
knoxHuang
334011dc1f
cc.AnimationComponent Renamed cc.Animation
2015-12-16 09:52:19 +08:00
Huabing.Xu
3e2f568e2f
fix crash
2015-12-15 18:23:09 +08:00
Wang Nan
7598176923
Merge pull request #49 from knoxHuang/master
...
cc.Animation or animationCache 改名
2015-12-15 18:00:55 +08:00
Huabing.Xu
1c63ea2389
Merge branch 'master' into refine-scale9Sprite
2015-12-15 17:33:46 +08:00
Huabing.Xu
3b1f192cf8
Scale9ResourceData mixin cc.EventTarget
2015-12-15 17:33:35 +08:00
Jare Guo
4bd6dc88e2
Merge pull request #51 from jareguo/master
...
fix render order for _replaceSgNode
2015-12-15 17:01:09 +08:00
Jare Guo
03b4b412d0
fix render order for _replaceSgNode
2015-12-15 17:00:48 +08:00
Wang Nan
928bfa42f1
Merge pull request #50 from dabingnn/sprite-hotfix
...
hotfix for scale9 sprite bug
2015-12-15 16:46:41 +08:00
Huabing.Xu
043266b482
hotfix for scale9 sprite bug
2015-12-15 16:43:19 +08:00
Jare Guo
85e1b7d1d2
Merge pull request #48 from dabingnn/refineMask
...
Refine mask
2015-12-15 15:29:44 +08:00
knoxHuang
d3e73e3569
cc.Animation Renamed cc.SpriteFrameAnimation
...
cc.animationCache Renamed cc.spriteFrameAnimationCache
2015-12-15 14:05:05 +08:00
Huabing.Xu
fe3b49fb36
Merge branch 'master' into refine-scale9Sprite
...
# Conflicts:
# extensions/ccui/base-classes/UIScale9Sprite.js
2015-12-15 14:00:28 +08:00
Huabing.Xu
df60ba0036
rename function
2015-12-15 11:58:26 +08:00
Huabing.Xu
f317d25e2a
add listener 'anchor-changed'
...
remove _rebuildSceneGraph
2015-12-15 10:57:50 +08:00
Huabing.Xu
97d6e18a4e
refactor ccMask will call entity.replaceSgNode instead of _rebuldScenegraph
2015-12-15 10:51:36 +08:00
Jare Guo
257e948a62
Merge pull request #47 from pandamicro/master
...
Automatically set atlas when setting sprite
2015-12-15 09:57:40 +08:00
pandamicro
a6ba48a5f7
Automatically set atlas when setting sprite
2015-12-14 23:37:25 +08:00
pandamicro
6dbad5b41d
Merge pull request #46 from pandamicro/master
...
Fix scale9sprite setContentSize/setAnchorPoint/setBlendFunc parameter
2015-12-14 23:09:23 +08:00
pandamicro
7b99a3c33b
Fix scale9sprite setContentSize/setAnchorPoint/setBlendFunc parameter
2015-12-14 23:01:27 +08:00
Jare Guo
09924980b1
Merge pull request #45 from jareguo/master
...
emit events if node's all the editable properties changed
2015-12-14 21:58:45 +08:00
Jare Guo
0a6724e161
emit events if node's all the editable properties changed
2015-12-14 21:57:52 +08:00
Jare Guo
306f66a3eb
hotfix for fireball-x/fireball#891
2015-12-14 20:40:40 +08:00
pandamicro
e89a6f7825
Merge pull request #15 from dabingnn/feature-mask
...
Feature mask
2015-12-14 17:47:23 +08:00
Huabing.Xu
5379d0886f
refine code
2015-12-14 17:45:03 +08:00
Huabing.Xu
a190393dd4
fix bug when stencil's content size is changed
2015-12-14 17:25:01 +08:00
Jare Guo
ec2fdd98ef
Merge pull request #44 from jareguo/master
...
automate adjust the canvas size to fit with screen
2015-12-14 16:06:01 +08:00
Jare Guo
e9acfec1ab
automate adjust the canvas size to fit with screen (and require the anchor to be (0.5, 0.5)
2015-12-14 16:04:55 +08:00
Huabing.Xu
f5a71d5e0f
refine code
2015-12-14 14:58:08 +08:00
Huabing.Xu
f63b50f6a0
Merge branch 'master' into feature-mask
2015-12-14 14:50:40 +08:00
Huabing.Xu
5f92e37c0d
refine code
2015-12-14 14:25:30 +08:00
Huabing.Xu
7a4e7b3ba1
mask works, anchor point not work
2015-12-14 13:54:33 +08:00
Jare Guo
795430429e
Merge pull request #42 from 2youyouo2/position-changed
...
add position-changed event for cc.Node
2015-12-14 12:29:06 +08:00
2youyouo2
db118bd306
remove CC_EDITOR
2015-12-14 12:04:25 +08:00
Huabing.Xu
8a89395fc5
mask works with bug
2015-12-14 11:54:00 +08:00
2youyouo2
9f37d5700a
Merge branch 'master' into position-changed
2015-12-14 11:43:52 +08:00
Jare Guo
976bf78757
Merge pull request #43 from 2youyouo2/master
...
export Curve and Bezier helper
2015-12-14 11:30:50 +08:00
2youyouo2
8eb81eb015
add position-changed event for cc.Node
2015-12-14 11:23:57 +08:00