Commit Graph

7744 Commits

Author SHA1 Message Date
jerrywwl 57068a5c8a Merge branch '3d-stable' of https://github.com/cocos-creator/engine into 3d-stable 2019-03-20 16:18:29 +08:00
jerrywwl ed3deb124a commit files 2019-03-20 16:15:41 +08:00
Leslie Leigh 255ba0601b fix skinning model material bug (#4067) 2019-03-20 15:15:48 +08:00
Yun Hsiao Wu fdafb1e52a samplers can be specified in effect too (#4066) 2019-03-20 11:14:17 +08:00
jerrywwl bcede42719 resolve conflicts 2019-03-20 11:09:14 +08:00
jerrywwl 101621a4ee add support for smaa 2019-03-20 11:02:43 +08:00
Leslie Leigh 05ec70ad5e typing (#4062)
* typing

* remove old engine-3d stuffs

* typing
2019-03-20 10:42:13 +08:00
Yun Hsiao Wu 052982739b fix program-lib cache (#4065) 2019-03-20 01:47:03 +08:00
Yun Hsiao Wu c479fbd6ef fix program id (#4064) 2019-03-19 17:42:19 +08:00
Yun Hsiao Wu bdb71795e8 directional planar shadow (#4063) 2019-03-19 13:26:36 +08:00
jerrywwl 6bba2528d6 fix display 2019-03-19 11:45:05 +08:00
jerrywwl 18aa82cd7d add duo framebuffer structure 2019-03-19 10:49:09 +08:00
Yun Hsiao Wu 59f7cc1594 material: custom pipeline states (#4059) 2019-03-18 16:46:28 +08:00
JoneLau 9fa515b5bc change the material of the render component to built-in (#4058) 2019-03-18 16:21:19 +08:00
Leslie Leigh e5c94a04a8 fix bug (#4055) 2019-03-18 16:20:33 +08:00
jerrywwl bd16c01f37 Merge branch '3d-stable' of https://github.com/cocos-creator/engine into 3d-stable 2019-03-18 16:09:53 +08:00
jerrywwl a7030214be optimize color temperature calculation 2019-03-18 16:09:33 +08:00
SijieWang 3ebb694a6e Prevents an onLoaded error from causing a callback not to be executed (#4056) 2019-03-18 15:01:44 +08:00
jerrywwl 5b6b1fc621 fix spot light rendering 2019-03-18 14:56:05 +08:00
jerrywwl b56946c198 Merge branch '3d-stable' of https://github.com/cocos-creator/engine into 3d-stable 2019-03-18 09:52:10 +08:00
jerrywwl 5376b003ec speed up texture loading 2019-03-18 09:50:10 +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
Yun Hsiao Wu 86185af02c keepWorldTransform when setParent (#4052) 2019-03-15 16:29:32 +08:00
jerrywwl d9f72b3532 fix texture wrap addressing error on non-power-of-2 texture 2019-03-15 16:26:40 +08:00
Yun Hsiao Wu f882a4198e fix sampler & node (#4048) 2019-03-15 15:17:46 +08:00
jerrywwl 7eae8d11b5 fix crash on safari 2019-03-14 20:13:30 +08:00
JoneLau 932cada8e6 fix sprite-atlas serialized (#4044) 2019-03-14 19:45:04 +08:00
zxg0622 c170469c07 adjust particle property order (#4043) 2019-03-14 19:44:37 +08:00
jerrywwl dc7c0a91b6 fix rendering error 2019-03-14 19:21:34 +08:00
jerrywwl 71e2a1d6ca merge branch 3d 2019-03-14 16:03:02 +08:00
Yun Hsiao Wu 5f5db237ec sampler from texture (#4037) 2019-03-14 15:27:38 +08:00
Leslie Leigh d871e57e44 add extra dest file (#4035)
* add extra dest file

* delete old .d.ts
2019-03-14 12:42:43 +08:00
Weiliang Wang 8bb80df732 3d (#4036)
* compiler error (#4033)

* compiler error

* add gen decl module

* fix global event and other bug (#4032)

* components such as event-target to ts

* divide CCEvent and CCTouch into game coordinates and ui coordinate mod

* repair editor environment where mask does not take effect bug

* fix render component blendState modification does not take effect bug

* fix bug

* fix ts tip
2019-03-14 12:03:04 +08:00
JoneLau 6c52969826 fix global event and other bug (#4032)
* components such as event-target to ts

* divide CCEvent and CCTouch into game coordinates and ui coordinate mod

* repair editor environment where mask does not take effect bug

* fix render component blendState modification does not take effect bug

* fix bug

* fix ts tip
2019-03-14 11:36:43 +08:00
Leslie Leigh 03aae4f1de compiler error (#4033)
* compiler error

* add gen decl module
2019-03-14 11:36:18 +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
zxg0622 efdbc65240 fix tsc error (#4026) 2019-03-13 18:24:57 +08:00
Leslie Leigh a2416ba312 normalize the RaycastResult; allow rigidbody to sleep to prevent shake (#4028) 2019-03-13 18:21:15 +08:00
jerrywwl 462cd87382 compatible with safari 2019-03-13 18:02:38 +08:00
Yun Hsiao Wu acb9a6e788 fix program name (#4027) 2019-03-13 17:27:30 +08:00
zxg0622 b3ae1e7767 fix bug (#4023)
* fix scene switch of editor camera

* optimize
2019-03-13 11:11:24 +08:00
jerrywwl 7759fae8fd destroy view on calling camera destroy() 2019-03-12 18:43:09 +08:00
jerrywwl 588377cb11 add camera name 2019-03-12 17:18:01 +08:00
jerrywwl 9e630b1bec Merge branch '3d' of https://github.com/cocos-creator/engine into 3d 2019-03-12 16:28:04 +08:00
jerrywwl 4ba0e4a490 add support for render target to view 2019-03-12 16:27:40 +08:00
Yun Hsiao Wu 3625f7ec21 string defines (#4012) 2019-03-12 15:53:04 +08:00
zxg0622 0f41522b1b fix persist node not diplay issue (#4010) 2019-03-12 15:18:43 +08:00
jerrywwl 24608778c1 fix conflicts 2019-03-12 09:58:04 +08:00
Leslie Leigh 4e062977bc tslint (#4006)
* tslint

* fix node decl errors

* fix decl error
2019-03-11 23:52:17 +08:00
jerrywwl 7b806d34dc Merge branch '3d' of https://github.com/cocos-creator/engine into 3d 2019-03-11 23:48:53 +08:00