Commit Graph

16 Commits

Author SHA1 Message Date
pandamicro b7581b6b58 Fix _setLocalZOrder usage 2015-12-13 09:22:33 +08:00
pandamicro a4a051404e reverse function invocation to property usage 2015-12-12 23:29:17 +08:00
pandamicro 7a1fac062d Fix issues for jsb runtime 2015-12-12 23:29:17 +08:00
pandamicro 45657da750 Fix issues for jsb build 2015-12-12 23:27:55 +08:00
Nan Wang 8d945dd986 fix node.opacity property name. 2015-12-12 18:04:48 +08:00
Nan Wang 3981104a1f correct example path. 2015-12-10 19:26:35 +08:00
Nan Wang 4b059294d2 fixed code-editor parsing error for engine apis. 2015-12-10 16:38:26 +08:00
Jare Guo 627fb37874 add size-changed event for node 2015-12-10 00:28:47 +08:00
knoxHuang 113755fd4a Merge remote-tracking branch 'origin/master'
Conflicts:
	cocos2d/core/CCNode.js
	cocos2d/core/utils/base-node.js
2015-12-09 18:30:15 +08:00
knoxHuang 9e057e3c6d update fireball-x/fireball#433: Shielding original cc.ENode and cc.EScene 2015-12-09 18:25:08 +08:00
Jare Guo 9679b6b698 Merge pull request #18 from knoxHuang/master
fix fireball-x/fireball#433: Shielding original cc.Node and cc.Scene
2015-12-09 15:33:53 +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 5b48456197 disallow multiple ComponentInSG 2015-12-09 14:46:42 +08:00
Jare Guo 89508d7bf0 loader should return error if load failed 2015-12-08 13:41:12 +08:00
Jare Guo b15e2af7e3 update component menu 2015-12-07 15:54:42 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00