AndreyL ProductEngine
|
2abd0eef41
|
Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
|
2016-12-05 21:51:29 +02:00 |
|
andreykproductengine
|
b6e7708d60
|
MAINT-6912 Specifying physics mesh was resetting previous model name
|
2016-11-10 12:51:06 +02:00 |
|
Mnikolenko Productengine
|
68267b611c
|
MAINT-6875 Viewer crashes after double clicking on Upload>Mesh
|
2016-10-28 11:30:48 +03:00 |
|
Mnikolenko Productengine
|
5d1f6223eb
|
MAINT-6835 Material of model is not a subset of reference, cause upload model dialog to stick with error
|
2016-10-20 16:15:36 +03:00 |
|
Mnikolenko Productengine
|
fceaa9ddf1
|
MAINT-6817 crash when uploading a mesh if Include skin weights checkbox is clicked before preview appears.
|
2016-10-18 11:09:13 +03:00 |
|
Brad Payne (Vir Linden)
|
6c46b3caf2
|
SL-395 - can enable/disable scale lock in mesh upload UI. Feature works.
|
2016-09-06 16:32:41 -04:00 |
|
Brad Payne (Vir Linden)
|
a2875ba53e
|
merge
|
2016-09-02 14:34:06 -04:00 |
|
Brad Payne (Vir Linden)
|
d23bb7e056
|
MAINT-6647 - make SLM behavior still available if MeshImportUseSLM is true; still defaults to false.
|
2016-08-19 09:47:26 -04:00 |
|
Brad Payne (Vir Linden)
|
1e6d9ba4be
|
MAINT-6647 - make SLM files even more dead.
|
2016-08-18 11:31:16 -04:00 |
|
Brad Payne (Vir Linden)
|
72d5ff36f5
|
MAINT-6647 - ignore previously created slm files on model upload. SL-442 - change coloring for show bones, to highlight joint positions and rigging
|
2016-08-17 16:31:28 -04:00 |
|
Brad Payne (Vir Linden)
|
3a53109152
|
SL-395 - support scale overrides (currently no way to get these into a dae, so the actual scale values are fabricated at run-time based on the joint name)
|
2016-06-07 10:39:32 -04:00 |
|
Brad Payne (Vir Linden)
|
f47ceb47bb
|
merged jelly-doll viewer-release into bento
|
2016-05-21 08:15:28 -04:00 |
|
Brad Payne (Vir Linden)
|
2d8b53854e
|
merge
|
2016-05-06 11:00:47 -04:00 |
|
Oz Linden
|
950c41d184
|
merge 4.0.4-release and MAINT-5974
|
2016-05-06 10:28:42 -04:00 |
|
Brad Payne (Vir Linden)
|
ec471497f5
|
SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh import. dae_tool.py work to enable joint offset tweaking.
|
2016-04-29 11:25:17 -04:00 |
|
Brad Payne (Vir Linden)
|
b138ca8aee
|
SL-366 - more cases where skinned weights can go awry, and a bunch more asserts to verify.
|
2016-04-06 16:12:39 -04:00 |
|
Ansariel
|
298fa0828e
|
Remove code duplication caused by merge with 4.0.3
|
2016-04-05 11:25:01 +02:00 |
|
Oz Linden
|
9be58e915a
|
merge with 4.0.3-release
|
2016-04-04 15:53:09 -04:00 |
|
Brad Payne (Vir Linden)
|
caf4f49437
|
merge
|
2016-04-01 08:35:38 -04:00 |
|
AndreyL ProductEngine
|
eb413ec41e
|
Merged in lindenlab/viewer-release
|
2016-04-01 03:56:20 +03:00 |
|
Brad Payne (Vir Linden)
|
2afde26d93
|
merge
|
2016-03-21 11:00:22 -04:00 |
|
Rider Linden
|
b8c1976460
|
Merge
|
2016-03-17 13:14:21 -07:00 |
|
andreykproductengine
|
ef73114ede
|
MAINT-6227 FIXED Crash on mesh upload
|
2016-03-17 15:55:27 +02:00 |
|
Oz Linden
|
31f3db0291
|
merge changes for DRTVWR-417
|
2016-03-16 13:08:06 -04:00 |
|
Oz Linden
|
5822fb00b6
|
merge DRTVWR-398 build cleanup fixes
|
2016-03-07 12:41:11 -05:00 |
|
andreykproductengine
|
2d41b4fe30
|
MAINT-6160 Fix for ImporterLegacyMatching crash
|
2016-02-23 18:30:29 +02:00 |
|
AndreyL ProductEngine
|
8920beabc4
|
MAINT-5678 Improvement: ImporterPreprocessDAE debug setting to disable DAE preprocessing when needed
|
2016-02-17 03:01:04 +02:00 |
|
Oz Linden
|
bc22e58743
|
merge changes for 4.0.1-release
|
2016-01-15 16:55:04 -05:00 |
|
Brad Payne (Vir Linden)
|
3612d7d14b
|
merge
|
2016-01-15 16:42:39 -05:00 |
|
Rider Linden
|
e7eaa94dfa
|
Merge VR
|
2016-01-15 13:36:38 -08:00 |
|
Brad Payne (Vir Linden)
|
c964633a35
|
SL-271 WIP - skip rendering bones with no end (set as 0 length). Show bones if show joints is enabled in mesh upload preview.
|
2015-11-23 14:52:07 -05:00 |
|
andreykproductengine
|
97f85329e4
|
MAINT-5064 FIXED Mesh upload attempt causes viewer to freeze
|
2015-11-19 17:31:21 +02:00 |
|
Aura Linden
|
99219cbe80
|
Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml.
|
2015-11-13 04:12:13 -08:00 |
|
Aura Linden
|
146919fa76
|
animations and meshes will recognize all joint names in joint_aliases.xml
|
2015-11-11 13:44:51 -08:00 |
|
Oz Linden
|
9848fc4253
|
merge changes for 4.0.1-release
|
2016-01-15 17:01:16 -05:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Brad Payne (Vir Linden)
|
be11d020ca
|
SL-266 WIP - removed obsolete rigParityWithScene code, set legacy and joint offset upload based on AND-ing state of all meshes in file.
|
2015-11-09 14:57:00 -05:00 |
|
Brad Payne (Vir Linden)
|
1a7b2d3d38
|
SL-114 WIP - show skin weights checkbox can get out of sync with corresponding view option.
|
2015-11-04 09:33:43 -05:00 |
|
Brad Payne (Vir Linden)
|
3607d71740
|
MAINT-5807 WIP - show skin weights checkbox also not properly initialized.
|
2015-11-04 08:50:19 -05:00 |
|
Brad Payne (Vir Linden)
|
ded9b10d5d
|
SL-114 WIP - constrain uploaded meshes based on max joints per mesh. Set max joints per mesh to 110. Also fixed some uninitialized members of LLModelLoader.
|
2015-10-29 16:09:22 -04:00 |
|
Aura Linden
|
07496b015b
|
Pulled merge from bento prime.
|
2015-10-27 15:33:21 -07:00 |
|
Aura Linden
|
97374a5362
|
Fixes SL-202 joint offset and skin weight import. Race condition still exists.
|
2015-10-27 15:15:34 -07:00 |
|
Oz Linden
|
31abaa8f1a
|
correct merge error spotted by Ansariel
|
2015-10-27 11:14:33 -04:00 |
|
Brad Payne (Vir Linden)
|
d365aa10f1
|
SL-234 WIP - moved LLSkinningUtil funcs to separate class/files. Remap weights where needed. Warn that related debug settings require restart to take effect.
|
2015-10-21 16:47:03 -04:00 |
|
AndreyL ProductEngine
|
03f07b3ecc
|
Merge downstream code, version 3.8.6
|
2015-10-15 23:01:12 +03:00 |
|
Rider Linden
|
53b947e039
|
Merge from viewer release.
|
2015-10-19 12:03:08 -07:00 |
|
Brad Payne (Vir Linden)
|
a16a6034c2
|
merge
|
2015-10-12 16:24:05 -04:00 |
|
Brad Payne (Vir Linden)
|
74b8a48764
|
SL-234 WIP - adjust max mesh object joints at run-time, including rebuilding shaders
|
2015-10-07 15:38:40 -04:00 |
|
Brad Payne (Vir Linden)
|
ebad0c6868
|
DRTVWR-412 WIP - more work for importer merge from viewer-release
|
2015-10-01 11:05:29 -04:00 |
|
andreykproductengine
|
4d536f8955
|
Merge from viewer release
|
2015-09-30 22:47:14 +03:00 |