Commit Graph

2687 Commits

Author SHA1 Message Date
yinkaile fedef39cd3 Merge pull request #25 from caryliu1999/v2.3.0-youyou-3dModel
Fix renderer error in shadow stage.
2019-07-11 10:18:31 +08:00
yinkaile 987156d525 Merge pull request #24 from sunnylanwanjun/v2.3.0-merge-submodule
Add se object ptr conversion
2019-07-11 10:17:36 +08:00
caryliu 573717c8f8 add auto reference 2019-07-11 10:15:26 +08:00
yinkaile 4af6695d5e Merge pull request #26 from sunnylanwanjun/v2.3.0-fix-bug
V2.3.0 support windows platform
2019-07-11 10:14:32 +08:00
caryliu 1d71432cc5 delete unuse code. 2019-07-10 21:15:13 +08:00
caryliu 54c038f89a Fix renderer error in shadow stage. 2019-07-10 21:11:05 +08:00
sunnylanwanjun 4cb0a61ef0 2.3.0 windows platform 2019-07-10 19:26:25 +08:00
owen d0e192c1b8 Add se object ptr conversion 2019-07-10 12:11:27 +08:00
yinkaile b0fa215a00 Merge pull request #23 from 2youyou2/v2.3.0-submodule
update bindings-generator
2019-07-10 11:28:54 +08:00
2youyouo2 8e4a5f32fd update bindings-generator 2019-07-10 11:25:46 +08:00
owen eb83d6758e modity template file 2019-07-09 11:39:53 +08:00
caryliu 6c96b973b5 Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-mesh-fix
# Conflicts:
#	cocos/renderer/renderer/Model.cpp
#	cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp
#	tools/tojs/renderer.ini
2019-07-09 10:47:04 +08:00
owen e64a491b31 remove multiply thread calc sprite 2019-07-08 20:48:03 +08:00
caryliu 34cb81ca5b Fix the error of dynamic material scane. 2019-07-08 20:04:40 +08:00
caryliu 43ae9f9f5a fix the release of pointer in Model. 2019-07-08 16:20:59 +08:00
owen 00083d8114 fix file wrong name issue 2019-07-08 16:14:54 +08:00
owen 6dd67ae07b remove wrong name file 2019-07-08 16:13:20 +08:00
owen 963f6f6aaa Merge commit '955cfbf69eba92a444455e280b8b50a17b1ab250' into v2.3.0-all-platform
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
#	tools/tojs/renderer.ini
2019-07-08 13:56:44 +08:00
owen 5c0e431c74 refine config macro logic 2019-07-08 13:54:15 +08:00
owen ce9b88983e Fix Multiply Threads bug 2019-07-08 13:53:37 +08:00
caryliu a1a7a8ed3a delete code 2019-07-06 08:57:57 +08:00
caryliu 3a114d4d12 delete mesh assembler 2019-07-05 16:01:37 +08:00
caryliu c93c0d87a7 delete mesh binding 2019-07-05 14:26:49 +08:00
caryliu b69aab18cd Fix allert crash when texture is null 2019-07-05 11:28:02 +08:00
owen c96f164786 Simple Sprite Multiply Thread 2019-07-04 19:57:23 +08:00
caryliu 25aa11d458 delete code 2019-07-04 18:09:38 +08:00
caryliu 934a3a1ba0 Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-youyou-mesh
# Conflicts:
#	cocos/scripting/js-bindings/manual/jsb_conversions.cpp
2019-07-04 17:06:03 +08:00
caryliu 0fd739e216 Fix the processing error of Property in jsb-bindings. 2019-07-03 18:37:04 +08:00
owen 7d138409f5 Update binding file 2019-07-03 11:21:42 +08:00
caryliu 11dfa785b8 Support mesh renderer 2019-07-03 09:50:17 +08:00
owen 930b14b174 default project 2019-07-02 20:17:20 +08:00
owen 683a811851 Merge commit 'aeda325f76663ad4c1e4d8087109b1897413ac23' into v2.3.0-fix-template-issue 2019-07-02 16:31:11 +08:00
owen ed12e82812 Fix android compile 2019-07-02 16:28:18 +08:00
owen ff1158d0a4 Fix InputAssembler not clear bug 2019-07-02 14:40:41 +08:00
owen 987066e0b4 native post render flag 2019-07-01 14:39:41 +08:00
owen a21314dd86 roll back 2019-07-01 14:08:36 +08:00
owen 60fb8ab0bb Optimize assembler enable disable logic 2019-07-01 13:58:55 +08:00
owen b9334e5f57 Merge commit '9e9541917cab4ecfdd29b54120995931ab04c3ed' into v2.3.0-fix-render-bug4
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
#	tools/tojs/renderer.ini
2019-07-01 11:30:09 +08:00
owen 036b2fd81a Optimize assembler enable disable logic 2019-07-01 11:22:15 +08:00
cary ef58614dfd Merge branch 'v2.3.0' into v2.3.0-forward-renderer 2019-07-01 11:05:46 +08:00
caryliu 74bc2caffc Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-forward-renderer
# Conflicts:
#	cocos/renderer/scene/ModelBatcher.cpp
#	cocos/renderer/scene/ModelBatcher.hpp
#	tools/tojs/renderer.ini
2019-06-29 14:39:57 +08:00
caryliu 45e223775d modify by comments 2019-06-28 10:40:47 +08:00
caryliu 97a2bb2cfa modify return value 2019-06-28 09:43:56 +08:00
caryliu b7c55d0617 optimize recycle float array. 2019-06-28 00:29:29 +08:00
owen dad9b052ce refine code 2019-06-27 20:43:57 +08:00
caryliu dd8a8246b7 Optimize the code by PR comments. 2019-06-27 18:15:41 +08:00
owen eec0bace41 修复透明度bug 2019-06-27 16:20:33 +08:00
owen 2c1b1482c6 Native optimize 2019-06-26 18:59:49 +08:00
2youyouo2 2bd5935110 add effect.copy bindings 2019-06-26 17:21:20 +08:00
caryliu fef37c1a58 Synchronize forward-renderer. 2019-06-26 16:34:51 +08:00