pandamicro
|
3b0d6f9c35
|
Added cc.director.runSceneImmediate API
|
2016-03-09 12:13:57 +08:00 |
|
Jare Guo
|
995a18eeb2
|
disallow to modify scene hierarchy when editing animation
|
2016-02-22 13:56:33 +08:00 |
|
Jare Guo
|
af799991c5
|
Updating api about engine-extends
|
2016-02-18 16:06:25 +08:00 |
|
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
|
9e057e3c6d
|
update fireball-x/fireball#433: Shielding original cc.ENode and cc.EScene
|
2015-12-09 18:25:08 +08:00 |
|
Nan Wang
|
c0f59c1598
|
synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history.
|
2015-12-05 12:22:41 +08:00 |
|