jerrywwl
|
d81ff6fba6
|
commit files
|
2019-02-11 14:18:43 +08:00 |
|
jerrywwl
|
11060fd0eb
|
Merge branch '3d' of https://github.com/cocos-creator/engine into 3d
|
2019-02-11 12:34:07 +08:00 |
|
jerrywwl
|
c43cd95317
|
optimize gfx code
|
2019-02-11 12:33:53 +08:00 |
|
Weiliang Wang
|
190abd3a8d
|
Merge pull request #3828 from YunHsiao/3d
upload texture mipmap & new material init procedure
|
2019-02-01 00:01:19 +08:00 |
|
Yun Hsiao Wu
|
7842ba562d
|
upload texture mipmap & new material init procedure
|
2019-01-31 18:31:50 +08:00 |
|
Weiliang Wang
|
7ab20d0d4d
|
Merge pull request #3827 from JoneLau/new-3d
fix child nodes are not rendered bug
|
2019-01-31 18:15:40 +08:00 |
|
Jone
|
9e6a7075e5
|
fix child nodes are not rendered bug
|
2019-01-31 18:12:03 +08:00 |
|
Weiliang Wang
|
3a42453704
|
Merge pull request #3824 from JoneLau/new-3d
reduction hack
|
2019-01-31 09:31:51 +08:00 |
|
Jone
|
d9cf86d0d8
|
reduction hack
|
2019-01-31 09:29:43 +08:00 |
|
Weiliang Wang
|
6951f8224d
|
Merge pull request #3823 from JoneLau/new-3d
fixing camera display errors bug and hack components
|
2019-01-31 09:27:57 +08:00 |
|
Jone
|
cf7ba5887b
|
fixing camera display errors bug and hack components
|
2019-01-31 04:11:07 +08:00 |
|
Weiliang Wang
|
6db02bae25
|
Merge pull request #3822 from JoneLau/new-3d
repair ui batch bug
|
2019-01-31 02:48:01 +08:00 |
|
Jone
|
2bd30d7ad9
|
repair ui batch bug
|
2019-01-31 02:37:01 +08:00 |
|
Weiliang Wang
|
3cece29bc7
|
Merge pull request #3821 from JoneLau/new-3d
fix bugs of ui render
|
2019-01-31 01:31:39 +08:00 |
|
Jone
|
4428e9404e
|
fix bugs of ui render
|
2019-01-31 01:06:15 +08:00 |
|
Weiliang Wang
|
538c22a196
|
Merge pull request #3819 from YunHsiao/3d
declare variables outside switch-cases
|
2019-01-30 23:06:20 +08:00 |
|
Weiliang Wang
|
c42631b47f
|
Merge pull request #3816 from shrinktofit/fix-anim-bug
support skinning model's texture
|
2019-01-30 23:05:30 +08:00 |
|
Yun Hsiao Wu
|
d5e07e1447
|
declare variables outside switch-cases
|
2019-01-30 23:03:39 +08:00 |
|
Weiliang Wang
|
4b3b194616
|
Merge pull request #3818 from zxg0622/3d
fix particle error
|
2019-01-30 18:07:07 +08:00 |
|
zhuxuguang
|
d493eaa87d
|
fix particle error
|
2019-01-30 18:04:21 +08:00 |
|
jerrywwl
|
a9da85bcc5
|
fix sample default address mode error
|
2019-01-30 16:13:52 +08:00 |
|
jerrywwl
|
ba33302d71
|
Merge branch '3d' of https://github.com/cocos-creator/engine into 3d
|
2019-01-30 15:57:23 +08:00 |
|
Weiliang Wang
|
8ad922c28d
|
Merge pull request #3817 from YunHsiao/3d
texture setGenMipmap
|
2019-01-30 15:55:38 +08:00 |
|
Yun Hsiao Wu
|
3238b24b5a
|
texture setGenMipmap
|
2019-01-30 15:53:31 +08:00 |
|
Leslie
|
891458aeab
|
support skinning model's texture
|
2019-01-30 15:46:42 +08:00 |
|
Weiliang Wang
|
4c33ac6074
|
Merge pull request #3815 from JoneLau/new-3d
fix bug and u_sampler to mainTexture
|
2019-01-30 15:29:07 +08:00 |
|
Jone
|
1b5b606e49
|
fix bug and u_sampler to mainTexture
|
2019-01-30 15:27:40 +08:00 |
|
jerrywwl
|
07b99e9da8
|
Merge branch '3d' of https://github.com/cocos-creator/engine into 3d
|
2019-01-30 15:24:45 +08:00 |
|
jerrywwl
|
d15311d018
|
set flip-y state to false
|
2019-01-30 15:24:06 +08:00 |
|
Weiliang Wang
|
40b93d45d7
|
Merge pull request #3812 from shrinktofit/fix-anim-bug
adapt model-component
|
2019-01-30 14:02:12 +08:00 |
|
Weiliang Wang
|
7122feea1c
|
Merge pull request #3814 from zxg0622/3d
fix particle error
|
2019-01-30 14:01:57 +08:00 |
|
zhuxuguang
|
22311356f2
|
fix particle error
|
2019-01-30 13:57:56 +08:00 |
|
Weiliang Wang
|
0fd6db4bae
|
Merge pull request #3813 from YunHsiao/3d
sync effects
|
2019-01-30 13:34:49 +08:00 |
|
Yun Hsiao Wu
|
6feac8e766
|
sync effects
|
2019-01-30 13:21:23 +08:00 |
|
jerrywwl
|
f288967caf
|
Merge branch '3d' of https://github.com/cocos-creator/engine into 3d
|
2019-01-30 12:22:04 +08:00 |
|
jerrywwl
|
16b15e6aa6
|
fix first index offset of ui batch
|
2019-01-30 12:20:54 +08:00 |
|
Leslie
|
3fa7a48acb
|
adapt model-component
|
2019-01-30 12:01:16 +08:00 |
|
Weiliang Wang
|
ff4181be31
|
Merge pull request #3811 from YunHsiao/3d
skybox
|
2019-01-30 11:48:25 +08:00 |
|
Yun Hsiao Wu
|
2f54f65a2f
|
skybox
|
2019-01-30 11:44:09 +08:00 |
|
jerrywwl
|
86f2f3d099
|
Merge branch '3d' of https://github.com/cocos-creator/engine into 3d
|
2019-01-30 11:43:12 +08:00 |
|
jerrywwl
|
005282b6f5
|
fix ui batch errors
|
2019-01-30 11:41:58 +08:00 |
|
Weiliang Wang
|
24e728cbf6
|
Merge pull request #3810 from shrinktofit/fix-anim-bug
fix tex bugs
|
2019-01-30 11:33:00 +08:00 |
|
Leslie
|
6dc4fd7133
|
fix tex bugs
|
2019-01-30 11:28:33 +08:00 |
|
Weiliang Wang
|
e33483bbc8
|
Merge pull request #3808 from YunHsiao/3d
fix cc.screen
|
2019-01-30 10:38:21 +08:00 |
|
Weiliang Wang
|
f3d4b9043b
|
Merge pull request #3809 from shrinktofit/fix-anim-bug
fix serialize bug
|
2019-01-30 10:37:42 +08:00 |
|
Yun Hsiao Wu
|
9b193a8904
|
fix cc.screen
|
2019-01-30 10:35:41 +08:00 |
|
jerrywwl
|
0e8e8fd1f7
|
fix error
|
2019-01-30 10:35:29 +08:00 |
|
Leslie
|
212bbd9668
|
fix serialize bug
|
2019-01-30 10:32:30 +08:00 |
|
jerrywwl
|
1474c2da2d
|
optimize texture parameter cache
|
2019-01-29 23:42:04 +08:00 |
|
jerrywwl
|
358161b42b
|
fix cube texture loading error
|
2019-01-29 23:18:55 +08:00 |
|