Commit Graph

38 Commits

Author SHA1 Message Date
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
2youyouo2 b25b73ef6d fixed animation may not play 2015-12-22 17:47:56 +08:00
2youyouo2 49c7844189 update defaultClip check 2015-12-21 21:25:59 +08:00
2youyouo2 4fd03f00ed add defaultClip for cc.Animation 2015-12-21 19:23:10 +08:00
2youyouo2 2b82023eb1 add defaultClip to clips if defaultClip is not added to clips 2015-12-21 16:03:16 +08:00
2youyouo2 c20d8c9563 update cc.Animation api 2015-12-21 10:50:51 +08:00
2youyouo2 8e9a68def8 Merge branch 'master' of github.com:fireball-x/engine
Conflicts:
	cocos2d/core/components/CCAnimation.js
2015-12-19 21:36:28 +08:00
2youyouo2 972e475566 improve cc.Animation api 2015-12-19 14:18:53 +08:00
Nan Wang a1580e3774 update audio and animation tooltip. 2015-12-19 02:33:51 +08:00
Nan Wang 1d0b14b32f add i18n updates to components. 2015-12-16 20:43:55 +08:00
knoxHuang 334011dc1f cc.AnimationComponent Renamed cc.Animation 2015-12-16 09:52:19 +08:00
2youyouo2 96ff975556 fixed equalClips 2015-12-12 12:56:35 +08:00
2youyouo2 fb093695f7 animation should not init in onLoad in editor 2015-12-10 15:04:12 +08:00
2youyouo2 7ac11eb3ca add executeInEditMode for CCAnimation 2015-12-10 14:33:09 +08:00
2youyouo2 ecb7e8d4b0 fixed wrap time not right when update clip 2015-12-07 10:37:52 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00