Commit Graph

17466 Commits

Author SHA1 Message Date
troublemaker52025 60245af9bd shadow sync to c++ (#2942) 2020-10-30 16:18:36 +08:00
minggo 68360aefc9 iOS metal (#2932) 2020-10-30 16:15:47 +08:00
yinkaile a39badcfea add angle property for 2d (#7515)
* add angle property

* add angle api doc
2020-10-30 15:20:11 +08:00
cary fb7f42af8c Fix circular references to particle files. (#7633)
* Fix circular references to particle files.

* commit define
2020-10-30 15:10:37 +08:00
江战 d46f8bd1cd override cmake options (#2962) 2020-10-30 13:57:57 +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
pandamicro 0e1a5b9f10 Make ENABLE_WEBGL_ANTIALIAS as true by default (#7632) 2020-10-30 11:05:41 +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
Leslie Leigh (李的序) 1cc61ca0b0 Promisify game.init and game.run (#7612)
* Promisify `game.init` and `game.run`

* Export some debugging API

* Update

* Update

* Fix

* Rename
2020-10-30 10:25:34 +08:00
yeshao2069 a5ca4b9eb6 update default scrollview prefab (#7621) 2020-10-29 22:31:20 +08:00
Knox b402c3ebbc update video player and web view event type (#7631) 2020-10-29 19:53:09 +08:00
Yun Hsiao Wu 76c5a91e58 vk: should wait for color output finish before transfering (#2961) 2020-10-29 19:49:38 +08:00
Jare Guo 3cb569154b Merge pull request #7629 from cocos-creator/runtime-deserializer
Runtime deserializer
2020-10-29 16:05:26 +08:00
Jare Guo 64e435badd Merge remote-tracking branch 'gitlab/3d'
# Conflicts:
#	package-lock.json
2020-10-29 15:36:36 +08:00
Jare Guo 60782d9a5e bump package-lock.json 2020-10-29 15:31:16 +08:00
Jare Guo cd1cf7faa3 Merge pull request #7469 from jareguo/3d-v1.2
New deserializer
2020-10-29 15:30:12 +08:00
Leslie Leigh (李的序) d5e35a1823 Bump gift^2.0.9; Bump ts^4.0.5 (#7628) 2020-10-29 15:26:09 +08:00
CocosRobot 736315a344 [ci skip][AUTO]: updating jsbinding automatically (#2959) 2020-10-29 14:14:43 +08:00
Yun Hsiao Wu f82ddea5bc pipeline adaptations for pre-rotation (#2958) 2020-10-29 13:46:09 +08:00
Yun Hsiao Wu c60a6ed251 pre-rotation adaptation: dynamics (#7625)
handle runtime orientation chanegs too
2020-10-29 13:45:16 +08:00
ChiaNing 9caad4d37a pass overridePipelineStates change (#7617) 2020-10-29 13:40:11 +08:00
minggo e4eadc714a add some functions (#2954)
These functions are used for performance
2020-10-29 13:39:59 +08:00
pandamicro 436e667f19 Fix scene auto release asset crash (#7619) 2020-10-29 10:52:29 +08:00
吴智明 8715eb61e0 3d gfx change copy command (#2956)
* update copy command

Signed-off-by: wuzhiming <wuzhiming.chukong@gmail.com>

* update copy command for cmake

Signed-off-by: wuzhiming <wuzhiming.chukong@gmail.com>
2020-10-29 09:36:28 +08:00
Jare Guo d0db3bfd65 minor tweak 2020-10-28 23:51:55 +08:00
Jare Guo df5fc6c9a1 fix merge error 2020-10-28 23:51:55 +08:00
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
coulsonwang 663aa1bf52 fix native memory pool (#7615) 2020-10-28 18:24:23 +08:00
coulsonwang 78a39e014a fix viewport (#2955) 2020-10-28 18:24:17 +08:00
Leslie Leigh (李的序) 5c3e8883b5 @cocos/build-engine@4.0.0-jsb.alpha.12: Fix wrong SUPPORT_JIT constant (#7616) 2020-10-28 17:29:19 +08:00
pandamicro 02dbf00bb4 Fix wrong SUPPORT_JIT check (#7614) 2020-10-28 17:12:58 +08:00
Knox 37fec6341f sync 2d (Update the url links) (#7613) 2020-10-28 17:06:27 +08:00
吴智明 4299090cd5 change android resources copy path (#2953)
Signed-off-by: wuzhiming <wuzhiming.chukong@gmail.com>
2020-10-28 14:23:00 +08:00
jiaxin.lai 3c17cb9e1e refactor collision matrix (#7538)
* refactor collision matrix

* add deprecated

* tweaks
2020-10-28 14:15:20 +08:00
JoneLau 351b6480e4 add image stencil in mask (#7598)
* add image stencil in mask

* update
2020-10-28 12:13:53 +08:00
cary eaa0da71cc Synchronize some changes of 2d engine. (#7608) 2020-10-28 12:08:24 +08:00
Yun Hsiao Wu a318283a41 fix pre-rotation adaptation (#7607) 2020-10-28 10:28:21 +08:00
Yun Hsiao Wu e62ae5170b fix pipeline include typo (#2950)
whew that's one good way to mess it up
2020-10-28 09:54:01 +08:00
CocosRobot c58b3d1a0d [AUTO][ci skip]: updating cocos2dx_files.json (#2951) 2020-10-27 18:49:23 +08:00
Leslie Leigh (李的序) f99240f664 @cocos/build-engine: add option to remove deprecated features (#7603) 2020-10-27 18:28:58 +08:00
Leslie Leigh (李的序) 903e79b90f Docs/contribution/modules (#7605)
* Docs/contribution/modules

* Typo
2020-10-27 18:28:34 +08:00
jiaxin.lai 4cc4808072 correct the name of physics material (#7597)
* correct the name of PhysicsMaterial

* tweaks
2020-10-27 18:25:57 +08:00
coulsonwang f7013bcac7 disable triple buffering for metal (#2949) 2020-10-27 18:06:40 +08:00
coulsonwang e16cf58516 update external (#2948) 2020-10-27 17:57:29 +08:00
cary f8ef74ee4c Synchronize parameter changes of commit comp. (#7604) 2020-10-27 15:59:20 +08:00
coulsonwang 1bab55cd39 fix crash (#2947) 2020-10-27 14:47:25 +08:00
cary 6bcc7933a9 Add motion streak and particle 2d. (#7588)
* Add motion streak and particle 2d.

* fix buffer error

* modify comment error

* fix ci

* fix comment

* modify some comment
2020-10-27 11:48:17 +08:00
coulsonwang f51b754dab reject pass phase for native (#7602) 2020-10-27 11:39:59 +08:00
Leslie Leigh (李的序) 9b4afb2983 @cocos/build-engine now accepts the loose option (#7601) 2020-10-27 11:10:30 +08:00
pandamicro 983b994e43 Merge 2.x commits (#7600) 2020-10-27 09:13:33 +08:00