CocosRobot
5148ee870f
[AUTO][ci skip]: updating cocos2dx_files.json ( #2714 )
2020-08-24 17:24:42 +08:00
Yun Hsiao Wu
46ba30ae13
GFX Descriptor Set ( #2713 )
...
* GFX Descriptor Set: GLES3
* GFX Descriptor Set: GLES2
* GFX Descriptor Set: Vulkan
* upper layer adaptions
* GFX Descriptor Set: Metal
Co-authored-by: coulsonwang <coulsonwang@126.com >
2020-08-24 17:11:06 +08:00
Yun Hsiao Wu
ba8e49eff8
more adaptations ( #7205 )
2020-08-24 12:02:27 +08:00
黄森斌
048bb23145
update one fbx meta file in internal db ( #7200 )
...
* update internal db file
* update primitive.fbx.meta
2020-08-24 11:57:21 +08:00
troublemaker52025
cc3b750a54
repair instance endlessLoop ( #7203 )
2020-08-24 11:56:48 +08:00
zhefeng.zhang
fda166d954
sync #1919 ( #2711 )
2020-08-24 11:54:15 +08:00
minggo
035a632abb
invoke Model.initialize() before being resued ( #7201 )
2020-08-24 11:43:43 +08:00
minggo
9ba81190d1
calculate total frames ( #2710 )
2020-08-24 09:41:06 +08:00
PP
cd03651bc4
remove jsb module declaration in engine repo ( #7143 )
...
* remove jsb module declaration in engine repo
* ignore jsb check
* space
2020-08-21 18:50:28 +08:00
minggo
b01997250c
Add array pool and add more elements into shared memory ( #7197 )
...
* Add array pool and add more elements into shared memory
* use template parameter
* use template parameter
* don't use shared memory for director
2020-08-21 17:04:36 +08:00
pandamicro
1b26d3dc7b
Small fixes ( #7202 )
2020-08-21 16:27:32 +08:00
pandamicro
2618dc6dbe
Bump tfig@2.0.3 ( #7198 ) ( #7199 )
...
Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com >
2020-08-21 14:19:06 +08:00
Leslie Leigh (李的序)
f4e16d0785
Bump tfig@2.0.3 ( #7198 )
2020-08-21 14:15:11 +08:00
pandamicro
12a1dda957
Merge pull request #7196 from pandamicro/merge1.2
...
Merge v1.2
2020-08-21 10:59:03 +08:00
pandamicro
bfe63f4bd1
Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2
...
# Conflicts:
# cocos/core/game.ts
2020-08-21 10:48:52 +08:00
pandamicro
2fb448c934
Fix
2020-08-21 10:45:49 +08:00
Leslie Leigh (李的序)
f289fa7a43
Bump tfig^2.0.2 ( #7189 )
2020-08-20 21:38:04 +08:00
JoneLau
50946d8bdb
fixed the bug when the label's cachemode is char ( #7191 )
2020-08-20 21:30:04 +08:00
troublemaker52025
b8b1cdec71
repair general-vs.chunk ( #7187 )
2020-08-20 16:13:39 +08:00
CocosRobot
d779f28638
[AUTO][ci skip]: updating cocos2dx_files.json ( #2709 )
2020-08-20 16:03:50 +08:00
minggo
95ef78f7c8
fix shared memory ( #2707 )
2020-08-20 15:36:04 +08:00
cary
aabdd1e323
Fix pipeline save error ( #7167 )
...
* Fix pipeline save error
* Fix the problem of shadow map.
* resave pipeline
2020-08-20 15:23:38 +08:00
cary
c6da0c9054
Resave particle system prefab. ( #7186 )
2020-08-20 15:21:31 +08:00
minggo
75bd404b51
Merge pull request #2704 from Mee-gu/RenderView
...
fix RenderView and RenderWindow
2020-08-20 15:16:18 +08:00
cary
e1e4cf49fc
delete ccclass of ambient ( #7184 )
2020-08-20 00:25:48 +08:00
cary
745569d2af
Fix pass error when use dynamic defines. ( #7183 )
2020-08-19 23:51:28 +08:00
cary
c08d84d11e
Revert scene global. ( #7181 )
...
* Revert scene global.
* fix ci
2020-08-19 23:41:38 +08:00
coulsonwang
4a18a34a6c
add pipeline instance
2020-08-19 22:07:54 +08:00
yinkaile
da5c216874
sync #5195 ( #7150 )
2020-08-19 17:42:41 +08:00
JoneLau
25fc58102e
fix fillrange not effect when the number is negative ( #7173 )
2020-08-19 17:41:02 +08:00
yinkaile
952648a780
3d v1.2 tween ( #7176 )
...
* sync #6265
* refine api doc
* fixed syntax
2020-08-19 17:40:04 +08:00
江战
03285946f5
iOS crash fix ( #7180 )
2020-08-19 17:36:05 +08:00
minggo
a1b276c9a5
Merge pull request #2702 from CocosRobot/update_cocosfiles_1597810132
...
[AUTO][ci skip]: updating cocos2dx_files.json
2020-08-19 17:10:06 +08:00
coulsonwang
728ffb4aa0
fix RenderView and RenderWindow
2020-08-19 17:07:53 +08:00
Myway
6b9398c2e7
terrain support custom effect ( #7169 )
...
Co-authored-by: Myway3D1 <404793124@qq.com >
2020-08-19 15:52:59 +08:00
PP
37b1671bce
sync bug fix for EditBox from 2d branch ( #7071 )
...
* add type definition for setter in EditBox
* support browser type EDGE
* hide clear button of input on Edge Browser
* sync label node scale to dom input fontSize
* refine editbox placeholderLabel css-in-js
* refine editbox begin editing callback
* extend some method from parent class
update
* fix not resize browser size when editbox end editing
* fix editbox doesn’t fire ‘compositionend’ event on mobile
* fix maxLength for input of number type
* update
* remove some useless private properties
* use scale instead of _scale private property
* Revert "add type definition for setter in EditBox"
This reverts commit cdde7340e238925468381c20ca77b2d28699d627.
2020-08-19 14:34:16 +08:00
CocosRobot
72bc816a6e
[AUTO][ci skip]: updating cocos2dx_files.json
2020-08-19 04:08:52 +00:00
minggo
e547b86402
Merge pull request #2701 from Mee-gu/ShadowMap
...
add shadow flow/stage/batchedQueue
2020-08-19 12:00:16 +08:00
cary
c24f5a77f3
Fix a problem of shadow map. ( #7168 )
2020-08-19 11:20:54 +08:00
yinkaile
a3b3782aaa
3d v1.2 graphics ( #7164 )
...
* sync #5447 - fixed graphics square cap
* sync #6474 - support graphics antialiasing
* sync #5168
* revert unused code
2020-08-19 11:09:23 +08:00
JoneLau
2f9e094581
fixed multi-touch finger number distribution error ( #7162 )
2020-08-19 11:07:32 +08:00
coulsonwang
26e2dbb1c9
fix review
2020-08-19 10:35:28 +08:00
minggo
9f3357d3fd
Merge pull request #2692 from PatriceJiang/3dgfx-fix-cmake-win32-path
...
fix win32 path as cmake argument
2020-08-19 09:39:50 +08:00
minggo
8145993389
Merge pull request #2697 from CocosRobot/update_cocosfiles_1597716606
...
[AUTO][ci skip]: updating cocos2dx_files.json
2020-08-19 09:38:09 +08:00
Leslie Leigh (李的序)
4f2eff842d
Full optimize decorators ( #7166 )
...
* Full optimize decorators
* Conflicts
* Rename immutable -> readOnly
* Update
* Update
* Update
2020-08-18 19:10:34 +08:00
coulsonwang
af2db26c6b
add shadow flow/stage/batchedQueue
2020-08-18 18:11:36 +08:00
cary
26c9fe3030
Move shadow info to pipeline. ( #7159 )
...
* Move shadow info to pipeline.
* fix ci
* modify shadow ubo update
2020-08-18 16:03:58 +08:00
minggo
aa445fdb98
Merge pull request #2699 from CocosRobot/update_cocosfiles_1597732545
...
[AUTO][ci skip]: updating cocos2dx_files.json
2020-08-18 15:46:22 +08:00
Leslie Leigh (李的序)
fbe2a06a76
Change type of Mesh.prototype.data as non-nullable ( #7131 )
...
* Change type of`Mesh.prototype.data` as non-nullable
* Optimize
* Optimize
* Optimize
* Optimize
* Optimize
* Lint
2020-08-18 14:38:02 +08:00
CocosRobot
294da5a477
[AUTO][ci skip]: updating cocos2dx_files.json
2020-08-18 06:35:46 +00:00