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 |
|
jiaxin.lai
|
65b0478c69
|
v1.2 new physics features (#7037)
* 3d v1.1.1-exp physics expriment (#6787)
* activate when not awake (#6781)
* activate when not awake
* cannon too
* off event listener when onDestroy
* add clearVelocity & clearForces
* add CC_CONFIG to ammo\cannon
* add convex mesh & reuse mesh
* cache enable false by default
* terrain collider
* cone collider
* fix scale of ammo box & sphere
* simple collider
* add worldBounds & boundingSphere to collider
* add clear*** to rigid body
* enhance physics material
* enhance event
* plane collider
* stash
* tweaks
* update @cocos/ammo to v1.0.7-beta.1
* typing
* enchance update shape dynamic
* absolute scale cannon-box
* expose allowsleep
* fix warning of generate declaration
* remove physics_builtin
* DO NOT MERGE
* Better reuse
* Correct construct and deconstruct
* avoid ammo memory leaks
* minor refactor contact data
* fix cannon terrain tileSize
* stash
* optimize auto wakeup
* [Ammo] fix update by re add
* 400~
* overwrite ArrayCollisionMatrix.prototype.reset
* Export enum by namespace
* stash
* fix remove child shape of btCompound
* fix event with CCD
* dynamic instantiate
* STASH
* add group to rigid body
* update attachedRigidBody of collider in editor
* stash physics config
* tweaks of ammo config
* stash
* stash
* collision matrix
* stash
* rename deltaTime to fixedTimeStep
* group mask collider
* allow get mask
* set default group to Layers.Enum.DEFAULT
* add group change fallback
* cannon collision matrix
* fix
* update @cocos/ammo to 1.0.7-beta.2
* more prop
* fix
* disable on 1.1.1-exp
* tweaks
* fix circular dependency
* tweaks
* rename simple to simplex
* rename collider -> colliders
* stash
* ammo p2p
* hinge constraint
* adapt cannon p2p pivotB
* ammo p2p setPivotB
* constraint
* tweaks
* remove macro of physics
* refactor physics selector
* import ammo from ammo-instantiated
* update @cocos/ammo
* update @cocos/cannon
|
2020-08-03 11:00:07 +08:00 |
|
Leslie Leigh (李的序)
|
59c46c66af
|
Add platform macro for ByteDance (#6982)
|
2020-07-15 11:37:47 +08:00 |
|
ChiaNing
|
1c54beb91a
|
sys browser type add (#6939)
* sys browser type add
* change JSB
|
2020-07-06 11:31:46 +08:00 |
|
Leslie Leigh (李的序)
|
284aa38d25
|
Build time constants (#6256)
* consts
* Bump @cocos/build-engine version
* Fix
* Upload @cocos/build-engine
* Rm scripts/build-engine/.gitignore
|
2020-03-11 14:05:22 +08:00 |
|