Commit Graph

136 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel 6f1c696c2a Merge bento-box 2016-10-26 19:45:02 +02:00
Ansariel 40c06f4836 Merge Firestorm LGPL 2016-10-22 20:30:54 +02:00
Brad Payne (Vir Linden) a2fd408c9b MAINT-6853 - fix for viewer crash when checking preview skin weights 2016-10-21 09:50:13 -04:00
andreykproductengine 4ab80645c6 MAINT-6901 Fixes upload assigning different scale to parts of the model 2016-11-15 20:16:01 +02: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
Ansariel 2cd7b679db Merge Firestorm LGPL 2016-10-01 16:24:43 +02:00
Ansariel ef3b8ad594 Merge bento-box 2016-09-28 14:45:26 +02:00
Nicky 44ab8b8f4b Merge with firestorm-lgpl. 2016-09-17 19:35:49 +02:00
Nicky 24308dc929 The sheer amount of calls into LLVOAvatar::getJoint get very costly in complex scenes. This is due to a string being used as index. Change the index to U32 for faster access. 2016-09-16 21:46:39 +02:00
Ansariel e18d32ee13 Merge viewer-bear 2016-09-12 20:58:57 +02:00
Brad Payne (Vir Linden) 34ced1aa2c SL-395 - partial support for joint scale locking via flag in skin info 2016-09-02 16:44:57 -04:00
andreykproductengine c4e9fe9fe5 MAINT-6636 Mesh upload was failing from a folder with a diacritic character in the name 2016-08-25 15:40:33 +03:00
Ansariel 304b9726de Merge Firestorm LGPL 2016-08-15 16:42:36 +02:00
Brad Payne (Vir Linden) 57da9bcd1b merge from viewer-release 2016-08-15 09:52:06 -04:00
Ansariel 0054c93c3f Merge Firestorm LGPL 2016-08-11 00:17:47 +02:00
Ansariel 1e521a042c Merge Firestorm LGPL 2016-08-10 21:25:45 +02:00
Ansariel 7976aaa668 Merge Firestorm LGPL 2016-08-10 20:40:20 +02:00
Ansariel a42cb70200 FIRE-19806: Mesh upload from a folder with Unicode characters in the name fails 2016-08-09 12:11:45 +02:00
Mnikolenko Productengine 30c420d288 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
Ansariel 88b928e1dd Merge bento-box 2016-06-16 00:53:56 +02:00
Brad Payne (Vir Linden) d2302886bc MAINT-6380, SL-399 - vertical flicker related to joint offsets for mPelvis. Having a joint offset for mPelvis is still a bad idea, but it won't cause as much flickering now. 2016-06-15 15:24:54 -04:00
Ansariel b2fcb3fdc5 Merge viewer-bear 2016-05-18 20:37:40 +02:00
andreykproductengine 5048402da8 MAINT-5786 FIXED Redundant sibling index suffix on uploaded mesh object names. 2016-05-12 17:46:20 +03:00
Ansariel 5404f6382e Merge bento-box 2016-04-23 12:01:35 +02:00
Brad Payne (Vir Linden) 0447fe5a57 SL-371 - increased the limit for StackWalker strings, avoid crashing if mesh has wrong number of mAlternateBindMatrix matrices 2016-04-20 13:18:56 -04:00
Brad Payne (Vir Linden) b092147a0b SL-372 - handle dae models with multiple skeleton roots 2016-04-19 11:48:06 -04:00
Ansariel 03369ddba1 Merge bento-box 2016-04-02 01:48:09 +02:00
Ansariel f45a4e38e5 Merge Firestorm LGPL 2016-04-02 00:43:29 +02:00
Nicky e71f62e0b9 Merge. 2016-04-01 18:37:30 +02:00
Ansariel c13eec6cfe Merge Firestorm LGPL 2016-03-21 20:48:39 +01:00
Brad Payne (Vir Linden) 2afde26d93 merge 2016-03-21 11:00:22 -04:00
Ansariel 72da98408a Merge Firestorm LGPL 2016-02-24 23:39:19 +01:00
Ansariel 4519783ced Correct / restore Drake's mesh importer fix 2016-02-19 11:07:11 +01:00
Ansariel a0fa2e5762 Merge viewer-bear 2016-02-19 10:30:02 +01:00
AndreyL ProductEngine 8920beabc4 MAINT-5678 Improvement: ImporterPreprocessDAE debug setting to disable DAE preprocessing when needed 2016-02-17 03:01:04 +02:00
AndreyL ProductEngine 72685fe1cb MAINT-6132 Fixed error on uploading models with texture 2016-02-17 02:40:58 +02:00
Ansariel e7ade840e4 Merge viewer-bear 2016-01-24 14:00:30 +01:00
Ansariel 15378fd3f8 Merge Firestorm LGPL 2016-01-16 03:56:53 +01:00
Brad Payne (Vir Linden) 3612d7d14b merge 2016-01-15 16:42:39 -05:00
Ansariel be6ce75a96 Merge bento-box 2015-12-17 11:47:42 +01:00
andreykproductengine cb23a99610 MAINT-5956 FIXED Certain dae will not upload with the new importer code 2015-12-10 19:28:26 +02:00
andreykproductengine 18f4ad27b6 MAINT-5956 FIXED Certain dae will not upload with the new importer code 2015-12-10 19:28:26 +02:00
AndreyL ProductEngine 97dbd3768a MAINT-5678 [Importer] Buildfix for Linux and OSX 2015-12-11 20:17:59 +02:00
AndreyL ProductEngine dca797c3db MAINT-5678 [Importer] materials with spaces in name import with truncated names 2015-12-08 02:52:15 +02:00
AndreyL ProductEngine a9fff9a868 Backed out changeset: de52f1d38f3c 2015-12-10 23:21:56 +02:00
Ansariel 4fde94fa86 Merge viewer-bear 2015-11-13 21:15:19 +01: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
andreykproductengine 080e26eba4 MAINT-5728 fix for dae uploading crash 2015-11-11 19:37:36 +02:00
Brad Payne (Vir Linden) b72480ddb9 SL-114 WIP - made mesh upload errors/warnings slightly more informative and less spammy. 2015-11-10 15:52:41 -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) 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) bfa3f83a2c merge 2015-10-19 16:34:13 -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 8729f5d23a Bandaid for SL-202 Skin weights with joint offsets. 2015-10-13 16:40:39 -07:00
AndreyL ProductEngine ddaa0e1865 MAINT-5678 FIXED Materials with spaces in name import with truncated names 2015-10-12 19:35:08 +03: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 1d22db9ed8 MAINT-5532 related crash fix and some log improvements 2015-08-26 21:00:57 +03:00
AndreyL ProductEngine cb30550a28 MAINT-5678 FIXED Materials with spaces in name import with truncated names 2015-10-12 19:35:08 +03:00
Ansariel 852eec31c3 Bug fixes in mesh importer by Drake Arconis 2015-10-06 13:10:29 +02:00
Ansariel 2a99e0f9d2 Oooops... 2015-09-29 23:29:05 +02:00
Ansariel 79d41cac7f Put Nicky's fix for FIRE-12216 in its new location 2015-08-29 18:26:24 +02:00
Ansariel 7395aea1e0 Move FSdaeErrorHandler to its new location 2015-08-29 14:19:04 +02:00
andreykproductengine b3916451c1 Merge viewer-release and become version 3.8.4 2015-08-18 18:51:38 +03:00
andreykproductengine 9e2eca1a8c MAINT-5216 FIXED Error appears when trying to upload the model "instance test.dae" 2015-05-14 19:11:53 +03:00
andreykproductengine 10e1bb6ea4 MAINT-5114 FIXED [Project-Importer] LOD files following new naming cannot be uploaded on their own. 2015-04-16 17:58:50 +03:00
ruslantproductengine 06f50c52e1 MAINT-3818 FIXED Certain dae files that used to display skin weights successfully now crash when ticking skin weights in model preview on ALL viewers 2015-04-01 19:02:55 +03:00
andreykproductengine e712a5230e MAINT-4982 Naming rules unification 2015-03-27 21:22:18 +02:00
andreykproductengine 0818a0189c MAINT-4983 submodel limit fix 2015-03-27 19:38:53 +02:00
andreykproductengine 051052b141 MAINT-4983 Mesh upload of large model ryoma 3d loads indefinitely 2015-03-25 20:07:21 +02:00
andreykproductengine 27f83733e9 MAINT-4983 Mesh upload of large model ryoma 3d loads indefinitely 2015-03-23 16:11:36 +02:00
andreykproductengine 84b178ccb1 MAINT-4982 FIXED Multi-Material Mesh Issues 2015-03-13 18:11:48 +02:00
andreykproductengine 6993f835e7 MAINT-4915 FIXED [loader mods] Incorrect error description in case of VERTEX_NUMBER_OVERFLOW 2015-02-23 15:04:32 +02:00
andreykproductengine b25dfc8cfd MAINT-4502 FIXED [loader mods] large scale model cannot be uploaded 2015-02-17 18:22:52 +02:00
Mnikolenko ProductEngine 46101abd73 MAINT-4863 FIXED Return LLModel::BAD_ELEMENT for model with empty or corrupted position array 2015-02-09 12:17:44 +02:00
andreykproductengine 0939bf4063 MAINT-4806 naming fix 2015-02-03 15:50:08 +02:00
maksymsproductengine 4193f9da92 Fix of build issues after merge 2014-12-20 02:21:04 +02:00
andreykproductengine 246390ab32 MAINT-4631 Buildfix for Mac 2014-12-02 21:55:50 +02:00
andreykproductengine bec06763d5 MAINT-4631 FIXED [loader mods] door model is missing triangles when uploaded. 2014-11-20 18:23:07 +02:00
Mnikolenko ProductEngine 54968b2470 MAINT-4542 FIXED Free calls shouldn't be used here , as it causes crash. (restored old fix) 2014-10-23 17:31:14 +03:00
andreykproductengine 370cbd429d MAINT-4515 FIXED [loader mods] viewer crashed when uploading a large mesh 2014-10-17 19:57:33 +03:00
Graham Linden 76e7f978c1 Merge viewer up to 3.7.12, including fixing missed LL_WARNS etc from last release (is that trout you smell on the air? is it?) 2014-07-07 17:59:07 -07:00
Graham Linden 428f2aa84e Added missing new files 2014-04-22 13:57:56 -07:00