Commit Graph

19 Commits

Author SHA1 Message Date
pandamicro 2541d90124 Check gl errors only in dev mode 2017-08-04 17:12:23 +08:00
yangweixian 4af65a5a98 Do not use checkGLErrorDebug 2017-08-04 17:06:55 +08:00
Jare Guo fff91611cb use shorthand function in properties
stash 2
2017-02-18 22:48:05 +08:00
Jare Guo 0192e50569 Merge branch 'v1.4'
# Conflicts:
#	cocos2d/core/CCNode.js
2017-02-09 11:19:38 +08:00
knoxHuang 7b4828e8c8 fix initWithVertexShaderByteArray bug to CCGLProgram for fireball/issues/5160 2017-02-06 17:10:34 +08:00
Jare Guo 42ba8c1fd3 reviewed 2017-02-03 14:40:05 +08:00
Jare Guo 36a7328f40 remove unused prototype properties 2017-02-03 13:53:54 +08:00
pandamicro e8f116778a Fix issues 2017-01-22 17:35:38 +08:00
pandamicro 8b5f981cac Improve updateProjectionUniform performance 2017-01-22 17:34:22 +08:00
knoxHuang bd8127aff7 optimization shader and tooltip for #fireball/issues/4771 2016-12-19 18:19:18 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
pandamicro 07e592dced Upgrade Scale9Sprite renderer & set index buffer dynamically 2016-07-12 16:33:52 +08:00
pandamicro c532c09eff Merge Cocos2d-html5 v3.12 webgl renderer 2016-07-12 16:33:51 +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 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