Commit Graph

47 Commits

Author SHA1 Message Date
Jare Guo b1e8e498e9 make sizeProvider error more clear 2016-05-21 18:23:03 +08:00
Jare Guo dbba94fbfb refactor error checking codes for type attribute in CCClass 2016-05-19 11:51:31 +08:00
Jare Guo 142aeed175 add preload lifecycle method 2016-05-16 15:41:49 +08:00
Jare Guo 28e6ae187d Merge pull request #668 from jareguo/master
remove cc.sys.isNative in html5
2016-05-13 17:12:18 +08:00
Wang Nan 5d9ce5d57e Merge pull request #669 from cocos-creator/v1.0
merge V1.0
2016-05-13 13:45:01 +08:00
Jare Guo f8edcbe802 remove cc.sys.isNative in html5 2016-05-13 11:21:22 +08:00
knoxHuang b0122605fb fix Inherits from SGNode nodes can not overload a method in BaseNodePropertyDefine.js 2016-05-12 11:06:36 +08:00
Nan Wang 3719f971e9 replace engine url with unpack protocol 2016-04-14 19:09:56 +08:00
Johnny Wu e493f2047b upgrade editor-framework to v0.5.0 2016-04-07 16:56:39 +08:00
Jare Guo 38256cc062 transform should be computed immediately in canvas mode 2016-03-29 17:43:57 +08:00
Jare Guo 5cd134b72b fix spine renderer on canvas 2016-03-28 18:24:12 +08:00
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 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +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
Nan Wang 6d2c1de29f fix multiple class types. 2016-02-23 15:37:34 +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
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
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
knoxHuang f86cad8c5f cc.sprite renname _ccsg.sprite and file name 2015-12-21 13:29:01 +08:00
knoxHuang ebeb018a97 fix fireball-x/fireball#433: Shielding original cc.Node and cc.Scene 2015-12-09 14:52:41 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00