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

46515 Commits (0451d51f4da9780e2f650b67672a29b3d07cb386)

Author SHA1 Message Date
Dave Parks 0451d51f4d SL-18459 WIP -- fix for assert in setGLTFMaterial 2022-10-27 11:27:21 -05:00
Dave Parks eb4581edf2 SL-18454 Fix for HUDs with alpha mask using wrong shader. 2022-10-27 10:34:54 -05:00
Dave Parks 0e02f25604 SL-18472 Fix for assert when increasing number of texture entries on existing primitive with overrides applied. 2022-10-26 23:51:13 -05:00
Dave Parks babdb7c209 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-26 23:03:10 -05:00
Dave Parks a6da630207 SL-18469 Fix for material edits only applying to one face. 2022-10-26 23:02:49 -05:00
Andrey Kleshchev 0c0b66388f SL-18465 Crash opening Material Editor 2022-10-27 01:46:31 +03:00
Dave Parks 65eec2ca8f Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-26 17:22:50 -05:00
Dave Parks 8f47657d64 SL-18443 Allow nulling out of override data and implement new override message protocol. 2022-10-26 16:08:28 -05:00
Sabrina Shanman 800044fb33 Merged in SL-17005_cosmic_win8 (pull request #1106) 
SL-17005: Clean up debug code
 2022-10-26 20:16:55 +00:00
Andrey Kleshchev 5ee774f4ec SL-18446 Support "multiple textures" in Live material overrides 2022-10-26 22:40:30 +03:00
Brad Kittenbrink 1dad0f8eb8 Merge remote-tracking branch 'origin/master' into DRTVWR-559 2022-10-26 11:45:38 -07:00
Nat Goodspeed a022452ff5 Increment viewer version to 6.6.7 
following promotion of DRTVWR-574
 2022-10-26 14:35:44 -04:00
Andrey Kleshchev d69c814db9 SL-18446 Terse-update selection set from live material editor #1 2022-10-26 20:55:49 +03:00
Andrey Kleshchev 631b7de4b2 SL-18444 Either connection should be create in onOpen or disconnect happen in destructor 2022-10-26 15:03:55 +03:00
Andrey Kleshchev 89625f9247 SL-18444 Live Material Editor updating with selection 2022-10-26 00:41:59 +03:00
Brad Kittenbrink ca53f265b4 Bump Teamcity for new Project Viewer build of DRTVWR-559 2022-10-25 14:28:35 -07:00
Brad Kittenbrink caed8871ab Xcode build fixes for DRTVWR-559 2022-10-25 10:50:26 -07:00
Andrey Kleshchev 687a012a69 SL-18008 Add "Save/Edit Materials" buttons to attachment's right click menu 2022-10-25 19:56:17 +03:00
Dave Parks ed1e5214ce Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-24 16:27:05 -05:00
Dave Parks 5c86ec6a61 SL-18105 Add mechanism for applying overrides that were received before associated ViewerObject was ready to receive them. 2022-10-24 16:26:42 -05:00
Andrey Kleshchev 4a1397c621 SL-18414 Smarter material editor's cancel for overrides 2022-10-24 23:35:28 +03:00
Andrey Lihatskiy 439aa79414 SL-18432 Fix for alpha sorting 2022-10-24 22:14:20 +03:00
Andrey Kleshchev 4b37414dc0 Re-merged llvovolume.cpp 
Too many issue were detected after merge, so did a clean remerge of the file.
 2022-10-24 19:49:36 +03:00
Andrey Kleshchev 620d2f4ee5 SL-17532 Fix some changes vanishing over merge to D559 2022-10-24 18:08:43 +03:00
Dave Parks 554bc6f6b3 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-24 09:19:47 -05:00
Andrey Kleshchev 683bfcfdee SL-17021 Fix some changes vanishing over merge to D559 #2 2022-10-24 17:18:52 +03:00
Andrey Kleshchev 5b5d24a747 SL-17021 Fix some changes vanishing over merge to D559 2022-10-24 16:27:38 +03:00
Dave Parks 88659e9fe7 SL-18105 When saving an object's material to inventory, save the version that as overrides applied. 2022-10-22 15:25:03 -05:00
Dave Parks 7135934e50 SL-18105 Fix for crash when attempting to "Edit PBR Material" when there's no PBR material 2022-10-22 11:01:35 -05:00
Dave Parks 0cd7c38421 SL-18105 Hook up live material editor to current selection set and implicitly open build floater when editing a PBR material. 2022-10-21 18:05:19 -05:00
Dave Parks 61967623ba SL-18105 Clean up class1/deferred/materialF.glsl (merge cleanup), make override messaging LLSD where it ought to be and JSON where it ought to be. 2022-10-21 16:34:14 -05:00
Andrey Kleshchev 24fb2f8336 Merge branch 'master' (DRTVWR-548) into DRTVWR-559 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
 2022-10-21 18:19:27 +03:00
Dave Parks fd751f4e99 SL-18105 Add remaining parameters to applyOverride 2022-10-20 17:45:03 -05:00
Dave Parks 581e40269c Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-20 13:56:16 -05:00
Dave Parks 40695bbd31 SL-18105 Fix for overrides not showing until a forced mesh update. 2022-10-20 13:55:42 -05:00
Nat Goodspeed e45b615966 Increment viewer version to 6.6.6 
following promotion of DRTVWR-548
 2022-10-20 14:39:27 -04:00
Sabrina Shanman 2727eb207c Merged in SL-18411 (pull request #1166) 
SL-18411: Copy over LLGLTFMaterial changes (most notably various getters/setters and texture transform stub)

Approved-by: Dave Parks
 2022-10-20 18:38:22 +00:00
Cosmic Linden 7231e0b3dd SL-18411: Copy over LLGLTFMaterial changes (most notably various getters/setters and texture transform stub) 2022-10-20 11:33:25 -07:00
Andrey Kleshchev d1b21bb970 SL-18391 Fix local gltf materials to retain a copy of material 2022-10-20 19:06:14 +03:00
Brad Kittenbrink 8ead80e6e5 Xcode compat fix for SL-18105 material overrides 2022-10-19 15:32:18 -07:00
Dave Parks 8741c05cc1 SL-18105 Hook up TE override material to render pipe by way of render material. 2022-10-19 17:23:54 -05:00
Dave Parks de4c018499 SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and add LLViewerFetchedTextures to LLFetchedGLTFMaterial. Lower reflection probe resolution to 128x128 per side. 2022-10-19 14:41:17 -05:00
Brad Kittenbrink d0c2c862ef SL-18105 viewer side for handling Material Override LargeGenericMessage 
LLGLTFMaterialList now decodes gltf json overrides from the server
and stores them in LLTextureEntry::mGLTFMaterialOverrides
 2022-10-19 09:18:24 -07:00
Brad Kittenbrink f575c13930 Better fix for mac/xcode compatibility problem in SL-18391. Keep using unordered_map 2022-10-18 21:01:38 -07:00
Brad Kittenbrink 9e5c0877c5 include the right header now that uuid_mat_map_t is std::map for SL-18391 2022-10-18 16:53:25 -07:00
Brad Kittenbrink b9b8fa1f5f Fix ror mac build error in SL-18391 lifetime management 2022-10-18 16:46:43 -07:00
Andrey Kleshchev 5847218069 SL-18391 Basic GLTF lifetime management 2022-10-19 01:01:03 +03:00
Andrey Kleshchev 0b177c27a0 SL-18008 Mac build fix 2022-10-18 22:08:27 +03:00
Andrey Kleshchev 7be33594ea SL-18008 Updated Save and Edit PBR buttons 2022-10-18 20:13:08 +03:00
Brad Kittenbrink f20c47a596 More work on SL-17697 LLMaterialEditor now uses new override diffing code when applyToSelection() gets called 2022-10-17 16:51:45 -07:00