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
jerrywwl
6f7e20c534
limit max lighting light num to 2
2019-03-11 23:48:08 +08:00
Leslie Leigh
aa273526f6
fix commit ( #4004 )
2019-03-11 18:13:56 +08:00
jerrywwl
7b6715f2e4
Merge branch '3d' of https://github.com/cocos-creator/engine into 3d
2019-03-11 17:55:45 +08:00
jerrywwl
2fcd10978c
add color temperature to light
2019-03-11 17:55:27 +08:00
zxg0622
62c264443a
fix some issue ( #4002 )
...
* add light sort
* fix recreate model bug
2019-03-11 17:46:32 +08:00
Leslie Leigh
dcfb485d69
fix ammo-impl bugs ( #3997 )
2019-03-11 17:32:16 +08:00
Yun Hsiao Wu
c5670977b7
minor ( #3996 )
2019-03-11 15:46:02 +08:00
jerrywwl
1a99ae1cd4
fix conflicts
2019-03-11 14:30:50 +08:00
jerrywwl
0712a626cd
fix light size
2019-03-11 14:20:42 +08:00
Yun Hsiao Wu
23b56fa7c7
seperate builtin info ( #3993 )
2019-03-11 13:40:31 +08:00
Yun Hsiao Wu
9a08fae9d1
update IB & restore uniforms ( #3991 )
...
* revoke ubo name
* update IB
* restore uniform names
2019-03-09 00:49:13 +08:00
zxg0622
a24abf7b9d
modify to local lights ( #3988 )
...
* local bindings
* local bindings
* modify to local lights
2019-03-08 19:04:22 +08:00
JoneLau
9d3ef2367c
fix click invalid ( #3987 )
2019-03-08 18:59:54 +08:00
jerrywwl
c2ac9cf6a0
use standard material instead of unlit
2019-03-08 17:05:42 +08:00
jerrywwl
b08b92f8db
Merge branch '3d' of https://github.com/cocos-creator/engine into 3d
2019-03-08 17:04:00 +08:00
JoneLau
bad9356cc0
test Editor Component Events ( #3986 )
2019-03-08 17:03:33 +08:00
jerrywwl
10e6c62172
Merge branch '3d' of https://github.com/cocos-creator/engine into 3d
2019-03-08 17:02:56 +08:00
jerrywwl
dfe2fd338c
add support for vao to gfx
2019-03-08 17:02:36 +08:00
Leslie Leigh
b7869b595d
restructure physics ( #3985 )
2019-03-08 11:30:14 +08:00
JoneLau
504990d19f
verify meshBuffer Stability ( #3982 )
2019-03-07 23:40:33 +08:00
jerrywwl
6c1a125011
fix frag color error in LDR pipeline
2019-03-07 19:37:44 +08:00
Yun Hsiao Wu
06d6fb2696
light components ( #3981 )
2019-03-07 17:08:55 +08:00
Leslie Leigh
e03c1c8586
Support non-printable key ( #3980 )
2019-03-07 17:08:18 +08:00
jerrywwl
abb58ed3d9
fix clear color
2019-03-07 16:51:17 +08:00
Leslie Leigh
1c967ed52f
modify CCNodePool, change rigidbodycomponent implement ( #3979 )
2019-03-07 15:19:57 +08:00