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 |
|
knoxHuang
|
832e55d033
|
update fireball-x/fireball#433: Shielding original cc.Node and cc.Scene
|
2015-12-09 15:27:34 +08:00 |
|
knoxHuang
|
ebeb018a97
|
fix fireball-x/fireball#433: Shielding original cc.Node and cc.Scene
|
2015-12-09 14:52:41 +08:00 |
|
Huabing.Xu
|
d5e917b0b8
|
add a new empty in file end
|
2015-12-08 15:26:06 +08:00 |
|
Huabing.Xu
|
5e198e74cf
|
fix scale9 sprite draw call status
|
2015-12-08 15:24:12 +08:00 |
|
Nan Wang
|
c0f59c1598
|
synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history.
|
2015-12-05 12:22:41 +08:00 |
|