Commit Graph

17466 Commits

Author SHA1 Message Date
coulsonwang 97b4b3b808 fix incorrect indirect buffer stride (#6604) 2020-04-24 18:25:13 +08:00
Leslie Leigh (李的序) cdf18b197b Fix typing on AnimationComponent.on (#6603) 2020-04-24 18:21:34 +08:00
jiaxin.lai 40f545faa8 update @cocos/cannon to 1.1.0(fix collison event) (#6612) 2020-04-24 17:44:38 +08:00
minggo 2082c30ea4 fix crash if enter background on Android (#2401)
* fix crash if enter background on Android

* break if recreate window error
2020-04-24 16:56:35 +08:00
pandamicro 4a22408c21 Merge pull request #6610 from cocos-creator/3d-v1.1
Merge v1.1 to 3d
2020-04-24 12:48:08 +08:00
pandamicro 288d494e6d Merge pull request #6609 from cocos-creator/3d
Merge terrain and lightmap fixes to v1.1.1
2020-04-24 12:47:16 +08:00
coulsonwang 3166eef09d add indirect info (#2399)
* add indirect info

* add normalized MTLVertexFormat

* fix indirects

* fix vertex format
2020-04-23 17:53:57 +08:00
Myway a4bddb5ab1 Forbid terrain property animation (#6595)
* 修复插值计算的错误

* 修复weightmap再rebuild后出的错误

* 禁止地形属性动画
2020-04-22 18:50:40 +08:00
jiaxin.lai 90015565a0 fix some system ID (#6592)
* fix some system ID

* docs
2020-04-21 19:13:57 +08:00
JoneLau f0e9f95bcf fixed page position err when scrolling (#6591) 2020-04-21 19:12:34 +08:00
jiaxin.lai 349c5100be adapt canvas size for alipay (#6590) 2020-04-21 18:32:30 +08:00
Yun Hsiao Wu 48f9321cf6 better camera doc (#6588) 2020-04-21 16:12:17 +08:00
Yun Hsiao Wu a7716a507a disable instancing on UC (#6587) 2020-04-21 12:09:13 +08:00
ChiaNing f20e308025 Accelerometer event fix for Ios 13+ (#6585) 2020-04-21 11:32:58 +08:00
jiaxin.lai 44844fdb94 fix get body of rigid body (#6578)
* fix get body of rigid body

* make event optional in trigger&collision callback

* fix apply local force/impulse of ammo
2020-04-20 18:42:54 +08:00
Leslie Leigh (李的序) 381ad78e95 Process that when cross fade to a state having already cross faded but stopped (#6579) 2020-04-20 18:35:08 +08:00
ChiaNing e1ffa75bd1 accelerometer bug fix for vivo (#6580) 2020-04-20 18:32:47 +08:00
CocosRobot fc206fb09b [ci skip][AUTO]: updating jsbinding automatically (#2387) 2020-04-20 17:27:08 +08:00
minggo b02ef0bac1 add minClipZ and projectionSignY for device (#2379) 2020-04-20 16:58:57 +08:00
coulsonwang 1e63144a48 support instancing (#2382)
* support instancing

* fix stride

* emplace_back when need
2020-04-20 11:29:58 +08:00
Myway f5a884f836 Fix weightmap and data interpolation issue (#6570)
* 修复插值计算的错误

* 修复weightmap再rebuild后出的错误
2020-04-18 00:03:53 +08:00
ChiaNing 6a30d99f8e Acceleration bug fix (#6568) 2020-04-16 22:41:46 +08:00
ChiaNing 96a53470f1 acceleration export (#6567) 2020-04-16 20:03:08 +08:00
Leslie Leigh (李的序) 68a6cbe090 Fix cross fade bug (#6564)
* Fix cross fade bug

* Update
2020-04-16 19:46:36 +08:00
jiaxin.lai 86fd5b59d6 fix replace property (#6566) 2020-04-16 16:39:54 +08:00
pandamicro 276a7f200a Partial API translation for core and related tweaks (#6534)
* Event api translation

* Event manager API translation

* Macro cleanup and API doc improve

* Code cleanup and API translation in core/platform,

* Use macro.ENABLE_WEBGL_ANTIALIAS for initialization

* tweak

* Improve singleton ref in view

* Fix ci

* Export sys without default
2020-04-16 11:38:24 +08:00
zheng han 12e1e20fb3 1. emit node removed event after component removed event (#6557) 2020-04-15 21:39:58 +08:00
cary 0802dd38d0 Modify the size module of GPU particles to be discrete. (#6535)
* Modify the size module of GPU particles to be discrete.

* add multipler

* fix editor error

* commit effect.ts
2020-04-15 21:32:33 +08:00
CocosRobot 9187f0bad8 [ci skip][AUTO]: updating jsbinding automatically (#2381) 2020-04-15 18:27:07 +08:00
coulsonwang 51a87d3254 revert attribute caching for jsb optimization (#2380)
* revert attribute caching for jsb optimization

* update binding generator
2020-04-15 18:17:23 +08:00
ChiaNing 8c41b79aec label baseline add (#6526)
* label baseline add

* baseline change in runtime
2020-04-15 17:55:11 +08:00
jiaxin.lai 0fe353c517 enable retina & resize for splash screen (#6547)
* enable retina & resize for splash screen

* using user settings if exist
2020-04-15 17:44:40 +08:00
JoneLau 61a5a07051 fixed a bug where clicking to change color did not work (#6558)
Fixed bug where you could click to directly modify the “_val” property of color and skip detection of UI rendering data changes
2020-04-15 17:43:46 +08:00
King Wang 3ceb44b347 Mask isHit issue when type===GRAPHICS_STENCIL (#6548) 2020-04-15 17:42:23 +08:00
cary 217989fd33 Fix multi touch disable is invalid when touch event on SystemEvent. (#6551) 2020-04-15 17:41:55 +08:00
jiaxin.lai 547a6b55d9 fix sampler of splash screen (#6550)
* fix sampler of splash screen

* using user settings if exist
2020-04-15 17:06:58 +08:00
Yun Hsiao Wu fe46a6c973 should trigger camera matrix update onEnable (#6561) 2020-04-15 17:02:47 +08:00
coulsonwang f4b4301977 fix texture and sampler binding (#2377) 2020-04-15 13:47:41 +08:00
coulsonwang 385a97ac6e convert RGB32F to MTLPixelFormatRGBA32Float (#2373)
* convert RGB32F to MTLPixelFormatRGBA32Float

* move format comvertor to utils
2020-04-15 10:00:49 +08:00
Arnold 9eb02818a5 add metal support (#2375) 2020-04-15 09:42:58 +08:00
minggo da59100a21 Metal command buffer improve (#2376)
* set depth bias

* support setting blend constants

* support setting depth bounds

* add some error log
2020-04-14 18:43:02 +08:00
coulsonwang 5b12ecc9db fix incorrectly update PSO (#2370) 2020-04-14 18:34:47 +08:00
Yun Hsiao Wu a0a82368eb update builtin effect (#6552) 2020-04-14 17:02:03 +08:00
minggo 2d90a8c16c check correct pointer address to avoid crash (#2372) 2020-04-14 15:41:34 +08:00
CocosRobot b982cf315b [AUTO][ci skip]: updating cocos2dx_files.json (#2369) 2020-04-14 14:48:58 +08:00
Arnold 79fc8353d1 3dgfx add CI & cmake (#2350)
* use-cmake

* revert: enable gles3 for android

* compile with cmake only
2020-04-14 13:58:45 +08:00
Yun Hsiao Wu 3bedccdeaa fix skinning model type when not enabled immediately (#6542)
* fix skinning model type update

* unbatch util

* camera property display order

* fix model type order
2020-04-14 12:47:58 +08:00
minggo d185c5e713 make vertex buffer attributes layout the same as corresponding shader (#6539) 2020-04-13 21:28:43 +08:00
Yun Hsiao Wu 338738430d projection matrix gfx adaptations (#6540)
* fix batched buffer resize

* projection matrix gfx adaptations
2020-04-13 21:26:34 +08:00
ChiaNing ec34f5970b multi touch bug fix (#6541) 2020-04-13 21:24:58 +08:00