2youyouo2
|
0ac7d7efb7
|
fixed animation event
|
2016-01-26 16:52:00 +08:00 |
|
Jare Guo
|
5e75462c6b
|
destroyed object should be nullify when instantiating (+1 squashed commit)
Squashed commits:
[50e59fb] update package.json
|
2016-01-21 16:58:51 +08:00 |
|
Jare Guo
|
a5ab1375e0
|
minor fix
|
2016-01-19 10:16:32 +08:00 |
|
Jare Guo
|
dd9cc99b83
|
CCClass now support async initialize properties via function to avoid cross reference problem
|
2016-01-18 15:19:33 +08:00 |
|
Jare Guo
|
39d348da28
|
make code about CCClass more concise
|
2016-01-17 18:48:37 +08:00 |
|
Jare Guo
|
6604053da8
|
add _initSgNode for ComponentInSG
|
2016-01-13 14:05:24 +08:00 |
|
Johnny Wu
|
2f1fb274a5
|
remove unused code
|
2016-01-11 12:18:13 +08:00 |
|
Johnny Wu
|
c20b81fa4f
|
simple adjust
|
2016-01-09 16:56:59 +08:00 |
|
Nan Wang
|
ce7af67a9b
|
Merge branch 'v0.7' of github.com:fireball-x/engine
|
2016-01-06 23:58:29 +08:00 |
|
pandamicro
|
a48f9ba64f
|
Remove useless cocos2d modules in modular-cocos2d.js
|
2016-01-05 18:24:33 +08:00 |
|
Jare Guo
|
dedaf5a6d8
|
Merge commit 'c344bbecd9070dc68f03fefae5e0d37f5f16e8ba'
|
2016-01-04 11:28:13 +08:00 |
|
Jare Guo
|
1f66c062ec
|
fix bug of persist root node
|
2015-12-31 16:40:32 +08:00 |
|
Jare Guo
|
e789f1fc48
|
remove unused files
|
2015-12-31 16:31:57 +08:00 |
|
Jare Guo
|
83d758d49f
|
should not cause an infinite loops if re-activated in onLoad
|
2015-12-30 18:48:03 +08:00 |
|
Nan Wang
|
bf33c56d5e
|
merged v0.7
|
2015-12-29 20:55:24 +08:00 |
|
2youyouo2
|
d22f8e1481
|
sync master to 0.7
|
2015-12-29 20:01:30 +08:00 |
|
Jare Guo
|
fbab4aaa42
|
child sg-node should also be released after node destoryed
|
2015-12-28 19:41:00 +08:00 |
|
Jare Guo
|
742015dc1e
|
throw warning if property overrided without specifing override keyword
|
2015-12-28 18:30:23 +08:00 |
|
Jare Guo
|
574ca81409
|
allows to omit default value of property
|
2015-12-28 16:20:52 +08:00 |
|
2youyouo2
|
489501c7c9
|
fixed test
|
2015-12-28 14:04:46 +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 |
|