Commit Graph

21 Commits

Author SHA1 Message Date
cary 9c4bb9fd9d Add default prefab of ParticleSystem2D. (#7687)
* Add default prefab of ParticleSystem2D.

* add module export
2020-11-04 22:13:38 +08:00
媛媛 5f3ebf344f add native property in division-config.json (#7611)
* add native in engine module config

* update
2020-10-30 13:42:51 +08:00
江战 a933edb94f Merge TiledMap from 2.x (#7610)
* Save all

* fix uv

* fix object groups

* fix tintcolor

* add method modifier

* tslint

* replace ccCOlor

* add import warning

* rename

* add comments

* add comments

* update zlib

* Save

* pixel offset

* update tests/general/sealed-global-variables.json

* exclude from cc

* remove _walkGen

* update setScale & setRotationFromEuler
2020-10-30 10:35:52 +08:00
yinkaile 96a735b2ff 3d v1.2 physics 2d (#7357)
* Squashed commit of the following:

add physics 2d

* @@ -205,9 +205,6 @@ export class b2PhysicsWorld implements IPhysicsWorld {

revert box2d version

* add mask param to raycast

* refine code
2020-10-12 11:49:49 +08:00
Knox 2d1acb58e9 sync 2d webview (#7318) 2020-09-08 14:19:42 +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
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 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
Leslie Leigh (李的序) 583f1e941e Integrate ammo.js of WebAssembly edition (#6872)
* Ammo initiantiation

* Add to division-config

* Fix

* Fix
2020-06-28 12:20:21 +08:00
jiaxin.lai e68bee6cc7 en api docs of tween (#6468)
* rebase

* fix comma
2020-04-12 19:59:08 +08:00
jiaxin.lai 87c6b9bda4 Ammo-Wrapper (#5954)
* basic physics abstract spec

* spec tweaks

* stash

* cannon refactor

* builtin refactor

* cannon wrapper & framework tweaks

* hiding, wait for 1.0.3

* delete unneed code

* export CANNON

* rebase

* rename stash

* rename I-rigid-body to i-rigid-body

* stash

* stash

* cannon refactor

* cannon wrapper & framework tweaks

* remve unneeded code

* wrap,....hack

* demo impl

* stash

* stash, complete dynamics update

* dynamic update center

* stash, size + center

* tweaks, fix share trigger shape

* tweaks

* stash

* ammo events stash

* tweaks

* stash

* complete ammo events

* tweaks

* stash

* body property, stash

* body , stash...

* tweaks

* tweaks

* tweaks

* ammo tweaks

* stash

* stash

* tweaks

* tweaks

* stash,complete tirgger,body、 ghost etc.

* tweaks

* remove unneeded code

* fix api of angluar velocity

* physic material for single body for now

* ray test stash

* stash

* update ammo version

* impl raycast

* impl group mask

* update ammo version

* update ammo package

* add onDestroy to ammo rigid body

* add protected for temporary

* fix allow sleep

* remove unneed code

* shape tweaks

* stash

* rename spahe to shape

* tweaks

* fix damping

* adapt

* reset state after disable & enable

* export ammo.js

* Revert "cannon wrapper & framework tweaks"

This reverts commit e59ea98c0bd8c23b23e9ee428ddce45d0271f1eb.

* update @cocos/ammo version

* fix applyLocalTorque

* tweaks

* beta version

* fix import i-rigid-body

* delete unused file

* Specification function name
2019-12-25 17:34:12 +08:00
pandamicro 9f89b0ef24 New module division (#5285)
* Temp

* temp

* move ui core

* Arrange ui and terrain

* Fix import path for all modules except core

* Move primitives into core

* Fix debug.getError

* Move audio-downloader to audio module

* export game from game.ts

* Migrate load-pipeline to ts

* Fix core modules and cleanup

* Move animation into core

* Fix module exports

* Fix director issue

* Remove most cc.director usage

* Fix ts issues

* Fix issues for unit test and editor running

* Revert removing deprecated import

* tweaks

* tweaks

* Fix ci

* Fix ci

* Add modules in module division

* Upgrade coordinates-converts-utils
2019-08-30 11:35:22 +08:00
Yun Hsiao Wu ff19a901c1 refine details (#5164)
* effect adapt

* restore tslint

* refine math constants
2019-08-15 21:52:32 -05:00
Leslie Leigh e1d02db441 default to all (#5137) 2019-08-09 02:38:46 -05:00
Leslie Leigh b3733bf1c8 md 2.1 (#5122)
* md 2.1

* update
2019-08-09 00:58:00 -05:00
Yun Hsiao Wu 5f651dad6f fix circular ref (#5131)
* fix circular ref

* remove tslint usage
2019-08-08 21:25:54 -05:00
Leslie Leigh d32badbed8 module division - v2 (#5104)
* module division - v2

* update

* remove motion path helper

* update typing

* update

* mark webgl api as required
2019-08-07 20:33:14 -05:00
Leslie Leigh e30883f5ed disallow specify physics module explicitly (#4937)
* disallow specify physics module explicitly

* update

* disable webgl2 if no gfx-webgl2 is found
2019-07-22 18:13:57 +08:00
Leslie Leigh c17f28201d module division 2 (#4907)
* module division

* update

* update

* small fix

* allow co-existing of physics modules

* update

* upgrade rollup-plugin-node-resolve

* refine build engine cli

* fix

* upgrade rollup plugin commonjs

* fix

* mark physics module as required
2019-07-19 16:12:45 +08:00
Weiliang Wang db12f03059 Revert "module division (#4897)" (#4906)
This reverts commit 78247a0d2f.
2019-07-18 10:45:44 +08:00
Leslie Leigh 78247a0d2f module division (#4897)
* module division

* add animation component

* fetch changes

* dev

* typo
2019-07-18 09:27:02 +08:00