lywsvip/cocos-engine
1
0
Fork 0
mirror of https://github.com/cocos/cocos-engine.git synced 2026-09-07 08:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,466 Commits 111 Branches 231 Tags
2671627a5d5f12ddcfd54b57504a4e7d2b092cf6
Commit Graph

104 Commits

Author SHA1 Message Date
Santy-Wang
3be28fb3ce Revert "Optimize build time constants implementation (#7882)" (#7927) 
This reverts commit 6f57c3ad8f.
 2020-12-07 13:32:50 +08:00
Leslie Leigh (李的序)
6f57c3ad8f Optimize build time constants implementation (#7882) 2020-12-04 15:06:54 +08:00
Leslie Leigh (李的序)
16cc7569eb Introduce the EXPORT_TO_GLOBAL (#7820) 
* Introduce the `EXPORT_TO_GLOBAL`

* Bump version
 2020-11-19 15:54:33 +08:00
PP
a598a9f0cf support linksure and QTT platform (#7800) 
* fix undefined toDataURL on linksure platform

* update platform

* add platform info
 2020-11-18 20:20:38 +08:00
Yun Hsiao Wu
32598c25cb switch to eslint (#7727) 
* switch to eslint

* eslint: extends airbnb
 2020-11-09 10:19:12 +08:00
Jare Guo
0319477911 fix decorator warning of ValueTypes (#7553) 
* fix decorator warning of ValueTypes (sync #6285)

* refresh copyright
 2020-10-21 16:31:41 +08:00
PP
73be65cd31 support new SubContextView (#7303) 
* support new SubContextView

* update

* add type property when postMessage
 2020-10-08 23:57:03 +08:00
PP
cd03651bc4 remove jsb module declaration in engine repo (#7143) 
* remove jsb module declaration in engine repo

* ignore jsb check

* space
 2020-08-21 18:50:28 +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
Yun Hsiao Wu
afeb83e9a6 native pools (#7028) 2020-08-04 14:14:56 +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 (李的序)
aeced26917 Solve duplicated menu issue (#6973) 2020-08-02 14:53:31 +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
ChiaNing
1c54beb91a sys browser type add (#6939) 
* sys browser type add

* change JSB
 2020-07-06 11:31:46 +08:00
Yun Hsiao Wu
69db70a910 Merge remote-tracking branch 'origin/3d' into 3d 2020-06-03 16:22:00 +08:00
SijieWang
a9f3969245 Merge remote-tracking branch 'cocos-for-editor/3d-v1.1.1' into 3d 
# Conflicts:
#	cocos/audio/assets/clip.ts
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/3d/framework/batched-skinning-model-component.ts
#	cocos/core/3d/framework/editor-camera-component.ts
#	cocos/core/3d/framework/index.ts
#	cocos/core/3d/framework/model-component.ts
#	cocos/core/animation/animation-clip.ts
#	cocos/core/animation/animation-manager.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/animation/skeletal-animation-component.ts
#	cocos/core/animation/skeletal-animation-state.ts
#	cocos/core/assets/mesh.ts
#	cocos/core/assets/simple-texture.ts
#	cocos/core/assets/sprite-frame.ts
#	cocos/core/assets/texture-base.ts
#	cocos/core/data/class-decorator.ts
#	cocos/core/data/instantiate.ts
#	cocos/core/event/event-target.ts
#	cocos/core/game.ts
#	cocos/core/load-pipeline/CCLoader.ts
#	cocos/core/load-pipeline/plist-parser.ts
#	cocos/core/load-pipeline/unpackers.ts
#	cocos/core/load-pipeline/url.ts
#	cocos/core/math/deprecated.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/scene-graph/base-node.ts
#	cocos/core/scene-graph/scene-globals.ts
#	cocos/terrain/terrain.ts
#	predefine.ts
 2020-06-03 13:25:42 +08:00
Yun Hsiao Wu
69c88434a4 Merge branch '3d-gfx' into 3d 2020-06-02 17:59:07 +08:00
Leslie Leigh (李的序)
2c1ef7941f Improve typing (#6751) 2020-05-27 11:03:56 +08:00
Leslie Leigh (李的序)
5e2adea787 Rename internal usages of global variable 'cc' into 'legacyGlobalExpo… (#6680) 
* Rename internal usages of global variable 'cc' into 'legacyGlobalExports'

* Fix CI

* Rename 'legacyGlobalExports' -> 'legacyCC'
 2020-05-14 15:46:45 +08:00
coulsonwang
4f74962048 fix crash issue (#6449) 
* fix crash issue

* update reivew

* simplify code

* fix tsc error
 2020-03-31 15:10:53 +08:00
Yun Hsiao Wu
45d182308b GPU instancing support (#6300) 
* instancing works

* misc opts

* material.setproperty typing

* baked skinning model instancing works

* fix isNormalized

* custom chunk rules injection framework

* profiler instance count

* seperate custom joint textures

* fix joint mapped buffers

* WebGL 1 doesn't allow int attributes

* should rebuild instances after pso change

* set instance attribute

* constants naming
 2020-03-12 10:21:19 +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
SijieWang
dff521ab43 Replace Editor variable (#6189) 
* Replace Editor variable

* Fixed several definition errors
 2020-02-19 15:09:53 +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
ChiaNing
b6985161fa add cocosplay for build (#5959) 2019-12-25 11:11:13 +08:00
Lelie Leight (李的序)
62a3ed7b2b Scripting 2.0-Part 1 (#5781) 
* Scripting 2.0-Part 1

* Bump typescript to 3.7.2

* use event for EditorExtends

* update
 2019-12-11 17:39:47 +08:00
pandamicro
802d7a9b49 Merge branch '3d-v1.0.2' into 3d 
# Conflicts:
#	cocos/core/components/ui-base/canvas-component.ts
#	cocos/core/components/ui-base/ui-render-component.ts
#	cocos/core/game.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/render-flow.ts
#	cocos/core/pipeline/render-pipeline.ts
#	cocos/core/root.ts
#	cocos/core/scene-graph/base-node.ts
 2019-12-03 19:23:26 +08:00
ChiaNing
f3c198171e alipay adapter update (#5824) 
* alipay adapter update

* platform change

* update

* useless remove
 2019-12-03 15:47:23 +08:00
zheng han
c761b408dc add editorExtends for node and component (#5659) 
* add editorExtends for node and component

* remove CC_TEST
 2019-11-01 10:43:18 +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
jiaxin.lai
3fdda0d1c8 Rename built_in to builtin (#5390) 
* rename ***_BUILT_IN to ***_BUILTIN

* add protection, it will be remove when editor repo ***_BUILT_IN rename to ***_BUILTIN
 2019-09-16 10:50:05 +08:00
Yun Hsiao Wu
ea923922ba partial handle & Pass.getUniform (#5356) 
* linter fix

* partial handle & getUniform
 2019-09-10 10:35:02 +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
Yun Hsiao Wu
0d4bf98f61 wx audio global callbacks (#5310) 
* some linter fix

* wx audio global callbacks
 2019-09-02 04:30:08 -05:00
jiaxin.lai
37a10deb8d tween tweaks (#5128) 
* tweaks of tween

* using deprecated framework

* tweak
 2019-08-12 17:36:31 +08:00
jiaxin.lai
0c02eaa69c add latest module && add deprecated framework (#5005) 2019-07-30 10:16:41 +08:00
jiaxin.lai
faa7094cf8 add some typing to interface of INode (#4984) 
* add some typing to interface of INode

* fix INode childern typing

* add Mutable type, for change Readonly type

* decouple node with ui relative component

* add missed ui component, and decouple node

* add more typing to IBaseNode and INode
 2019-07-26 17:56:55 +08:00
Leslie Leigh
505666f210 DO NOT take Constructor from ammo.js.d.ts (#4703) 2019-06-26 10:07:24 +08:00
ChiaNing
408cc6f930 Copyright Notice format change (#4665) 2019-06-21 09:34:05 +08:00
Yun Hsiao Wu
42541abefe missing skining material (#4570) 
* default for miss skinning material

* return super.destroy
 2019-06-06 19:20:18 +08:00
jiaxin.lai
34c8e6650d Physics builtin (#4547) 
* Rename built-in-*** to builtin-***

* Rename r to radius and c to center;

* Add method : transkateAndRotate & setScale to obb & sphere;
Delete unneed class box in box.ts file

* Fix builtin physics Bug of #751 & Modify the physics relative component

* Add macro condition, some method is not declare in builtin

* Rename CC_PHYISCS_*** to CC_PHYSICS_***;

* rename BuiltIn*** to Builtin***

* Typing intersect
 2019-06-05 10:27:09 +08:00
ChiaNing
f775675601 Some core code modify to TS ( scene-graph/... ) (#4497) 2019-05-28 12:47:17 +08:00
ChiaNing
44def350a0 Some core code modify to TS ( core/data/... ) ( bug fixed ) (#4466) 
* Some core code modify to TS ( core/data/... ) ( bug fixed )

* Some core code modify to TS ( Fixed the problem before )

* change for of
 2019-05-28 11:55:05 +08:00
jiaxin.lai
c98f25d53e remove the collider body from world When the collider has shape only (#4470) 
* remove the collider body from world When collider has shape only;
set body group default value to 1;

* Add declare for phyiscs macro
 2019-05-22 14:07:57 +08:00
ChiaNing
acaecd2e26 Revert "Some core code modify to TS ( core/data/... ) (#4455)" 
This reverts commit d7c6046807.
 2019-05-21 10:42:51 +08:00
ChiaNing
d7c6046807 Some core code modify to TS ( core/data/... ) (#4455) 2019-05-20 10:54:26 +08:00
ChiaNing
fbbf5366ac Some core code modify to TS(assets/ & components/) (#4418) 2019-05-14 18:37:08 +08:00
ChiaNing
5e3eea8b56 Some core code modify to TS (#4403) 2019-05-11 22:52:51 +08:00
Leslie Leigh
d259b23355 typing (#4271) 
* typing

* typing

* rm
 2019-04-22 20:06:29 +08:00