pandamicro
|
77febbfe3d
|
Merge branch 'master' into next
|
2018-03-13 15:07:21 +08:00 |
|
PP
|
67afe336d2
|
partly change JS into js
|
2018-03-06 11:47:09 +08:00 |
|
PP
|
d9a7e80246
|
literalMap to flatMap
|
2018-03-02 09:48:10 +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 |
|
yinkaile
|
27df2eae6a
|
refine register animation event
|
2017-10-20 16:42:38 +08:00 |
|
Jare Guo
|
e1601ac00f
|
Merge 1.6
# Conflicts:
# cocos2d/core/CCDirector.js
# cocos2d/core/components/CCSprite.js
|
2017-09-22 10:48:01 +08:00 |
|
2youyouo2
|
a6b42859fc
|
refine code
|
2017-08-29 18:08:07 +08:00 |
|
2youyouo2
|
6bc0ff1cae
|
should ignore animation playOnLoad if already play an animation
|
2017-08-29 17:58:07 +08:00 |
|
Jare Guo
|
e3212cdf68
|
reimplement CallbacksInvoker
|
2017-08-07 17:41:05 +08:00 |
|
Jare Guo
|
20155c6541
|
fix api about event type
|
2017-05-19 11:22:50 +08:00 |
|
2youyouo2
|
3c7504110d
|
change animation Array to MutableForwardIterator
|
2017-05-12 15:55:53 +08:00 |
|
2youyouo2
|
dcd8da6a6f
|
should not resume animation when call node.active = true and animation is paused before
|
2017-05-11 16:24:31 +08:00 |
|
Jare Guo
|
f054f504b6
|
fix typescript api
|
2017-04-26 17:17:59 +08:00 |
|
2youyouo2
|
4c62bd89fe
|
playOnLoad should work in start
|
2017-03-02 16:54:45 +08:00 |
|
2youyouo2
|
a624733058
|
add _playedOnLoad for CCAnimation
|
2017-03-02 15:46:36 +08:00 |
|
knoxHuang
|
bd8127aff7
|
optimization shader and tooltip for #fireball/issues/4771
|
2016-12-19 18:19:18 +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 |
|
2youyouo2
|
3a48a569b4
|
improve animation interface, fixed typo
|
2016-11-15 11:41:41 +08:00 |
|
2youyouo2
|
cda712dc96
|
add delay events for animation
|
2016-09-20 14:40:45 +08:00 |
|
2youyouo2
|
e04b69e55d
|
refine code
|
2016-08-10 14:06:16 +08:00 |
|
2youyouo2
|
4e2da16103
|
animation playOnLoad should handle in onEnable
|
2016-08-10 13:55:19 +08:00 |
|
2youyouo2
|
fd7daf3440
|
should not auto play default animation if it is disabled
|
2016-07-22 15:11:08 +08:00 |
|
2youyouo2
|
ceadbdbfa3
|
support animation callback
|
2016-07-22 15:10:14 +08:00 |
|
2youyouo2
|
2c36e2f7a2
|
should init AnimationStates if clips not contains AnimationState's clip
|
2016-07-13 16:31:23 +08:00 |
|
2youyouo2
|
964590a4de
|
fixed animation removeClip
|
2016-05-23 15:59:41 +08:00 |
|
2youyouo2
|
d84bf3b034
|
update animation comment
|
2016-05-20 22:41:35 +08:00 |
|
2youyouo2
|
4a22551b21
|
move _updateClip to editor
|
2016-05-19 11:17:22 +08:00 |
|
Jare Guo
|
142aeed175
|
add preload lifecycle method
|
2016-05-16 15:41:49 +08:00 |
|
2youyouo2
|
fb8cadecea
|
stop animation on destroy
|
2016-05-12 17:36:52 +08:00 |
|
2youyouo2
|
f6679b5a07
|
update animation
|
2016-04-28 16:01:56 +08:00 |
|
Jare Guo
|
4b45975ed8
|
minor update
|
2016-04-25 14:34:07 +08:00 |
|
Nan Wang
|
c3961feb8a
|
update i18n differed component help link
|
2016-04-11 19:06:30 +08:00 |
|
knoxHuang
|
7757ac7ae2
|
fix Animation api
|
2016-03-22 18:07:00 +08:00 |
|
knoxHuang
|
a5ef25e29f
|
fix Animation api
|
2016-03-22 17:32:41 +08:00 |
|
knoxHuang
|
bf21367874
|
update animation all api
|
2016-03-22 16:12:49 +08:00 |
|
2youyouo2
|
cc18e4652c
|
fixed animation onEnable/onDisable
|
2016-03-17 16:03:06 +08:00 |
|
2youyouo2
|
725617ca06
|
add playAdditive
|
2016-03-15 17:50:09 +08:00 |
|
knoxHuang
|
2d7f991a11
|
update components api url
|
2016-03-09 18:33:13 +08:00 |
|
knoxHuang
|
57a8e12052
|
built-in module in the title next to add a help icon.
|
2016-03-09 17:57:13 +08:00 |
|
2youyouo2
|
b4eb0218e7
|
fixed addClip
|
2016-03-07 18:46:45 +08:00 |
|
Nan Wang
|
3a70ae6060
|
update license file and source code header.
|
2016-03-01 11:04:12 +08:00 |
|
2youyouo2
|
d69be60934
|
should load clip in getAnimationState if state not loaded clip
|
2016-02-18 18:05:41 +08:00 |
|
2youyouo2
|
f4221121f6
|
fixed reset defaultClip
|
2016-02-17 11:44:34 +08:00 |
|
Jare Guo
|
6c6a1d8eba
|
minor tweaks
|
2016-02-05 20:02:59 +08:00 |
|
2youyouo2
|
3331c4b7b8
|
move update state time to scene
|
2016-02-03 16:15:42 +08:00 |
|
minggo
|
bd71a5f727
|
fix some comments
|
2016-02-01 15:36:25 +08:00 |
|
2youyouo2
|
2ea5f94e2e
|
fixed error when change wrapMode
|
2016-01-25 17:09:40 +08:00 |
|
2youyouo2
|
3411870095
|
if value is null, should not update clip
|
2015-12-29 17:15:06 +08:00 |
|
2youyouo2
|
af8c69a827
|
should not sample in updateClip
|
2015-12-25 17:16:19 +08:00 |
|