0fe39a1f3f
Correcting windows specific filesystem issues and removing unused DAE code in llgltfloader.cpp from SL-17214
2022-06-23 22:53:55 -07:00
6c678648e0
SL-17653 Last commit was accidentally partial
2022-06-23 16:40:48 -05:00
394479d7cc
SL-17653 WIP - Apply GLTF material in Material Editor to selected object when you click "Save"
2022-06-23 16:21:53 -05:00
03d85bfb33
SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select Invisible Objects" checkbox instead of "Select Reflection Probes"
2022-06-09 19:43:21 -05:00
125b099298
VS2019 build fix
2022-06-09 11:02:21 -05:00
d3219f57c1
SL-17214 remove some dae clutter from gltf header
2022-06-08 13:33:59 -06:00
2dc376aa53
SL-17214 add 3p-tinygltf dependency to autobuild.xml
2022-06-08 13:33:59 -06:00
c9ebb970ee
SL-17214 re-work gltf data organization
2022-06-08 13:33:59 -06:00
adaaccd3d7
SL-17214 additional glTF validation, remove dead code from DAE loader
2022-06-08 13:33:59 -06:00
8c0163bcb4
SL-17214 initial loader class skeleton
2022-06-08 13:33:59 -06:00
a185fae28d
SL-17285 Build fix take two.
2022-06-03 11:36:37 -05:00
220afbcda0
SL-17285 Add proper reflection probe support to LLVOVolume, LLPrimitive, and LLPanelVolume
2022-06-02 18:42:38 -05:00
cc04903379
Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging
2022-04-28 14:05:49 -07:00
c9ef206e39
Beginning viewer side work for SL-17198 new asset and inventory types for Materials
2022-04-28 13:08:37 -07:00
c9fbd9e2e8
SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and related messages
2022-04-27 14:48:25 -07:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# 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-03-01 13:41:42 +02:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
5ccdcf51a3
Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt
2021-11-16 02:22:54 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
f9373a9b4e
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +02:00
3641541c6c
SL-15756 Removed mHasGeneratedFaces
...
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-11-15 23:23:09 +02:00
851767b808
SL-16131 Fix for alignment warnings on Win32 builds.
2021-10-14 17:41:38 +00:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
ca629c362c
SL-15965 Support wider range of parsing errors
2021-09-09 21:17:00 +03:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
1a17932440
DRTVWR-542 Automated method selection
...
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
2021-08-04 21:14:00 +03:00
7235d333ea
DRTVWR-542 Fix incorect dropbox state
2021-08-04 00:15:49 +03:00
2d2ed85c56
DRTVWR-542 Fix malfunctioning warning
2021-07-28 22:19:43 +03:00
3c40a833ef
Merge branch 'master' into DRTVWR-530-maint
2021-06-07 21:05:04 +03:00
1639e1ceb4
Merge branch 'master' into DRTVWR-527-maint
2021-06-07 21:04:54 +03:00
88ac2812b4
Merge branch 'master' into DRTVWR-522-maint
2021-06-07 21:04:46 +03:00
a4595bdaf2
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# doc/contributions.txt
2021-06-07 21:04:32 +03:00
7199ce4514
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.
...
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit 5691d302ef
2021-05-26 10:57:39 -06:00
58b4afa0ba
Merge branch 'master' into DRTVWR-530-maint
2021-04-30 03:05:06 +03:00
0fa5fc47a2
Merge branch 'master' into DRTVWR-527-maint
2021-04-30 03:04:47 +03:00
e00edbeb4a
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
2021-04-30 03:04:06 +03:00
e5a428f362
Merge branch 'master' into DRTVWR-521-maint
2021-04-30 03:00:32 +03:00
250212d614
SL-15183 Crash at LLModel::matchMaterialOrder
2021-04-29 00:11:25 +03:00
d0ac1505a7
SL-15102 Crash at load_face_from_dom_triangles
2021-04-13 00:40:00 +03:00
455db074b0
SL-14960 Add checkbox to turn off collision sound.
2021-04-06 18:24:21 +03:00
b52384d9ef
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# indra/newview/lltoolpie.cpp
2021-04-01 20:49:26 +03:00
e355f47d28
Merge branch 'master' into DRTVWR-521-maint
2021-04-01 20:48:28 +03:00
b0de02aa02
SL-14993 Crash accessing mInvBindMatrix
2021-03-23 20:54:54 +02:00
9fc1b51ae8
SL-14993 Crash accessing mInvBindMatrix
2021-03-23 01:08:38 +02:00
609a26b59a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
...
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
f047e2236c
Merge branch 'master' into DRTVWR-522-maint
2021-02-01 22:14:56 +02:00
185082f1bb
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# indra/newview/llappviewer.cpp
2021-02-01 22:14:44 +02:00
Brad Kittenbrink