Commit Graph

35 Commits

Author SHA1 Message Date
Jare Guo b7c56393d5 Merge remote-tracking branch 'fireball/3d' into 3d-v1.2
# Conflicts:
#	EngineErrorMap.md
#	cocos/core/assets/image-asset.ts
#	cocos/core/data/class.ts
#	cocos/core/data/deserialize.ts
#	package.json
2020-10-28 18:37:39 +08:00
Leslie Leigh (李的序) 1b31da202f Expose build-time-constants interfaces (#7545) 2020-10-21 11:14:52 +08:00
Jare Guo c6fa350e62 should not disable strictFunctionTypes, sync changes from jareguo/engine#4 2020-10-19 17:45:33 +08:00
Jare Guo 17e327bf28 support new serialization at runtime 2020-09-27 19:25:00 +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
Leslie Leigh (李的序) bc5b531191 Add decorator @editable @serializable (#7178) 2020-09-02 11:44:12 +08:00
minggo 4f21401492 import pipeline instead (#7218)
* import pipeline instead

* simplify codes

* add jsb index.ts

* simplify codes

* fix circular dependency

* change build engine version

* change build-engine version

* jsb -> nr
2020-08-31 09:56:40 +08:00
Leslie Leigh (李的序) 59c46c66af Add platform macro for ByteDance (#6982) 2020-07-15 11:37:47 +08:00
PP aaf542be76 remove browserType for minigame (#6970)
* remove browserType for wechatgame

* optimize booting in subContext

update
2020-07-12 22:42:52 +08:00
JoneLau cc722a6ae0 fix warning about super.xxx = xxx (#6701) (#6718)
cherry pick branch 3d, link #6701
2020-05-20 10:52:14 +08:00
Leslie Leigh (李的序) 35c86df584 Turns on isolatedModules (#6368) 2020-03-19 15:58:52 +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
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
jiaxin.lai 1d14c0bc93 refactor_tween (#5794) (#5943)
* refactor_tween (#5794)

* copy from master branch cocos2d actions

* tweaks & stash

* tweaks

* stash

* stash

* tweaks

* fix repeatForever init

* fix repeat、repeatForever、reverseTime

* add elastic out in to easing

* add typing

* add adapter & checker;
add api doc;

* tweaks

* fix tween number

* tweaks

* tweaks

* remove tween.js

* rename actions to tween

* export Tween

* allow mutiple remove action

* using new api

* remove deprecated from tween

* add deprecated to tweenUtil

* fix ci test
2019-12-23 16:22:48 +08:00
Leslie Leigh (李的序) 86636442cf Kill INode & IBaseNode (#5893)
* Remove INode, IBaseNode

* Fix

* Fix types error

* Update
2019-12-19 14:17:14 +08:00
Leslie Leigh (李的序) 3e40d68a1f Add type check to test stage (#5849) 2019-12-12 19:08:42 +08:00
jiaxin.lai 44e6915279 update cannon.js source to @cocos/cannon (#5573) 2019-10-21 16:37:00 +08:00
Lelie Leight (李的序) a722483d2d fix typing errors (#5538)
* fix typing errors

* disable eslint rule: prefer-readonly
2019-10-14 22:58:15 +08:00
Lelie Leight (李的序) b878fbeb50 toggle allowJs in tsconfig (#5357) 2019-09-12 15:48:24 +08:00
SijieWang b215a60e3e Delete some of the Editor references (#5345)
* Delete some of the Editor references

* review code

* test case
2019-09-09 09:58:31 +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
pandamicro 1380e46c34 Unittest (#4973)
* unit test for ts

* Fix ts-jest warnings

* Remove puppeteer for now

* fix physics define and jest config for windows

* Replace Node ref with INode ref

* Fix ci issue

* Fix

* tweak

* tweak

* Fix vscode launcher

* now physics framework export all physics component (#28)

* tweaks
2019-07-25 17:15:20 +08:00
jiaxin.lai fc178a2fdd Add cc tween (#4847)
* add tween.js

* add CCTween
2019-07-10 09:52:38 +08:00
Leslie Leigh af95f05f31 support all ValueType lerp; fix errors (#4565) 2019-06-10 12:57:06 +08:00
Leslie Leigh 13748f235a add docs for animation (#4545)
* add docs for animation

* update tsconfig.json

* fix bug
2019-06-03 18:42:14 +08:00
Leslie Leigh 41c57d1710 typing (#4321) 2019-04-26 18:39:52 +08:00
Leslie Leigh 91572a616c fix typing problems (#4275) 2019-04-23 16:29:40 +08:00
Leslie Leigh 4a2050d7c2 calculate skinned bounds (#4246) 2019-04-18 16:11:06 +08:00
ColinCollins 78e9a3d13f create the docs-3d build workflow (#4232) 2019-04-17 19:29:38 +08:00
Leslie Leigh 48e50a2532 Generate declarations(for temp) (#4218) 2019-04-15 13:45:48 +08:00
Leslie Leigh b3e3ff2b3c move declaration files into @types; adapt sampler interface; fix comp… (#4051)
* move declaration files into @types; adapt sampler interface; fix compiler error

* typing asset/raw-asset

* compiler errors

* delete asset.d.ts

* change tsconfig-gendecls.json

* fix
2019-03-15 17:26:37 +08:00
Leslie Leigh 8b62cab289 Support generate .d.ts (#4024)
* Support generate .d.ts

* change tsc error to console.error

* Remove ch comment

* js to ts
2019-03-13 18:25:20 +08:00
Yun Hsiao Wu af2789ffd9 pass 2019-01-02 18:19:17 +08:00
jerrywwl d48482ef27 fix gfx crash 2018-12-28 10:49:04 +08:00
jerrywwl 1eec1fd9c8 add ts build & test files 2018-12-13 09:18:46 +08:00