troublemaker52025
|
8407e716ac
|
auto-shadow-info (#7404)
* auto-shadow-info
* add bais control
* update control name
* merge cc_shadowPCF(Vec2) && cc_shadowSize(Vec2) to cc_shadowInfo(Vec4)
|
2020-10-11 17:27:53 +08:00 |
|
ChiaNing
|
88ced2665e
|
UI material stencil state change bug fix (#7497)
|
2020-10-11 17:25:25 +08:00 |
|
江战
|
040ebc4f6b
|
sync https://github.com/cocos-creator-packages/jsb-adapter/pull/210 (#7483)
|
2020-10-11 17:24:27 +08:00 |
|
PP
|
6000791697
|
Revert "fix sharedCanvas (#7405)" (#7495)
This reverts commit 93d3d8c5de.
# Conflicts:
# cocos/core/assets/image-asset.ts
|
2020-10-11 17:20:13 +08:00 |
|
黄森斌
|
8ae5b52379
|
typescript template add document reference link (#7488)
|
2020-10-11 17:19:01 +08:00 |
|
Knox
|
1ca96f678b
|
improve web view component (#7414)
* add web view
* add web view gizmo icon
|
2020-10-11 17:12:11 +08:00 |
|
CocosRobot
|
3d1df73025
|
[ci skip][AUTO]: updating jsbinding automatically (#2889)
|
2020-10-10 18:42:40 +08:00 |
|
minggo
|
3539745c14
|
use native Texture/TextureInfo/TextureViewInfo on native platforms (#7498)
|
2020-10-10 18:28:16 +08:00 |
|
minggo
|
befc5c77e6
|
the same member declaration sequence as JS (#2887)
|
2020-10-10 18:27:48 +08:00 |
|
coulsonwang
|
a5e573555b
|
fix metal resource update (#2875)
|
2020-10-10 18:08:25 +08:00 |
|
CocosRobot
|
ef6b013a8f
|
[ci skip][AUTO]: updating jsbinding automatically (#2886)
|
2020-10-10 17:03:02 +08:00 |
|
江战
|
c4433a3c75
|
fix outof range error (#2885)
|
2020-10-10 16:28:10 +08:00 |
|
CocosRobot
|
efb2b14b15
|
[ci skip][AUTO]: updating jsbinding automatically (#2882)
|
2020-10-10 15:18:59 +08:00 |
|
江战
|
a12ef80cba
|
3dgfx struct constructor allow varargs (#2879)
* Revert "update constructor (#2873)"
This reverts commit cfedd696b1.
* allow variable argument list
|
2020-10-10 15:12:43 +08:00 |
|
jiaxin.lai
|
17866af905
|
tweaks tooltip of isTrigger (#7485)
|
2020-10-10 14:17:41 +08:00 |
|
吴智明
|
c076ba8a7a
|
change template config file to camel case syntax (#2804)
|
2020-10-10 11:55:22 +08:00 |
|
CocosRobot
|
001dc1208c
|
[ci skip][AUTO]: updating jsbinding automatically (#2877)
|
2020-10-10 10:53:46 +08:00 |
|
江战
|
cfedd696b1
|
update constructor (#2873)
|
2020-10-10 10:05:41 +08:00 |
|
pandamicro
|
c2df63d85c
|
Add Shadows.bias in shared memory (#2869)
|
2020-10-10 10:05:25 +08:00 |
|
ChiaNing
|
0382ba40c1
|
SPF Optimization for build (#7482)
* SPF Optimization for build
* update
|
2020-10-09 15:22:09 +08:00 |
|
PP
|
73be65cd31
|
support new SubContextView (#7303)
* support new SubContextView
* update
* add type property when postMessage
|
2020-10-08 23:57:03 +08:00 |
|
pandamicro
|
b579427fd8
|
Merge pull request #7475 from pandamicro/3d
Merge v1.2 to 3.0
|
2020-09-30 18:37:11 +08:00 |
|
pandamicro
|
9d9b8d6169
|
Fix ci
|
2020-09-30 18:34:30 +08:00 |
|
CocosRobot
|
cce57f6249
|
[AUTO][ci skip]: updating cocos2dx_files.json (#2867)
|
2020-09-30 18:26:22 +08:00 |
|
CocosRobot
|
79df5fa3ce
|
[ci skip][AUTO]: updating jsbinding automatically (#2866)
|
2020-09-30 18:05:02 +08:00 |
|
pandamicro
|
7481303268
|
Merge branch '3d-v1.2' into 3d
# Conflicts:
# cocos/core/3d/framework/camera-component.ts
# cocos/core/assets/mesh.ts
# cocos/core/components/component-event-handler.ts
# cocos/core/game.ts
# cocos/core/gfx/webgl/webgl-commands.ts
# cocos/core/gfx/webgl2/webgl2-commands.ts
# cocos/core/pipeline/define.ts
# cocos/core/pipeline/forward/forward-pipeline.ts
# cocos/core/pipeline/instanced-buffer.ts
# cocos/core/pipeline/render-pipeline.ts
# cocos/core/pipeline/shadow/shadow-flow.ts
# cocos/core/renderer/scene/model.ts
# cocos/core/renderer/scene/shadows.ts
# cocos/core/renderer/scene/skybox.ts
# cocos/core/splash-screen.ts
# cocos/ui/components/button.ts
# cocos/ui/components/editbox/edit-box-impl.ts
# editor/assets/primitives.fbx
# package-lock.json
# package.json
|
2020-09-30 18:01:33 +08:00 |
|
Knox
|
8299383ae8
|
add web view (#2863)
* add web view
* refine code
|
2020-09-30 17:58:38 +08:00 |
|
江战
|
36ac7ab368
|
[3d-gfx] sync #2231 neg acc.z (#2862)
* use negative value of acc.z #2231
* fix typo
|
2020-09-30 17:31:54 +08:00 |
|
coulsonwang
|
ebb4670ce2
|
undef __SSE__ (#2864)
|
2020-09-30 17:29:01 +08:00 |
|
minggo
|
c9bbcf905f
|
GFXInputState GFXPipelineStateInfo use jsb binded class (#7473)
|
2020-09-30 17:25:20 +08:00 |
|
minggo
|
70b4e4c671
|
make element sequence as JS engine (#2865)
|
2020-09-30 17:25:14 +08:00 |
|
Knox
|
1a0ffc6af8
|
fix calculate delta time bug (#7471)
* fix calculate delta time bug
there is no need to calculate Delta Time under the editor.
* refine code
|
2020-09-30 16:21:15 +08:00 |
|
troublemaker52025
|
3375a5cf15
|
Shadow optimization (#7459)
* toon receives shadow
* fix gfx state cache
* 背面消影
* merge cc_ShadowPCF && cc_ShadowMapSize to cc_ShadowInfo; add bias to shader and editor
* update
* merge pr #7452
https://github.com/cocos-creator/engine/pull/7452
* reomve atten; use NL
Co-authored-by: Yun Hsiao Wu <inheritorofgalaxy@gmail.com>
|
2020-09-30 15:36:01 +08:00 |
|
Leslie Leigh (李的序)
|
21a6bb135a
|
Optimize morph rendering (#7436)
|
2020-09-30 15:24:29 +08:00 |
|
yinkaile
|
6096ec001e
|
add type definition to tween (#7368)
|
2020-09-30 15:22:18 +08:00 |
|
Knox
|
454c7bd3ee
|
improve video player and support for Android and iOS platforms. (#7470)
* improve video player and support for Android and iOS platforms.
* refine code
|
2020-09-30 14:10:52 +08:00 |
|
Knox
|
24bb96f7ef
|
add video player (#2860)
|
2020-09-30 13:58:07 +08:00 |
|
Jare Guo
|
e050e668bb
|
move babel-plugin-const-enum to babel-preset-cc
|
2020-09-29 16:25:39 +08:00 |
|
minggo
|
0d29f4f3f3
|
make only native gfx work (#7468)
|
2020-09-29 14:48:43 +08:00 |
|
CocosRobot
|
c53498c0c0
|
[AUTO][ci skip]: updating cocos2dx_files.json (#2861)
|
2020-09-29 11:23:02 +08:00 |
|
江战
|
eab43d947b
|
[3dgfx] sync #1921 websocket server impl (#2859)
* support websocket server (#1921)
* add websocket server
* disable websocket server
|
2020-09-29 11:06:11 +08:00 |
|
吴智明
|
b3f5172f2a
|
add split screen support (#2858)
Signed-off-by: wuzhiming <wuzhiming.chukong@gmail.com>
|
2020-09-29 09:54:00 +08:00 |
|
Jare Guo
|
4e08e87e4d
|
fix ci
|
2020-09-28 19:00:04 +08:00 |
|
江战
|
17e9a9fa98
|
[3dgfx] sync #2705 js exception (#2856)
|
2020-09-28 18:16:15 +08:00 |
|
pandamicro
|
30662bd702
|
Merge pull request #7464 from pandamicro/3d-v1.2
Merge v1.1 into v1.2
|
2020-09-28 18:02:01 +08:00 |
|
pandamicro
|
27e36c1179
|
Merge remote-tracking branch 'origin/3d-v1.1' into 3d-v1.2
# Conflicts:
# cocos/core/math/quat.ts
# cocos/core/math/rect.ts
|
2020-09-28 17:55:37 +08:00 |
|
coulsonwang
|
79a8fff70d
|
add buffer memory barrier (#2849)
* add buffer memory barrier
* add execution barrier
|
2020-09-28 17:29:32 +08:00 |
|
Yun Hsiao Wu
|
f7ddf5a041
|
fix camera.clearColor (#7462)
|
2020-09-28 17:05:46 +08:00 |
|
ChiaNing
|
15a1806d18
|
API doc format change (#7456)
|
2020-09-28 16:52:52 +08:00 |
|
JoneLau
|
1398ad4b1c
|
fixed vb initialization and submit twice (#7460)
|
2020-09-28 16:50:38 +08:00 |
|