Commit Graph

78 Commits

Author SHA1 Message Date
Wang Nan 1ae4d71dfc Merge pull request #539 from jareguo/v1.0
fix spine blend mode
2016-03-25 20:24:53 +08:00
Jare Guo 20bcac9e0c Merge pull request #541 from knoxHuang/v1.0
fix spine API and fix CCNode on example error
2016-03-25 17:37:31 +08:00
knoxHuang 5fe7fffb00 update spine API and fix CCNode on example error 2016-03-25 17:34:42 +08:00
Wang Nan 19cf1331c8 Merge pull request #536 from knoxHuang/v1.0
update spine API
2016-03-25 16:24:57 +08:00
knoxHuang 786a8981cb update spine API 2016-03-25 16:12:25 +08:00
Jare Guo ac5cbb54d9 fix spine blend mode 2016-03-25 13:58:40 +08:00
knoxHuang af62adf3f8 update spine API 2016-03-25 10:37:13 +08:00
Jare Guo aa9304626d minor tweaks 2016-03-24 20:28:06 +08:00
knoxHuang 7757ac7ae2 fix Animation api 2016-03-22 18:07:00 +08:00
knoxHuang bf21367874 update animation all api 2016-03-22 16:12:49 +08:00
Nan Wang 3819f4f8f9 add spine component tooltips. 2016-03-21 12:19:19 +08:00
Jare Guo 4a25923280 fix spine raw file not exported 2016-03-19 13:23:18 +08:00
pandamicro 5a690106ea Modulize and cleanup shaders 2016-03-14 21:46:12 +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
knoxHuang 2d7f991a11 update components api url 2016-03-09 18:33:13 +08:00
knoxHuang 57a8e12052 built-in module in the title next to add a help icon. 2016-03-09 17:57:13 +08:00
Jare Guo 945371d637 fix spine meta 2016-03-03 09:59:07 +08:00
Jare Guo 95ba52b316 polyfill spine on JSB 2016-03-02 19:53:29 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
Jare Guo 94da7696c5 update PR 2016-02-27 17:09:06 +08:00
Jare Guo 0d4022436c rename ComponentInSG -> RendererBelowSG 2016-02-26 19:28:22 +08:00
pandamicro 0ea99226cc Replace cc.loader with pipeline loader 2016-02-25 10:34:09 +08:00
Nan Wang 6d2c1de29f fix multiple class types. 2016-02-23 15:37:34 +08:00
Nan Wang de247e7243 Merge branch 'master' of github.com:cocos-creator/engine 2016-02-20 11:30:56 +08:00
Jare Guo 520eddd0f9 implement _getLocalBounds to make spine pickable 2016-02-15 17:45:20 +08:00
Jare Guo 1c1062f2ae update pr 2016-02-15 11:46:22 +08:00
Jare Guo 4a2cae6f8e update pr 2016-02-15 10:55:55 +08:00
Nan Wang 586f434cc4 fixed example link. 2016-02-14 23:40:57 +08:00
Jare Guo d435ce5fce implement spine plugin 2016-02-14 16:08:06 +08:00
Jare Guo 638f0d92ac clean up old spine codes 2016-02-14 15:25:21 +08:00
pandamicro ec551e123a Improve skip spine logic 2016-02-03 11:51:58 +08:00
pandamicro e5e8ade1bd Fix JSB issues 2016-02-03 11:17:38 +08:00
pandamicro 40f91ad4d2 Merge pull request #279 from zilongshanren/add-editobox-support
add EditBox component.
2016-01-26 15:18:30 +08:00
Jare Guo d48e7b6957 add spine asset 2016-01-25 16:51:57 +08:00
Jare Guo ba61623c53 modular spine 2016-01-25 16:16:32 +08:00
zilongshanren 7c66c1e4b6 add EditBox component.
rename editbox to sgEditBox

add editbox components

add background scale9sprite to editbox

add function to change editbox bgsprite size

add editbox properties

add string property

sync all the interfaces

refactor button event handler

finish single line editobox

finish multiline editbox

add editbox component
2016-01-22 18:08:04 +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