livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,102 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

45102 Commits (849e85dfd28cf561d17d6737db1e8463acffd7fa)

Author SHA1 Message Date
Ptolemy 849e85dfd2 SL-17274: Fix diffuse color not being used in pbr shader 2022-05-06 09:44:23 -07:00
Ptolemy 54919fa749 SL-17274: Stub for PBR DrawPool and shader 2022-05-02 10:16:54 -07:00
Dave Houlton 82311e4b44 Merge branch 'DRTVWR-559' into euclid-17277 2022-04-29 17:26:17 -06:00
Dave Houlton f05e58715e SL-17116, SL-17277 single-face material save only 2022-04-29 17:04:22 -06:00
Brad Kittenbrink 0e0c156bd0 Merged in brad/SL-17116-material-messaging (pull request #958) 
brad/SL-17116 material messaging

Approved-by: Euclid Linden
 2022-04-29 18:02:45 +00:00
Dave Parks 93a0259666 SL-17282 prototype mixing of reflection map into legacy materials 2022-04-29 13:51:11 +00:00
Brad Kittenbrink cc04903379 Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging 2022-04-28 14:05:49 -07:00
Brad Kittenbrink c9ef206e39 Beginning viewer side work for SL-17198 new asset and inventory types for Materials 2022-04-28 13:08:37 -07:00
Dave Houlton b08742d0b3 Add a (broken) material upload handler fxn 2022-04-28 11:53:43 -06:00
Dave Parks deffbca3ee SL-17281 environment map prototype (stupid slow and hacky, but provides a way to get a "real" environment map for shader development) 2022-04-28 15:51:31 +00:00
Brad Kittenbrink 3f43553ea0 Test UI for SL-17116. provide a debug interface to set a MaterialID for a face 2022-04-27 14:55:06 -07:00
Brad Kittenbrink c9fbd9e2e8 SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and related messages 2022-04-27 14:48:25 -07:00
Dave Houlton c4625d26e5 Prototype a SaveMaterial button 2022-04-27 12:18:30 -06:00
Brad Kittenbrink a3ffa9f006 Merge remote-tracking branch 'origin/DRTVWR-546' into DRTVWR-559 2022-04-27 10:27:48 -07:00
Dave Parks bafa869c21 SL-17239 Override face bounding box with avatar bounding box for rigged meshes when calculating virtual size. 2022-04-25 15:58:07 -05:00
Dave Parks 55179387c7 SL-17236 For real this time, maintain legacy draw order of alpha rigged meshes, batching be damned. 2022-04-25 15:27:39 -05:00
Andrey Kleshchev ffdc04f5d2 SL-17040 Crash due to LLWord not existing 
LLWord should persist till the end due to wide usage.
 2022-04-21 22:58:30 +03:00
Andrey Kleshchev cf7bc4406e SL-17159 Crash initializing LLInstanceTrackerPrivate 2022-04-21 20:43:50 +03:00
Andrey Kleshchev e0c4304e4a Restored SL-15400, it got lost in an automatic merge 
Pausing clouds should not pause water
 2022-04-19 21:15:58 +03:00
Euclid Linden 030d61ac58 Merged in D559-merge-6.5.5 (pull request #946) 
DRTVWR-559 merge up to 6.5.5
 2022-04-18 22:19:14 +00:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Nat Goodspeed d031662435 Increment viewer version to 6.5.5 
following promotion of DRTVWR-540
 2022-04-18 13:25:21 -04:00
Dave Parks e33f23f58a SL-17194 Impostor quality pass 2 (and fix for fully transparent rigged attachments rendering to depth buffer) 2022-04-11 20:06:33 -05:00
Dave Parks cb6e1ac4a8 Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-04-11 15:52:11 -05:00
Dave Parks 1d057dbba2 SL-17173 Impostor quality pass. 2022-04-11 15:51:51 -05:00
Mnikolenko Productengine d248961c30 SL-17182 FIXED Viewer crashes after changing the environment settings 2022-04-11 17:51:10 +03:00
Andrey Kleshchev e20aafa2fe SL-16907 Crash at updateSkinInfoMatrixPalette #2 2022-04-07 14:17:30 +03:00
Andrey Kleshchev 7e0e58c55f SL-17092 Fix a gesture upload crash 2022-04-07 11:11:39 +03:00
Dave Parks bc7dc2f949 SL-17160 Ignore "getIsAlphaMask" on rigged faces. 2022-04-06 12:57:07 -05:00
Andrey Lihatskiy 1497177868 Merge remote-tracking branch 'origin/SL-16950' into DRTVWR-540-maint 2022-04-05 18:01:45 +03:00
Andrey Kleshchev 84e22d410e SL-17121 Fix error threshold value 2022-04-01 22:32:57 +03:00
Andrey Kleshchev 14e792766e SL-17121 Adjust uploader for possible 0 input. 2022-04-01 01:39:35 +03:00
Andrey Kleshchev 7f0e62ea9e SL-17121 Revert "SL-15940 Remove ability to set zero triangle limit" 
This reverts commit b45c0e3ed9.
 2022-04-01 00:53:52 +03:00
Dave Houlton 3687b29200 SL-17000 modify physics mesh dense/degenerate error msg 2022-03-30 10:31:32 -06:00
Andrey Kleshchev f57240caf7 SL-17096 Login screen fields are gray 2022-03-30 19:07:29 +03:00
Euclid Linden 977bd76316 Merged in euclid-17074 (pull request #925) 
SL-17074 Redo ALT-F4 handling fix
 2022-03-29 17:43:50 +00:00
Dave Houlton e76a3b12e6 SL-17074 fix ALT-F4 handling without impacting alt-zoom 2022-03-29 11:36:28 -06:00
Mnikolenko Productengine d97105663f SL-17091 FIXED Walk/Run/Fly buttons are not clickable 2022-03-29 18:07:06 +03:00
Andrey Kleshchev 283e86eda5 SL-16811 Shape preview images do not display all of the attachments #2 
Merged previewAvatar and generateImpostor into a single function since they are nearly identical
 2022-03-29 15:19:53 +03:00
Nat Goodspeed ae4f64eee7 SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix. 2022-03-28 16:45:22 -04:00
Nat Goodspeed 9e2f571687 SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix. 2022-03-28 16:43:22 -04:00
Euclid Linden a379f754f3 Merged in euclid-17000 (pull request #923) 
SL-17000 improve error message for physics mesh import
 2022-03-28 19:17:48 +00:00
Dave Houlton 8843ea1745 SL-17000 improve error message for physics mesh import 2022-03-28 13:15:19 -06:00
Nat Goodspeed f17f5ff272 SL-13792: Merge 'brad/viewer-manifest-codesign-fix' into sl-17079 2022-03-25 17:28:29 -04:00
Nat Goodspeed 9d7f8156c6 SL-17079: Update to viewer-manager build 569958 2022-03-25 15:53:28 -04:00
Dave Parks ed98d77fe8 Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-03-25 13:06:21 -05:00
Dave Parks 9b2df75c87 SL-17077 Ensure profiling is disabled if gpu_benchmark fails. Log the source of the real crash for when the viewer inevitably crashes later. 2022-03-25 13:05:50 -05:00
Michael Pohoreski c6da3dfd2f Merged in SL-16993 (pull request #910) 
SL-16993

Approved-by: Euclid Linden
 2022-03-25 15:54:49 +00:00
Michael Pohoreski 506bada6eb Merged DRTVWR-546 into SL-16993 2022-03-25 15:54:13 +00:00
Michael Pohoreski 68b732c78a Merged DRTVWR-546 into SL-16993 2022-03-25 15:53:38 +00:00