Commit Graph

42 Commits

Author SHA1 Message Date
pandamicro 4ef771c043 Fix remained issues in new renderer 2016-07-13 14:04:25 +08:00
pandamicro 0af950dc70 Use EventTarget to emit EVENT_HIDE & EVENT_SHOW 2016-05-19 11:02:17 +08:00
Jare Guo 8a11d50099 inline redundant type cheching function 2016-04-25 14:33:47 +08:00
pandamicro 1d8a6f29e0 Refactor cc.Macro to cc.macro 2016-03-14 11:49:03 +08:00
pandamicro 6a3bc53a0a Cleanup kazmath module 2016-03-14 11:49:03 +08:00
pandamicro 8306801243 Modulize event-manager, renderer and clean up core 2016-03-14 11:49:03 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
pandamicro 3ae96a23fd Clean up ClippingNode module 2016-03-13 18:57:12 +08:00
pandamicro a48f9ba64f Remove useless cocos2d modules in modular-cocos2d.js 2016-01-05 18:24:33 +08:00
Huabing.Xu f7d4ac37ab refine code 2015-12-22 18:52:54 +08:00
Huabing.Xu b9b96e0dba reformat code 2015-12-22 17:06:42 +08:00
Huabing.Xu 7db168793f rename resourcedata to spriteFrame 2015-12-22 15:54:22 +08:00
Huabing.Xu 0cec75374f remove ccui.Scale9Sprite.Scale9ResourceData 2015-12-22 15:36:16 +08:00
Huabing.Xu f42ab3d490 scale9 sprite will base on spriteFrame directly 2015-12-22 15:27:40 +08:00
Huabing.Xu e2e45121e6 refactor to use data after trimmed 2015-12-21 20:22:35 +08:00
knoxHuang 5717fe7155 Merge branch 'master' into sprite
Conflicts:
	extensions/ccui/base-classes/UIScale9Sprite.js
2015-12-21 13:36:25 +08:00
knoxHuang f86cad8c5f cc.sprite renname _ccsg.sprite and file name 2015-12-21 13:29:01 +08:00
Huabing.Xu 0c44e4d105 add deprecated 2015-12-21 11:50:00 +08:00
Huabing.Xu aefd6e5d8e adding comments back 2015-12-21 10:16:21 +08:00
Huabing.Xu 6dfc52435a add interface getRenderingType 2015-12-21 09:45:28 +08:00
Huabing.Xu b768a4c267 param rename 2015-12-19 16:35:36 +08:00
Huabing.Xu 2ed8cec149 change default blend function to non premultiplied 2015-12-19 09:40:22 +08:00
Huabing.Xu 10885794b3 canvas works in most cases(except rotated behave error) 2015-12-18 15:25:49 +08:00
Huabing.Xu cd5f7093fa Fix bug when rotated existed in sprite frame 2015-12-18 14:14:44 +08:00
Huabing.Xu eb5d1c384c add trim support 2015-12-17 19:10:40 +08:00
Huabing.Xu 36ee29ffe8 fix simple sliced bug 2015-12-17 14:48:02 +08:00
Huabing.Xu 0ccc57b003 first refactored version of scale9 sprite 2015-12-17 14:28:28 +08:00
Huabing.Xu 3e2f568e2f fix crash 2015-12-15 18:23:09 +08:00
Huabing.Xu 1c63ea2389 Merge branch 'master' into refine-scale9Sprite 2015-12-15 17:33:46 +08:00
Huabing.Xu 3b1f192cf8 Scale9ResourceData mixin cc.EventTarget 2015-12-15 17:33:35 +08:00
Huabing.Xu 043266b482 hotfix for scale9 sprite bug 2015-12-15 16:43:19 +08:00
Huabing.Xu fe3b49fb36 Merge branch 'master' into refine-scale9Sprite
# Conflicts:
#	extensions/ccui/base-classes/UIScale9Sprite.js
2015-12-15 14:00:28 +08:00
pandamicro 7b99a3c33b Fix scale9sprite setContentSize/setAnchorPoint/setBlendFunc parameter 2015-12-14 23:01:27 +08:00
Jare Guo 306f66a3eb hotfix for fireball-x/fireball#891 2015-12-14 20:40:40 +08:00
Huabing.Xu 70ca307f64 extract ccui.Scale9Sprite.Scale9ResourceData 2015-12-11 11:03:13 +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 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