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 |
|
coulsonwang
|
848e253f71
|
fix forward pipeline and forward flow
|
2020-08-10 18:33:26 +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 |
|
coulsonwang
|
406e15b056
|
impl batched buffer
|
2020-08-07 14:13:10 +08:00 |
|
minggo
|
7a741466f8
|
ObjectPool works with JS engine (#2685)
|
2020-08-07 13:55:16 +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 |
|
coulsonwang
|
f1632acfdc
|
fix review
|
2020-08-07 11:07:48 +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 |
|
minggo
|
7e1a55e6d4
|
make AppDelegate.applicationWillTerminate() be invoked before exiting on mac (#2684)
|
2020-08-06 18:06:52 +08:00 |
|
CocosRobot
|
c4a30a4b38
|
[AUTO][ci skip]: updating cocos2dx_files.json (#2682)
|
2020-08-06 17:47:58 +08:00 |
|
SB
|
baa2102339
|
Update
|
2020-08-06 17:41:06 +08:00 |
|
SB
|
c2a31b26b7
|
Update
|
2020-08-06 17:36:41 +08:00 |
|
coulsonwang
|
5a928fb7b5
|
fix RenderInstancedQueue
|
2020-08-06 17:34:19 +08:00 |
|
coulsonwang
|
4e95c932c8
|
use DefineMap
|
2020-08-06 17:34:19 +08:00 |
|
coulsonwang
|
87f98133b0
|
Impl forward stage
|
2020-08-06 17:34:19 +08:00 |
|
江战
|
098e5bc2ae
|
rename js-template-link to template-link (#2678)
|
2020-08-06 17:28:37 +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 |
|
minggo
|
66ed66777d
|
BufferPool works with JS codes (#2679)
|
2020-08-06 17:17:31 +08:00 |
|
ChiaNing
|
6b5c59435c
|
usevao bug fix for vivo (#7088)
|
2020-08-06 16:34:21 +08:00 |
|
knox
|
1fccdde8b8
|
refine code
|
2020-08-06 14:30:49 +08:00 |
|
knox
|
eebe471c11
|
sync 2d scrollview-view component
|
2020-08-06 12:03:49 +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 |
|
CocosRobot
|
69bc0e973e
|
[AUTO][ci skip]: updating cocos2dx_files.json (#2676)
|
2020-08-05 14:08:51 +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 |
|
CocosRobot
|
7a1de8bea6
|
[ci skip][AUTO]: updating jsbinding automatically (#2673)
|
2020-08-05 09:46:37 +08:00 |
|
江战
|
6a9dc66091
|
console rewrite with js / 3dgfx (#2670)
|
2020-08-05 09:45:51 +08:00 |
|