Commit Graph

13 Commits

Author SHA1 Message Date
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