Jare Guo
|
1f66c062ec
|
fix bug of persist root node
|
2015-12-31 16:40:32 +08:00 |
|
2youyouo2
|
d22f8e1481
|
sync master to 0.7
|
2015-12-29 20:01:30 +08:00 |
|
Jare Guo
|
742015dc1e
|
throw warning if property overrided without specifing override keyword
|
2015-12-28 18:30:23 +08:00 |
|
pandamicro
|
0fd470a6a4
|
Improvements to Entity Events
|
2015-12-26 17:20:17 +08:00 |
|
Jare Guo
|
ef5082e342
|
prefab should update its states after parent changed
|
2015-12-24 16:00:09 +08:00 |
|
Jare Guo
|
fd57ed9a52
|
make codes more concise
|
2015-12-23 19:41:56 +08:00 |
|
Jare Guo
|
83042038ed
|
support mounted raw assets in build version
|
2015-12-23 18:04:49 +08:00 |
|
Huabing.Xu
|
e80415db70
|
remove comment codes
|
2015-12-23 16:49:51 +08:00 |
|
Huabing.Xu
|
7bd101efcd
|
scale9 sprite test works
|
2015-12-23 16:33:30 +08:00 |
|
pandamicro
|
5d08023906
|
Remove useless test
|
2015-12-23 12:38:54 +08:00 |
|
pandamicro
|
d4319d94a1
|
Improve visual test and add test for Entity Event
|
2015-12-23 01:16:03 +08:00 |
|
pandamicro
|
2fe6a277b0
|
Merge pull request #105 from dabingnn/refine-scale9spritetestcase
refine test cases for scale 9
|
2015-12-22 12:02:35 +08:00 |
|
Huabing.Xu
|
0024930902
|
refine test cases for scale 9
|
2015-12-22 12:00:52 +08:00 |
|
Jare Guo
|
9c4f5ea483
|
Merge pull request #100 from 2youyouo2/794
add defaultClip to clips if defaultClip is not added to clips
|
2015-12-21 21:30:06 +08:00 |
|
knoxHuang
|
8de4485e8d
|
update test-spriteRenderer
|
2015-12-21 17:49:37 +08:00 |
|
knoxHuang
|
9945eeb559
|
spriteRender renname sprite
|
2015-12-21 17:06:49 +08:00 |
|
2youyouo2
|
2b82023eb1
|
add defaultClip to clips if defaultClip is not added to clips
|
2015-12-21 16:03:16 +08:00 |
|
Jare Guo
|
af69bf0988
|
widget's property should be adjusted to fit new position in edit mode
|
2015-12-21 15:46:44 +08:00 |
|
knoxHuang
|
5717fe7155
|
Merge branch 'master' into sprite
Conflicts:
extensions/ccui/base-classes/UIScale9Sprite.js
|
2015-12-21 13:36:25 +08:00 |
|
knoxHuang
|
f86cad8c5f
|
cc.sprite renname _ccsg.sprite and file name
|
2015-12-21 13:29:01 +08:00 |
|
2youyouo2
|
c20d8c9563
|
update cc.Animation api
|
2015-12-21 10:50:51 +08:00 |
|
2youyouo2
|
91fa5815ab
|
Merge branch 'master' of github.com:fireball-x/engine
|
2015-12-21 09:25:02 +08:00 |
|
Jare Guo
|
3cb0582920
|
callbacks invoker should supports remove operation during invoking, like event-listeners
|
2015-12-21 01:39:03 +08:00 |
|
Jare Guo
|
58fcbc1f8a
|
callbacks invoker should supports remove operation during invoking, like event-listeners
|
2015-12-20 23:56:11 +08:00 |
|
2youyouo2
|
972e475566
|
improve cc.Animation api
|
2015-12-19 14:18:53 +08:00 |
|
Jare Guo
|
26288f3364
|
clean up codes of sprite frame
|
2015-12-16 20:58:41 +08:00 |
|
Jare Guo
|
b0bc5a2f80
|
Merge pull request #58 from knoxHuang/master
CCLabel Renamed CCSGLabel and cc.Label Renamed _ccsg.Label
|
2015-12-16 15:43:24 +08:00 |
|
knoxHuang
|
a4c3ee5a98
|
CCLabel Renamed CCSGLabel and cc.Label Renamed _ccsg.Label
|
2015-12-16 15:40:35 +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
|
aef994d632
|
cc.ParticleSystem Renamed _ccsg.ParticleSystem
|
2015-12-16 14:40:15 +08:00 |
|
Jare Guo
|
9959210cd0
|
should not call onEnable if not executeInEditMode
|
2015-12-16 11:05:50 +08:00 |
|
knoxHuang
|
334011dc1f
|
cc.AnimationComponent Renamed cc.Animation
|
2015-12-16 09:52:19 +08:00 |
|
knoxHuang
|
d3e73e3569
|
cc.Animation Renamed cc.SpriteFrameAnimation
cc.animationCache Renamed cc.spriteFrameAnimationCache
|
2015-12-15 14:05:05 +08:00 |
|
Jare Guo
|
1fc0b6bc9a
|
Merge commit '067f62a6568adacee1d3f114723f45e5eb7aa279'
# Conflicts:
# cocos2d/core/base-nodes/CCAtlasNode.js
# cocos2d/core/sprites/CCSprite.js
# extensions/ccui/base-classes/UIScale9Sprite.js
|
2015-12-09 20:56:38 +08:00 |
|
Jare Guo
|
ef24960351
|
mixin EventTarget instead of inherit by polyfill
|
2015-12-09 20:53:59 +08:00 |
|
Jare Guo
|
067f62a656
|
Merge pull request #22 from jareguo/master
support mixin class
|
2015-12-09 20:52:53 +08:00 |
|
Jare Guo
|
752fed9d95
|
support mixin class
|
2015-12-09 20:48:18 +08:00 |
|
knoxHuang
|
9e057e3c6d
|
update fireball-x/fireball#433: Shielding original cc.ENode and cc.EScene
|
2015-12-09 18:25:08 +08:00 |
|
knoxHuang
|
ebeb018a97
|
fix fireball-x/fireball#433: Shielding original cc.Node and cc.Scene
|
2015-12-09 14:52:41 +08:00 |
|
Jare Guo
|
b15e2af7e3
|
update component menu
|
2015-12-07 15:54:42 +08:00 |
|
Jare Guo
|
b5e1974c42
|
Merge pull request #5 from 2youyouo2/sample-curve
fixed sample-curve frame index error
|
2015-12-07 14:56:11 +08:00 |
|
2youyouo2
|
cee270b146
|
add test
|
2015-12-07 11:14:06 +08:00 |
|
2youyouo2
|
ecb7e8d4b0
|
fixed wrap time not right when update clip
|
2015-12-07 10:37:52 +08:00 |
|
Nan Wang
|
db8b4ac9e0
|
update engine path in tests.
|
2015-12-06 20:02:48 +08:00 |
|
Nan Wang
|
79e546d6cf
|
update to fireball-x/cocos2d-html5#dc5f6bc7aeaeb473e53a93436dd3c7d94c4fbfbc
|
2015-12-06 18:01:18 +08:00 |
|
Nan Wang
|
c0f59c1598
|
synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history.
|
2015-12-05 12:22:41 +08:00 |
|