Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-06-29 | SL-17685 Drag and drop material support | Dave Parks | |
2022-06-29 | Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵ | Dave Parks | |
DRTVWR-559 | |||
2022-06-29 | SL-17685 Drag and drop material support WIP | Dave Parks | |
2022-06-29 | Merge branch 'master' (DRTVWR-543) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp | |||
2022-06-28 | SL-17379 More complete integration of material asset type | Dave Parks | |
2022-06-23 | Correcting windows specific filesystem issues and removing unused DAE code ↵ | Brad Kittenbrink | |
in llgltfloader.cpp from SL-17214 | |||
2022-06-23 | SL-17653 Last commit was accidentally partial | Dave Parks | |
2022-06-23 | SL-17653 WIP - Apply GLTF material in Material Editor to selected object ↵ | Dave Parks | |
when you click "Save" | |||
2022-06-09 | SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select ↵ | Dave Parks | |
Invisible Objects" checkbox instead of "Select Reflection Probes" | |||
2022-06-09 | VS2019 build fix | Dave Parks | |
2022-06-08 | SL-17214 remove some dae clutter from gltf header | Dave Houlton | |
2022-06-08 | SL-17214 add 3p-tinygltf dependency to autobuild.xml | Dave Houlton | |
2022-06-08 | SL-17214 re-work gltf data organization | Dave Houlton | |
2022-06-08 | SL-17214 additional glTF validation, remove dead code from DAE loader | Dave Houlton | |
2022-06-08 | SL-17214 initial loader class skeleton | Dave Houlton | |
2022-06-03 | SL-17285 Build fix take two. | Dave Parks | |
2022-06-02 | SL-17285 Add proper reflection probe support to LLVOVolume, LLPrimitive, and ↵ | Dave Parks | |
LLPanelVolume | |||
2022-05-27 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp | |||
2022-04-28 | Merge remote-tracking branch 'origin/euclid-17277' into ↵ | Brad Kittenbrink | |
brad/SL-17116-material-messaging | |||
2022-04-28 | Beginning viewer side work for SL-17198 new asset and inventory types for ↵ | Brad Kittenbrink | |
Materials | |||
2022-04-27 | SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and ↵ | Brad Kittenbrink | |
related messages | |||
2022-03-01 | Merge branch 'master' (DRTVWR-557) into DRTVWR-546 | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py | |||
2022-02-28 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
2022-01-10 | Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK | Andrey Lihatskiy | |
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp | |||
2021-11-29 | Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 | Andrey Kleshchev | |
2021-11-20 | SL-16289 Rigged mesh rendering overhaul | Dave Parks | |
2021-11-19 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp | |||
2021-11-16 | DRTVWR-546 merge in master v6.5.1 | Dave Houlton | |
2021-11-16 | Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt | Andrey Kleshchev | |
2021-11-16 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-11-16 | Merge branch 'master' into DRTVWR-527-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp | |||
2021-11-15 | SL-15756 Removed mHasGeneratedFaces | Andrey Kleshchev | |
mHasGeneratedFaces is always true for some types of models and glod was treating faces as one mesh by default, so meshoptimizer should do the same regardles of mHasGeneratedFaces | |||
2021-10-14 | SL-16131 Fix for alignment warnings on Win32 builds. | Dave Parks | |
2021-09-20 | SL-16006 and SL-16009 Rigged mesh rendering optimization pass | Dave Parks | |
2021-09-09 | SL-15965 Support wider range of parsing errors | Andrey Kleshchev | |
2021-09-08 | SL-14541 Replace zlib with zlib-ng | Andrey Kleshchev | |
2021-09-03 | Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp | |||
2021-08-04 | DRTVWR-542 Automated method selection | Andrey Kleshchev | |
Normally simplification methods apply for whole upload, but this one selects methods per model or per face. | |||
2021-08-04 | DRTVWR-542 Fix incorect dropbox state | Andrey Kleshchev | |
2021-07-28 | DRTVWR-542 Fix malfunctioning warning | Andrey Kleshchev | |
2021-06-07 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
2021-06-07 | Merge branch 'master' into DRTVWR-527-maint | Andrey Lihatskiy | |
2021-06-07 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-06-07 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-05-26 | SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha ↵ | Dave Houlton | |
masks. Revert "SL-12069 Issues with bakes-on-mesh and alpha modes" This reverts commit 5691d302ef876a7e6fb6861441f14e5e7f0c7735. | |||
2021-04-30 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
2021-04-30 | Merge branch 'master' into DRTVWR-527-maint | Andrey Lihatskiy | |
2021-04-30 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-04-30 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-04-29 | SL-15183 Crash at LLModel::matchMaterialOrder | Andrey Kleshchev | |