Commit Graph

17466 Commits

Author SHA1 Message Date
ChiaNing 78add057d7 game resume bug fix (#6925)
* game  resume bug fix

* update
2020-06-24 14:07:06 +08:00
Leslie Leigh (李的序) 4e208bb970 Handle the case of zero delta time on iOS (#6926) 2020-06-24 12:57:58 +08:00
jiaxin.lai 4c9067b394 adapt splash screen time if it is undefined (#6924) 2020-06-24 11:30:17 +08:00
minggo bb6ea9bec3 remove GFX prefix (#2611) 2020-06-24 10:51:14 +08:00
CocosRobot 222decec79 [ci skip][AUTO]: updating jsbinding automatically (#2607) 2020-06-24 10:50:25 +08:00
ChiaNing 7d646b9f90 ASTC support (#6918)
* ASTC support

* update
2020-06-23 18:29:06 +08:00
JoneLau 7fa501ffcb fixed the problem of graphics component scene error when the script is changed (#6922) 2020-06-23 17:19:06 +08:00
pandamicro e9ef6426f6 Animation document (#6921)
* Doc

* Merge branch 'DocAnimation' of https://github.com/shrinktofit/engine into 3d-v1.1.1

# Conflicts:
#	cocos/core/animation/animation-component.ts

# Conflicts:
#	cocos/core/animation/animation-clip.ts
#	cocos/core/animation/animation-component.ts

Co-authored-by: Unknown <leslieleigh@outlook.com>
2020-06-23 14:40:59 +08:00
coulsonwang b2e8653974 fix GFX_DRAW_INFO_SIZE (#6914) 2020-06-23 13:56:06 +08:00
jiaxin.lai 9293903ceb splash screen adapt for alipay&cocos play (#6903)
* fix alipay android splash screen

* adapt for cocos play new version

* do not stash ccSettings

* add cocosplay verision branch

* tweaks

* remove unnecessary frame adapt
2020-06-23 11:53:13 +08:00
pandamicro dbf4519339 Properly deprecate UI related API in Node (#6754)
* Properly deprecate UI related API in Node

* UI transform property access fix

* UI transform property access fix for widget
2020-06-23 11:44:43 +08:00
Yun Hsiao Wu 8e19a4332d fix node.setWorldScale (#6917) 2020-06-22 15:46:56 +08:00
Yun Hsiao Wu c2de06b878 gfx: queue.isAsync (#6906) 2020-06-22 15:15:58 +08:00
Yun Hsiao Wu 8f7b5193d2 vk: fix indirect buffer (#2608) 2020-06-22 15:15:07 +08:00
Yun Hsiao Wu 944ab254fd vk: more polish work (#2606)
* vk: be more specific on texture usage flags

* vk: polish buffer & texture update
2020-06-22 10:32:17 +08:00
CocosRobot 08685f4be3 [ci skip][AUTO]: updating jsbinding automatically (#2602) 2020-06-19 11:54:38 +08:00
Yun Hsiao Wu 055e9eb558 vk: queues are optionally async (#2599) 2020-06-19 11:46:09 +08:00
CocosRobot 830c3de4c2 [AUTO][ci skip]: updating cocos2dx_files.json (#2601) 2020-06-19 11:21:50 +08:00
minggo 7efee066fd Remove duplicate (#2597) 2020-06-19 11:07:21 +08:00
CocosRobot edac81cc04 [AUTO][ci skip]: updating cocos2dx_files.json (#2596) 2020-06-19 09:46:14 +08:00
pandamicro 95813e2a92 API translation for core/pipeline (#6753)
* API translation for core/pipeline

* Complete

* Improve
2020-06-18 23:05:55 +08:00
jiaxin.lai 9629e65a4c fix fixedRotation of ammo (#6904) 2020-06-18 17:39:47 +08:00
CocosRobot 2adb8cfdcf [AUTO][ci skip]: updating cocos2dx_files.json (#2598) 2020-06-18 17:39:43 +08:00
Leslie Leigh (李的序) a46d629a1b Remove npm script build-rollup (#6899) 2020-06-18 16:26:26 +08:00
Yun Hsiao Wu 02c0daf75f vk: fix some leak (#2592) 2020-06-18 16:02:08 +08:00
CocosRobot 9931327a7a [AUTO][ci skip]: updating cocos2dx_files.json (#2594)
* [ci skip][AUTO]: updating jsbinding automatically

* [AUTO][ci skip]: updating cocos2dx_files.json
2020-06-18 14:13:23 +08:00
minggo 4099773cd4 Browserslist (#2464) (#2595)
Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>
2020-06-18 14:12:04 +08:00
CocosRobot 33a2fa36e1 [ci skip][AUTO]: updating jsbinding automatically (#2593) 2020-06-18 13:55:05 +08:00
minggo cf60075203 move some files from renderer/core to cocos/base (#2591) 2020-06-18 13:47:25 +08:00
CocosRobot 54475c6a0e [AUTO][ci skip]: updating cocos2dx_files.json (#2590) 2020-06-18 11:19:20 +08:00
江战 4154c738c7 update to external 20 (#2579) 2020-06-18 09:47:07 +08:00
CocosRobot cc12bf2b6c [AUTO][ci skip]: updating cocos2dx_files.json (#2588) 2020-06-18 09:46:23 +08:00
Yun Hsiao Wu 47e86338f0 viewport gfx adapt (#6894) 2020-06-17 22:38:23 +08:00
ChiaNing 95217395ab RichText font bug fix (#6893)
* RichText font bug fix

* todo add
2020-06-17 22:36:47 +08:00
pandamicro 246da9fafd Merge pull request #6895 from pandamicro/3d
Merge v1.1.1 to 3d
2020-06-17 22:36:10 +08:00
minggo 3b476dfe4b add some classes (#2584) 2020-06-17 18:35:02 +08:00
CocosRobot 8dd9627a9e [ci skip][AUTO]: updating jsbinding automatically (#2587) 2020-06-17 18:21:39 +08:00
minggo 13b7247cb5 refactor stl container declaration (#2586) 2020-06-17 18:10:12 +08:00
jiaxin.lai 15db2ff71e ray-model return distance in world space (#6892)
* optimize & return distance in world space

* tweaks
2020-06-17 17:48:50 +08:00
pandamicro 42e86f133d Fix ci 2020-06-17 17:30:24 +08:00
coulsonwang 30efd26519 add indirect draw (#2566)
* add indirect draw

* add indirect draw on metal

* request multiDrawIndirect feature

* add indirect draw

* add indirect draw on metal

* request multiDrawIndirect feature

* rename

* add debug info

* fix deviceFeatrue
2020-06-17 17:23:54 +08:00
Yun Hsiao Wu ce0ddf834d vk: fix index buffer stride (#2582) 2020-06-17 15:50:17 +08:00
pandamicro 1ff0ea0cb3 Fix legacyCC usage 2020-06-17 15:44:57 +08:00
pandamicro 79482affb9 Fix merge issue 2020-06-17 15:40:20 +08:00
pandamicro b9c698922c Update effects 2020-06-17 15:30:30 +08:00
pandamicro b2830f5271 Merge remote-tracking branch 'origin/3d-v1.1.1' into 3d
# Conflicts:
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/3d/framework/light-component.ts
#	cocos/core/3d/framework/model-component.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/assets/image-asset.ts
#	cocos/core/data/object.ts
#	cocos/core/event/callbacks-invoker.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/gfx/webgl2/webgl2-commands.ts
#	cocos/core/pipeline/define.ts
#	cocos/core/platform/event-manager/events.ts
#	cocos/core/primitive/primitive.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/render-scene.ts
#	cocos/core/root.ts
#	cocos/core/scene-graph/node-event-processor.ts
#	cocos/core/splash-screen-webgl.ts
#	cocos/particle/index.ts
#	cocos/terrain/terrain.ts
#	exports/base.ts
2020-06-17 14:47:36 +08:00
CocosRobot 9627a89b64 [AUTO][ci skip]: updating cocos2dx_files.json (#2581) 2020-06-17 14:34:53 +08:00
Yun Hsiao Wu 9bfac902df vk: fix device init order (#2580) 2020-06-17 14:21:16 +08:00
Leslie Leigh (李的序) 3b31edae67 Fix once bug (#6889) 2020-06-17 12:01:11 +08:00
Yun Hsiao Wu dafb0ef102 misc fixes for vulkan (#6883)
* misc fixes for vulkan

* render window accepts external renderpass
2020-06-17 11:10:44 +08:00