Commit Graph

34485 Commits (fcf2f235b763a4e1e2814685c3086da3933eac74)

Author SHA1 Message Date
Brad Payne (Vir Linden) fcf2f235b7 SL-263 FIX - fallback code to prevent crash, won't be invoked unless there's a bug somewhere upstream. 2015-11-09 14:58:26 -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) 3cf938bcec SL-124 WIP - BENTO comments and related cleanup 2015-11-04 16:41:37 -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) 5601e4c4a1 SL-124 WIP - notes for pre-release cleanup. 2015-11-02 15:31:38 -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
Brad Payne (Vir Linden) cb64c3d3c3 merge 2015-10-26 17:24:03 -04:00
Oz Linden 84150294b9 increment viewer version to 3.8.7 2015-10-26 17:06:20 -04:00
Oz Linden 63cf1b477f Added tag 3.8.6-release for changeset 5a5bd148943b 2015-10-26 17:06:20 -04:00
Glenn Glazer 40cc8e863e SL-113: merge up to bento trunk 2015-10-26 12:59:05 -07:00
Glenn Glazer 3b702b6616 SL-113: use product approved message string 2015-10-26 11:05:58 -07:00
Brad Payne (Vir Linden) c828378235 SL-234 WIP - fix for enforcement of MaxJointsPerMeshObject limit 2015-10-22 11:23:36 -04:00
Brad Payne (Vir Linden) 8970e9c6cb SL-234 WIP - TC build fixes 2015-10-21 19:20:28 -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
Glenn Glazer cb0031880d SL-113: viewer message from simulator on illegal attachment point 2015-10-20 09:22:47 -07:00
Brad Payne (Vir Linden) bfa3f83a2c merge 2015-10-19 16:34:13 -04:00
Brad Payne (Vir Linden) 6c6a95478e SL-234 WIP - remap skin weights to match included-joint logic 2015-10-19 16:32:49 -04:00
Brad Payne (Vir Linden) 58992e2cb4 SL-234 WIP - Track which joints are part of base skeleton, remap non-base ones when not being rendered. 2015-10-16 15:05:29 -04:00
Aura Linden 2f6166a5a4 Pulled merge from llinternal/bento-box. 2015-10-13 16:44:20 -07:00
Aura Linden 8729f5d23a Bandaid for SL-202 Skin weights with joint offsets. 2015-10-13 16:40:39 -07:00
pavelkproductengine 3732e0b4d2 merge changes for MAINT-4734 2015-10-13 20:20:09 +03:00
Mnikolenko ProductEngine 4ec4bf3711 MAINT-5730 FIXED Text overlapping in group invites with non-default group role 2015-10-13 14:53:07 +03:00
Brad Payne (Vir Linden) a16a6034c2 merge 2015-10-12 16:24:05 -04:00
Oz Linden 4312629e7c increment viewer version to 3.8.6 2015-10-12 15:09:50 -04:00
Oz Linden 888bc68067 Added tag 3.8.5-release for changeset e821ef17c6ed 2015-10-12 15:09:50 -04:00
pavelkproductengine c9c17b3c3c Merge 2015-10-09 18:18:59 +03:00
pavelkproductengine af9971e43a Merge Xcode 7 Update 2015-10-09 18:14:37 +03:00
Aura Linden b082ed28e8 Pulled merge from Vir's Bento. 2015-10-08 15:18:48 -07:00
Mnikolenko ProductEngine bbedc51d1d MAINT-5708 FIXED Images shouldn't be displayed in notification titles 2015-10-08 17:06:04 +03:00
Brad Payne (Vir Linden) 5b58bfb937 SL-234 WIP - mac build fix 2015-10-07 18:50:33 -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
Glenn Glazer eebafb37db SL-225: test with joints per mesh set to 132 2015-10-06 14:58:32 -07:00
Glenn Glazer 389a0a8e39 SL-225: test with joints per mesh set to 112 2015-10-06 12:51:36 -07:00
Glenn Glazer 3cc99a66e4 SL-225: test with joints per mesh set to 92 2015-10-06 07:20:56 -07:00
Mnikolenko ProductEngine e13d8087ea MAINT-5694 FIXED Links on the 1st line of a group notice message are sometimes not clickable. 2015-10-06 16:11:42 +03:00
Glenn Glazer 34e48fb2f2 SL-225: test with joints per mesh set to 72 2015-10-05 15:11:06 -07:00
Aura Linden d038ed07f0 Pulled fix for animation logging. 2015-10-02 16:09:49 -07:00
Brad Payne (Vir Linden) 4588616d0d SL-233 FIX - removed some surplus log files. 2015-10-02 09:04:04 -04:00
Aura Linden 40316f8431 Pulled merge to use xcode 7. 2015-10-01 09:35:58 -07:00
Aura Linden a4fef135b1 Fixed mac assert problem on RelWithDebInfo for uploading models. 2015-10-01 09:32:06 -07:00
Brad Payne (Vir Linden) 6c422a8814 merge 2015-10-01 11:20:48 -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
Brad Payne (Vir Linden) fc74e02cde merge 2015-09-30 11:00:48 -04:00
AndreyL ProductEngine 358b29060f Merge downstream code, version 3.8.5 2015-09-30 01:25:49 +03:00
AndreyL ProductEngine f64a10ca8f Merge downstream code, version 3.8.5 2015-09-30 01:21:04 +03:00
Oz Linden 2d52b62e67 increment viewer version to 3.8.5 2015-09-29 15:18:47 -04:00
Oz Linden 5c01e7afa8 Added tag 3.8.4-release for changeset 27e3cf444c4c 2015-09-29 15:18:46 -04:00
Oz Linden 883d44388b Mark MaxFPS as an unused setting 2015-09-29 11:12:17 -04:00