Knox
|
73279104fc
|
sync 2d scrollview-view component (#7068)
* sync 2d scrollview-view component
* refine code
|
2020-08-14 10:30:45 +08:00 |
|
JoneLau
|
02c6fbd083
|
fixed multi-touch finger number distribution error (#7134)
|
2020-08-14 10:24:40 +08:00 |
|
cary
|
79f0f3fd0a
|
Keep the WrapMode of curve and animation consistent. (#7133)
|
2020-08-13 22:27:58 +08:00 |
|
Leslie Leigh (李的序)
|
7d944f0813
|
Optimize physics selector (#7082)
* Optimize physics selector
* CI
* Update
|
2020-08-13 18:32:31 +08:00 |
|
Yun Hsiao Wu
|
dfc3d141f2
|
GFX Descriptor Set (#7101)
* gfx: descriptor sets
* gfx: descriptor set, singular
* better structure
* adapt upper layers: first pass
finally all compiler errors cleared.
OKAY IT'S HAPPENING EVERYBODY STAY THE ****ING CALM
* adapt upper layers: second pass
THERE AND BACK AGAIN
* unified light pass & shadow shader
* gfx: descriptor set & pipeline layout
* light pass: better structure
* light pass: dynamic uniform
* even more type checking for memory pools
* Fix particleSystem and lineComponent.
* delete comment
* guard pool init param
* Fix trail module error.
* delete space
* light pass: instancing & batching support
* don't polyfill gfx stuff inside EffectAsset
* better light pass structure
* fix spot light culling
Co-authored-by: caryliu <caryliu1999@gmail.com>
|
2020-08-13 18:21:15 +08:00 |
|
troublemaker52025
|
0a24b1f5ee
|
change Internal cut spotFrustum to external cut spotFrustum (#7130)
|
2020-08-13 16:43:18 +08:00 |
|
Leslie Leigh (李的序)
|
1cdacdee80
|
@cocos/build-engine 3.0.3(1.2 + ByteDance support) (#7129)
|
2020-08-13 15:56:14 +08:00 |
|
cary
|
349c316c36
|
delete addRenderPass api of forward pipeline. (#7076)
|
2020-08-13 12:15:48 +08:00 |
|
黄森斌
|
ce45efdae0
|
update internal assets meta (#7107)
|
2020-08-13 11:55:13 +08:00 |
|
JoneLau
|
9740818fda
|
modify description (#7106)
|
2020-08-13 11:53:16 +08:00 |
|
pandamicro
|
dd2434f9b3
|
Merge pull request #7124 from pandamicro/3d-v1.2
Merge 3d v1.1.x
|
2020-08-13 11:38:41 +08:00 |
|
pandamicro
|
613495d5b8
|
Fix ci
|
2020-08-13 11:36:09 +08:00 |
|
pandamicro
|
95b5255be5
|
Change line break to LF in game
|
2020-08-13 11:25:48 +08:00 |
|
pandamicro
|
bc06db685c
|
Merge remote-tracking branch 'origin/3d-v1.2' into 3d-v1.2
|
2020-08-13 11:24:00 +08:00 |
|
pandamicro
|
e09efa33c2
|
Fix ci
|
2020-08-13 11:07:28 +08:00 |
|
pandamicro
|
f81470706e
|
Revert pso move into Instanced item
|
2020-08-13 10:59:00 +08:00 |
|
Knox
|
a050633146
|
sync 2d toggle/toggle-container component (#7057)
|
2020-08-12 23:44:40 +08:00 |
|
GengineJS
|
ba0385d37f
|
[Feature] animation component adds gameview mode (#7125)
|
2020-08-12 23:32:39 +08:00 |
|
黄森斌
|
ea4f3e1700
|
canvasComponent objFlags add position lock (#7120)
|
2020-08-12 23:31:30 +08:00 |
|
pandamicro
|
8d142e42a9
|
Optimize some documents (#7092)
* Optimize some documents
* Update
* Update
* Update
|
2020-08-12 23:27:53 +08:00 |
|
Leslie Leigh (李的序)
|
0c5debbc15
|
Doc for js.array.* (#7089)
|
2020-08-12 23:27:39 +08:00 |
|
Santy-Wang
|
75a80cacf5
|
fix scene.dependAssets is empty (#7097)
* fix scene.dependAssets is empty
* refine
|
2020-08-12 23:17:57 +08:00 |
|
PP
|
d95e9930cc
|
fix delay load ttf font bug (#7095)
|
2020-08-12 23:15:44 +08:00 |
|
cary
|
93d45f37c9
|
Fix error when splash screen start. (#7122)
|
2020-08-12 16:47:36 +08:00 |
|
pandamicro
|
3b66332823
|
Merge remote-tracking branch 'origin/3d-v1.1.1' into 3d-v1.2
# Conflicts:
# cocos/core/3d/builtin/effects.ts
# cocos/core/animation/animation-state.ts
# cocos/core/game.ts
# cocos/core/gfx/webgl/webgl-commands.ts
# cocos/core/pipeline/instanced-buffer.ts
# cocos/core/pipeline/render-instanced-queue.ts
# cocos/core/platform/event-manager/input-manager.ts
# cocos/core/platform/view.ts
# cocos/core/renderer/core/pass.ts
# cocos/core/renderer/scene/planar-shadows.ts
# cocos/core/splash-screen-webgl.ts
# cocos/core/utils/profiler/profiler.ts
# cocos/particle/renderer/trail.ts
# cocos/terrain/terrain.ts
# package-lock.json
# package.json
# predefine.ts
# scripts/build-engine/package-lock.json
# scripts/build-engine/package.json
# scripts/build-engine/src/index.ts
|
2020-08-12 15:53:52 +08:00 |
|
pandamicro
|
2327d9e6c7
|
Merge pull request #7114 from cocos-creator/3d
Sync some fixes from 3d branch
|
2020-08-11 16:06:15 +08:00 |
|
Leslie Leigh (李的序)
|
9b4f0ae688
|
Fix typo (#7102)
|
2020-08-10 16:05:34 +08:00 |
|
PP
|
dbf372dde4
|
widget refreshScene after scene loaded (#7100)
|
2020-08-07 23:44:43 +08:00 |
|
SijieWang
|
efc710f169
|
merge pipeline (#7096)
|
2020-08-07 14:57:14 +08:00 |
|
cary
|
7d77ea3dde
|
Modify pipeline resourceization. (#7067)
* Modify pipeline resourceization.
* change to call setRenderPipeline only once.
|
2020-08-07 12:10:03 +08:00 |
|
Leslie Leigh (李的序)
|
d0c276c941
|
@cocos/build-engine@3.0.2(bug fix update) (#7087)
* @cocos/build-engine@3.0.2(bug fix update)
* Update
|
2020-08-07 10:47:42 +08:00 |
|
Myway
|
f5eb94f8b6
|
Support lightmap instancing & clamp terrain height (#7094)
* lightmap instancing
* fix planar shadow instancing
* clamp height
|
2020-08-06 22:24:53 +08:00 |
|
SijieWang
|
fbb6c52314
|
Move internal assets to the engine (#7093)
|
2020-08-06 22:09:24 +08:00 |
|
SB
|
baa2102339
|
Update
|
2020-08-06 17:41:06 +08:00 |
|
SB
|
c2a31b26b7
|
Update
|
2020-08-06 17:36:41 +08:00 |
|
SB
|
3435697d7b
|
Update
|
2020-08-06 17:25:21 +08:00 |
|
SB
|
f0882d6272
|
Optimize some documents
|
2020-08-06 17:23:06 +08:00 |
|
ChiaNing
|
6b5c59435c
|
usevao bug fix for vivo (#7088)
|
2020-08-06 16:34:21 +08:00 |
|
Leslie Leigh (李的序)
|
419f8c0286
|
@cocos/build-engine for 1.2 (#6735)
* Build engine V3.0.0
Ammo.js wasm support; Multi-module engine support; Remove physics macros
Lock
* 3.0.1
|
2020-08-06 10:26:52 +08:00 |
|
pandamicro
|
724afb7be5
|
Merge pull request #7079 from cocos-creator/3d
_checkMultipleComp() default return true (#7077)
|
2020-08-05 23:34:23 +08:00 |
|
黄森斌
|
718ca0608b
|
_checkMultipleComp() default return true (#7077)
|
2020-08-05 22:57:03 +08:00 |
|
troublemaker52025
|
785ebc4d4a
|
Resolve light batching (#7055)
* add light batching
* update
* abstract PassInstancedBuffer && LightInstancedBuffer
* Conflict resolution
* merge batched-buffer
* update
|
2020-08-05 17:24:24 +08:00 |
|
troublemaker52025
|
933465ccca
|
Resolve light instanced (#7039)
* add light-instanced
* update func name
* update
* update
* update
* update
* abstract PassInstancedBuffer && LightInstancedBuffer
* update
* merge pr to 1.2
* Conflict resolution
* merge instancedBuffer
* update
|
2020-08-05 17:22:53 +08:00 |
|
Knox
|
968a53e673
|
sync 2d outline component (#7061)
|
2020-08-05 15:28:22 +08:00 |
|
Knox
|
f5c2041978
|
sync 2d page-view component (#7064)
|
2020-08-05 13:44:23 +08:00 |
|
Leslie Leigh (李的序)
|
26df6fb1c0
|
Optimize editor decorators (#7002)
|
2020-08-05 10:36:52 +08:00 |
|
minggo
|
acaeed4e4e
|
RenderView remove dependence of Root (#7034)
|
2020-08-05 09:36:18 +08:00 |
|
Knox
|
644632a58d
|
Fix label.string cannot be set to null or undefined. (#7069)
|
2020-08-04 17:11:33 +08:00 |
|
Myway
|
77186a5c5b
|
lightmap instancing (#7070)
* lightmap instancing
* fix planar shadow instancing
|
2020-08-04 16:58:47 +08:00 |
|
PP
|
a34d288178
|
remove properties in EditBox (#7066)
* remove properties in EditBox component
* reorder display
* remove alwaysOnTop on editbox impl
|
2020-08-04 14:16:30 +08:00 |
|