pandamicro
7c160fcaa4
Merge pull request #7289 from pandamicro/merge1.2
...
Merge v1.2
2020-09-03 11:41:41 +08:00
pandamicro
8172574ec3
Fix ci
2020-09-03 11:37:15 +08:00
pandamicro
e9780cd3c8
Fix sealed global variables
2020-09-03 11:33:09 +08:00
pandamicro
3539945cf4
Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2
...
# Conflicts:
# tests/general/sealed-global-variables.json
2020-09-03 11:30:28 +08:00
pandamicro
9bb07a606d
Fix issue
2020-09-03 11:29:53 +08:00
pandamicro
ba049f279f
Merge pull request #7281 from pandamicro/merge1.2
...
Merge v1.2 to 3d
2020-09-03 11:28:04 +08:00
Leslie Leigh (李的序)
6e8d071b99
Disable instantiate-jit for now ( #7286 )
2020-09-03 11:24:47 +08:00
Leslie Leigh (李的序)
8b4209349a
Update .vscode/settings.json ( #7285 )
2020-09-03 10:54:40 +08:00
Yun Hsiao Wu
7935c1d626
fix render buffer resize ( #7284 )
2020-09-03 10:43:49 +08:00
pandamicro
31e8d0f342
Fix issues
2020-09-02 23:43:36 +08:00
pandamicro
bfc472f2db
Fix some issues
2020-09-02 19:54:25 +08:00
Leslie Leigh (李的序)
afad4b3e72
Fix migration ( #7283 )
2020-09-02 19:26:59 +08:00
Leslie Leigh (李的序)
4e56acb851
Fix missed cc.* ( #7282 )
...
* Fix missed `cc.*`
* Fix
2020-09-02 19:04:38 +08:00
pandamicro
938b70153a
Update package-lock
2020-09-02 18:40:09 +08:00
pandamicro
1d2a82d957
Merge branch '3d-v1.2' into merge1.2
...
# Conflicts:
# cocos/core/3d/framework/mesh-renderer.ts
# cocos/core/components/ui-base/ui-renderable.ts
# cocos/core/pipeline/forward/forward-pipeline.ts
# cocos/core/pipeline/forward/scene-culling.ts
# cocos/core/pipeline/render-additive-light-queue.ts
# cocos/core/pipeline/render-stage.ts
# cocos/core/pipeline/shadow/shadow-flow.ts
# cocos/core/renderer/core/memory-pools.ts
# cocos/core/renderer/scene/camera.ts
# cocos/core/renderer/scene/model.ts
# cocos/core/renderer/scene/render-scene.ts
# cocos/core/root.ts
# cocos/particle/billboard.ts
# cocos/terrain/terrain.ts
# cocos/ui/components/button.ts
# package-lock.json
# package.json
# tests/general/sealed-global-variables.json
2020-09-02 18:39:09 +08:00
ChiaNing
578d4fb645
node deprecated bug fix ( #7279 )
2020-09-02 17:19:20 +08:00
zheng han
f1d0844ac0
add some type to deserialize code ( #7274 )
...
* add some type to deserialize code
* remove code
* fix export
2020-09-02 17:18:34 +08:00
Leslie Leigh (李的序)
610aff1c51
Fix js.setClassAlias error ( #7278 )
2020-09-02 17:00:35 +08:00
ChiaNing
e8ff43f504
editBoxImpl inputmode bug fix ( #7276 )
...
* editBoxImpl inputmode bug fix
* type update
2020-09-02 15:57:15 +08:00
pandamicro
6b43a2dfdc
Update primitives with second uvs
2020-09-02 15:46:28 +08:00
Knox
3d9cd319ee
add video player component ( #7226 )
...
* add video player component
* refine code
* refine code
* refine code
* refine code
* refine code
* refine code
* refine code
2020-09-02 15:42:33 +08:00
jiaxin.lai
3933474f3e
change default mask value of collision matrix ( #7277 )
2020-09-02 15:32:48 +08:00
pandamicro
3240dba206
Component rename for new standard and 2d compatibility ( #7103 )
...
* Rename ui related components
* Rename files
* Remove Useless errors
* Fix sealed names
* Fix sealed global variables
* Fix circular reference
* Refactor more component names
* Rename particle and animation related component
* export scene and models sub module in renderer
* Rename ModelComponents to Model
* Refactor LightComponents to Light
* Refactor CameraComponent to Camera
* Refactor ConstraintComponents to Constraint and rename physics comps
* Cleanup and fix issues
* Small fixes
* Refactor Model to MeshRenderer
* Final touch
* Fix data class export
* Better deprecation to cover all old usage
* Simpler and better deprecation with js.setClassAlias
* Fix ci
* Fix editor issue
2020-09-02 15:31:49 +08:00
minggo
f2f1dcf63c
increase ref to avoid crash ( #2750 )
2020-09-02 14:55:52 +08:00
coulsonwang
2edd136d3f
add render window pool handler ( #7273 )
2020-09-02 14:50:41 +08:00
jiaxin.lai
0192c71542
add update & updateList to Enum ( #7272 )
...
* add update & updateList to Enum
* auto update list if __enums__ is array
2020-09-02 14:22:46 +08:00
CocosRobot
85e8f3a09d
[ci skip][AUTO]: updating jsbinding automatically ( #2749 )
2020-09-02 13:45:29 +08:00
coulsonwang
ace971bc82
fix render window binding ( #2748 )
2020-09-02 13:39:29 +08:00
Leslie Leigh (李的序)
bc5b531191
Add decorator @editable @serializable ( #7178 )
2020-09-02 11:44:12 +08:00
Leslie Leigh (李的序)
6803722fc8
Fix morph issue on some platforms ( #7268 )
...
* Fix morph issue on platforms with shader >= 300 && having not float texture
* Fix
* Update
* Optimize
* Typo
2020-09-02 10:27:33 +08:00
minggo
d7001f0a1d
Shared memory ( #2747 )
...
* make buffer pool data empty
* use typedarray for array poll
2020-09-02 09:45:48 +08:00
ChiaNing
883a0571a1
fix particle ia reuse ( #7267 )
...
* fix particle ia reuse
* useless remove
* fix trail & line
Co-authored-by: ArthurWang <810612483@qq.com >
2020-09-02 09:06:37 +08:00
coulsonwang
4a42058ebd
fix shared memory ( #2746 )
2020-09-02 08:50:16 +08:00
hujf
dcfeb168e0
Update game.ts ( #7269 )
...
当帧率设置为非30或60的时候,如果玩家修改了手机时间(例如提前了一个小时),将导致currTime - legacyCC.game._lastTime为一个很大的负值,间接造成timeToCall很大,director.mainLoop将在一个小时后才会被调用。
2020-09-01 23:09:06 +08:00
jiaxin.lai
d727090b72
fix auto simulation ( #7264 )
...
* fix auto simulation
* sync only once if accumulator not enough
* tweaks
2020-09-01 23:00:51 +08:00
jiaxin.lai
76784c6004
fix splash screen by delay destroy ( #7270 )
2020-09-01 22:10:22 +08:00
minggo
d192a8e96a
Merge pull request #2745 from CocosRobot/update_cocosfiles_1598954909
...
[AUTO][ci skip]: updating cocos2dx_files.json
2020-09-01 18:12:38 +08:00
CocosRobot
e3e1b6a145
[AUTO][ci skip]: updating cocos2dx_files.json
2020-09-01 10:08:29 +00:00
CocosRobot
6a696983e0
[ci skip][AUTO]: updating jsbinding automatically
2020-09-01 10:03:11 +00:00
minggo
04c970ad89
Merge pull request #2743 from minggo/pipline_binding
...
Pipline binding
2020-09-01 18:00:02 +08:00
minggo
f8261ade41
Merge pull request #6 from Mee-gu/removeShadowmapBinding
...
remove shadowmap binding
2020-09-01 17:24:06 +08:00
coulsonwang
1b091e3f55
add get macros binding
2020-09-01 17:22:41 +08:00
minggo
20b9ce2eb1
fix buffer pool logic
2020-09-01 17:18:13 +08:00
troublemaker52025
d5aea41659
optimizate instanced shadow ( #7260 )
...
* optimizate instanced shadow
* update
2020-09-01 16:03:36 +08:00
Yun Hsiao Wu
b4671b5980
fixed instancing for real-time skeletal animation ( #7265 )
2020-09-01 15:15:03 +08:00
JoneLau
affd406ad2
remove Don't_Clear in CanvasComponent ( #7258 )
2020-09-01 14:18:50 +08:00
ChiaNing
8fab463514
quat set bug fix ( #7261 )
2020-09-01 13:50:43 +08:00
Yun Hsiao Wu
1fb08a521c
more misc fixes ( #7254 )
...
* fix IA reuse
* better instanced/batched buffer submission
* UI: don't destroy IA every frame!
* passes need to be updated regardless of model.node
* restore splash screen workaround
* use class to declare draw info
* even even more type checks for object pools
* should bind an envmap regardless of activeness of skybox
2020-09-01 12:27:47 +08:00
coulsonwang
c0bb7138a9
remove shadowmap binding
2020-09-01 11:24:02 +08:00
jiaxin.lai
8ff8363eac
Using physics group ( #7259 )
...
* using physics group
* tweaks
* rename
* remove time reset
* rename
* change emit events order
2020-09-01 10:20:11 +08:00