Ptolemy
|
82232de0d2
|
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
|
2022-06-30 12:50:49 -07:00 |
|
Ptolemy
|
38b6f10717
|
SL-17682: Fix diffuse, and emissive being in sRGB which also fixes fresnelR
|
2022-06-30 12:50:22 -07:00 |
|
Andrey Kleshchev
|
68dfa1f550
|
SL-17640 Use LLAgentBenefitsMgr for upload cost
|
2022-06-30 21:03:21 +03:00 |
|
Mnikolenko Productengine
|
8488d86009
|
SL-17668 Add operation "show in inventory" on in-world avatar attachment
|
2022-06-30 13:22:19 +03:00 |
|
Dave Parks
|
2880cd011f
|
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
|
2022-06-29 21:43:37 -05:00 |
|
Dave Parks
|
99179c232f
|
SL-17685 Add missing files
|
2022-06-29 21:43:24 -05:00 |
|
Dave Parks
|
6f6df8ed71
|
SL-17685 Drag and drop material support
|
2022-06-29 21:42:44 -05:00 |
|
Ptolemy
|
9432edaba7
|
SL-17274: PBR: Add spec weight debugging
|
2022-06-29 17:51:19 -07:00 |
|
Ptolemy
|
76caf9fe0e
|
SL-17274: PBR: Group diffuse debugging
|
2022-06-29 17:50:45 -07:00 |
|
Ptolemy
|
d1e078a122
|
SL-17274: PBR: Fix EMS being zero when using GGX approximation
|
2022-06-29 17:50:03 -07:00 |
|
Ptolemy
|
251b75ea2e
|
SL-17274: PBR: Add c_diff and fix kDiffuse
|
2022-06-29 17:49:10 -07:00 |
|
Dave Parks
|
56ae3e0a08
|
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
|
2022-06-29 18:00:26 -05:00 |
|
Dave Parks
|
fd6b5ea8c3
|
SL-17685 Drag and drop material support WIP
|
2022-06-29 17:59:09 -05:00 |
|
Ptolemy
|
36fd0f7ca9
|
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
|
2022-06-29 14:00:50 -07:00 |
|
Ptolemy
|
78e3edba6e
|
SL-17274: Cleanup order of diffuse debug flags
|
2022-06-29 14:00:17 -07:00 |
|
Ptolemy
|
d9ce24309d
|
SL-17274: Add reflection dir debugging
|
2022-06-29 13:55:26 -07:00 |
|
Ptolemy
|
714667847e
|
SL-17274: Fix typo
|
2022-06-29 13:24:21 -07:00 |
|
Andrey Kleshchev
|
069304ca39
|
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
|
2022-06-29 21:23:23 +03:00 |
|
Andrey Lihatskiy
|
a7c9ca8960
|
Merge branch 'master' into DRTVWR-561-maint-O
|
2022-06-29 20:32:13 +03:00 |
|
Andrey Lihatskiy
|
77ce594dec
|
Merge branch 'master' into DRTVWR-544-maint
|
2022-06-29 20:31:17 +03:00 |
|
Dave Parks
|
f6515257a0
|
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
|
2022-06-29 11:56:56 -05:00 |
|
Dave Parks
|
84bbe45fb5
|
SL-17602 WIP - Texture uploads form material editor now work but the names are garbage and the resulting material asset has the wrong UUIDs
|
2022-06-29 11:56:40 -05:00 |
|
Ptolemy
|
7515353d8e
|
SL-17274: Simplify occlusion and make not about future occlusion_strength
|
2022-06-29 09:02:50 -07:00 |
|
Ptolemy
|
2ec7a9af82
|
SL-17274: Fix typo in reference to SL-14035
|
2022-06-29 08:43:33 -07:00 |
|
Andrey Kleshchev
|
1b369c7f10
|
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
# Conflicts:
# indra/newview/llviewertexturelist.cpp
|
2022-06-29 18:30:05 +03:00 |
|
Nat Goodspeed
|
1e4f2ec07e
|
Increment viewer version to 6.6.2
following promotion of DRTVWR-543
|
2022-06-29 11:01:34 -04:00 |
|
Dave Parks
|
5cfc336ba2
|
Fix for 2-bit errors in writing to and reading from norm.w
|
2022-06-28 18:46:48 -05:00 |
|
Ptolemy
|
7e901e5596
|
SL-17274: PBR: Cleanup alignment
|
2022-06-28 16:09:33 -07:00 |
|
Ptolemy
|
4257bf7bc8
|
SL-17274 PBR: Cleanup: Alphabetize and categorize debugging flags
|
2022-06-28 16:07:24 -07:00 |
|
Ptolemy
|
d42d0d9bc0
|
SL-17274: PBR: Cleanup: Put primary channels Diffuse,Emissive,Metal,Occlusion,Roughness first
|
2022-06-28 15:59:51 -07:00 |
|
Ptolemy
|
93dfd81730
|
SL-17274: PBR: Fix reflection
|
2022-06-28 15:43:12 -07:00 |
|
Ptolemy
|
9f75a535ad
|
SL-17274: PBR: Add Emissive
|
2022-06-28 14:05:16 -07:00 |
|
Dave Parks
|
254bbc86e5
|
Add emissiveRect to softenLightF.glsl
|
2022-06-28 15:39:04 -05:00 |
|
Dave Parks
|
423b6c72e9
|
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
|
2022-06-28 15:16:15 -05:00 |
|
Dave Parks
|
57805cac68
|
SL-17379 More complete integration of material asset type
|
2022-06-28 15:15:57 -05:00 |
|
Ptolemy
|
7fdb05d7ef
|
SL-17274: PBR: Add occlusion
|
2022-06-28 11:11:40 -07:00 |
|
Ptolemy
|
c90fb9b14c
|
SL-17274: PBR: Add kSpec debugging
|
2022-06-28 10:45:55 -07:00 |
|
Ptolemy
|
c55634a046
|
SL-17274: PBR: Cleanup dot() vertex2camera
|
2022-06-28 10:45:08 -07:00 |
|
Ptolemy
|
626ef903b2
|
SL-17274: PBR: Add kDiffuse debugging
|
2022-06-28 10:43:50 -07:00 |
|
Ptolemy
|
ea48b19423
|
SL-17274: PBR: Remove manual debug
|
2022-06-28 10:42:14 -07:00 |
|
Ptolemy
|
39092990b7
|
SL-17274: PBR: Add reflect0 debugging
|
2022-06-28 10:39:48 -07:00 |
|
Ptolemy
|
4de6e88085
|
SL-17274: PBR: Add reflection vec
|
2022-06-28 10:37:33 -07:00 |
|
Ptolemy
|
c69d7bab99
|
SL-17274: PBR: Move amblit to before PBR shading
|
2022-06-28 10:34:32 -07:00 |
|
Ptolemy
|
00e5a54670
|
SL-17274: PBR: Cleanup: Only calc reflectance if debugging
|
2022-06-28 10:33:39 -07:00 |
|
Ptolemy
|
5462ac5d3b
|
SL-17274: PBR: Fix IOR
|
2022-06-27 16:45:06 -07:00 |
|
Ptolemy
|
780bed6c2b
|
SL-17274: Cleanup position
|
2022-06-27 16:39:14 -07:00 |
|
Ptolemy
|
46c817d851
|
SL-17274: PBR: Fix v, dotTV, dotBV
|
2022-06-27 15:07:40 -07:00 |
|
Ptolemy
|
402cbefc8f
|
SL-17274: Cleanup incorrect emissive comment
|
2022-06-27 15:01:13 -07:00 |
|
Ptolemy
|
3bc1c69caa
|
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
|
2022-06-27 14:59:54 -07:00 |
|
Ptolemy
|
7ac0923e33
|
SL-17274: Document which shader encodesNormal includes
|
2022-06-27 14:09:44 -07:00 |