Commit Graph

17466 Commits

Author SHA1 Message Date
pandamicro e1bde706d6 Merge pull request #23 from jareguo/master
mixin EventTarget instead of inherit by polyfill
2015-12-09 22:07:15 +08:00
Jare Guo 92c8d65b53 Merge pull request #24 from jwu/master
add visible to true
2015-12-09 21:33:20 +08:00
Johnny Wu 605e74abbb Merge branch 'master' of github.com:jwu/engine 2015-12-09 21:31:51 +08:00
Johnny Wu 31b567d1f6 add visible to true for _atlas property 2015-12-09 21:30:46 +08:00
zilongshanren aec4f92630 fix progress bar rendering 2015-12-09 21:23:47 +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
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
Jare Guo c0e7b6cf3d Merge pull request #20 from knoxHuang/master
修改 cc.ENode or cc.EScene
2015-12-09 18:40:45 +08:00
knoxHuang 02ec815fd3 update Shielding original cc.ENode and cc.EScene 2015-12-09 18:39:08 +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
zilongshanren 597fcd6f6f add progress bar 2015-12-09 18:29:52 +08:00
knoxHuang 9e057e3c6d update fireball-x/fireball#433: Shielding original cc.ENode and cc.EScene 2015-12-09 18:25:08 +08:00
zilongshanren 1658d945e6 add progress bar 2015-12-09 17:27:47 +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 832e55d033 update fireball-x/fireball#433: Shielding original cc.Node and cc.Scene 2015-12-09 15:27:34 +08:00
Jare Guo 414f58911f Merge pull request #19 from jareguo/master
support requireComponent attribute
2015-12-09 15:04:08 +08:00
Jare Guo cf83fa2e28 support requireComponent attribute 2015-12-09 15:03:19 +08:00
Jare Guo 36774f99da Merge pull request #16 from knoxHuang/master
modify atlas variables to CCSpriteRenderer.js
2015-12-09 15:00:18 +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 d42decc252 Merge pull request #17 from jareguo/master
disallow multiple ComponentInSG
2015-12-09 14:47:14 +08:00
Jare Guo 5b48456197 disallow multiple ComponentInSG 2015-12-09 14:46:42 +08:00
pandamicro de822aff0a Merge pull request #12 from jareguo/master
loader should return error if load failed
2015-12-08 20:09:16 +08:00
Jare Guo 91a66428d0 loader should return error array if load failed 2015-12-08 19:28:19 +08:00
pandamicro 24a34c8c73 Merge pull request #10 from zilongshanren/FixIssue762
don't reset fontsize and line height.
2015-12-08 16:44:19 +08:00
knoxHuang 8e7a29562c modify atlas variables to CCSpriteRenderer.js 2015-12-08 16:19:48 +08:00
pandamicro 6af9ecbd3c Merge pull request #14 from dabingnn/scale9FixDrawcallStatusInCanvas
fix scale9 sprite draw call status
2015-12-08 15:38:57 +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
Jare Guo de22616377 Merge branch 'master' of github.com:fireball-x/engine 2015-12-08 15:00:23 +08:00
Huabing.Xu 36660c6864 fix mask content size bug 2015-12-08 14:59:56 +08:00
Jare Guo c246526857 Merge pull request #13 from 2youyouo2/master
add cc.affineTransformClone
2015-12-08 13:53:00 +08:00
2youyouo2 1fcf650ac0 add cc.affineTransformClone 2015-12-08 13:42:27 +08:00
Jare Guo 89508d7bf0 loader should return error if load failed 2015-12-08 13:41:12 +08:00
Huabing.Xu e522073ef2 raw version mask works 2015-12-08 11:28:02 +08:00
Jare Guo 92d16ba44f Merge pull request #11 from jareguo/master
support loading builtin raw assets
2015-12-07 21:34:54 +08:00
Jare Guo b97e70e71d support loading builtin raw assets 2015-12-07 21:33:24 +08:00
zilongshanren 0384560614 don't reset fontsize and line height.
1. when switching from ttf to bmfont, don't reset the fontsize and
height.
2015-12-07 20:24:03 +08:00
pandamicro e9901dcea9 Merge pull request #8 from 2youyouo2/merge-update
remove cc.engine events
2015-12-07 18:45:19 +08:00
2youyouo2 169445998a move drawScene logic to mainLoop 2015-12-07 18:43:21 +08:00
Wang Nan 0afe28285e Merge pull request #6 from dabingnn/fix-label-color
Fix label color
2015-12-07 18:41:18 +08:00
Wang Nan 41a12cf918 Merge pull request #9 from zilongshanren/master
Fix horizontal clamp and shrink issue
2015-12-07 18:40:40 +08:00
zilongshanren e37e7b8f44 fix clamp issue 2015-12-07 18:27:19 +08:00
zilongshanren 190dca63a1 make clamp works 2015-12-07 17:11:17 +08:00
2youyouo2 26402c4637 remove cc.engine events 2015-12-07 15:59:15 +08:00
zilongshanren 5b9950ba58 fix bmfont clamp font size issue 2015-12-07 15:57:20 +08:00
Jare Guo beecebf0fc Merge pull request #7 from jareguo/master
update component menu
2015-12-07 15:56:04 +08:00
Jare Guo b15e2af7e3 update component menu 2015-12-07 15:54:42 +08:00
Huabing.Xu af4b65ca45 Merge branch 'master' into fix-label-color 2015-12-07 15:15:02 +08:00