Commit Graph

34274 Commits (4588616d0d57e744ec741ed17299c1c052d2bb55)

Author SHA1 Message Date
Brad Payne (Vir Linden) 4588616d0d SL-233 FIX - removed some surplus log files. 2015-10-02 09:04:04 -04: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
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
Brad Payne (Vir Linden) 5460c0f4c8 SL-227 WIP - standardize usage of shared skinning code and handle additional error case in weights. 2015-09-28 11:53:01 -04:00
Brad Payne (Vir Linden) 924e4292e7 SL-227 WIP - trimmed unused code. 2015-09-24 13:29:57 -04:00
Brad Payne (Vir Linden) 2da22ad9fc SL-227 WIP - initial pass at consolidating skinning code. Less duplication of functionality, still needs more cleanup. 2015-09-24 11:35:19 -04:00
callum_linden 17ff449ae6 Supress error after Xcode 7 update: error: null passed to a callee that requires a non-null argument 2015-09-18 15:07:27 -07:00
callum_linden 1c94732ba1 comment out LL_DEBUGS that fails because 'expression evalauted desipite being used as an operand to typeid' 2015-09-18 14:34:21 -07:00
callum_linden 9ad8b86613 Turn off (for now) the warnings/errors that result from Boost.Units usage 2015-09-18 14:19:51 -07:00
callum_linden 5ec6d2cfd4 Update version of Xcode (7.0) and SDKs (10.11) 2015-09-18 13:26:16 -07:00
AndreyL ProductEngine 182f799281 MAINT-5601 Physics model not previewed, physics model not applied to mesh on upload
Some improvements: renaming to act like "legacy matching" would apply only to the models simple enough for this
2015-09-15 23:43:43 +03:00
Brad Payne (Vir Linden) 7f19cb367e merge 2015-09-14 11:05:08 -04:00
Brad Payne (Vir Linden) 6b2c1d5f10 SL-133 WIP, SL-134 WIP - more extra joint handling 2015-09-14 11:01:22 -04:00
AndreyL ProductEngine 0eba128741 MAINT-5601 FIXED Physics model not previewed, physics model not applied to mesh on upload 2015-09-11 00:15:53 +03:00
Andrey Lihatskiy 0c3bc2e4b9 Merged in develop (pull request #1)
MAINT-5602 FIXED Viewer crashes when loading physics from file
2015-09-08 20:24:49 +03:00
Andrey Lihatskiy c1e3f778cb Close branch develop
--HG--
branch : develop
2015-09-08 20:24:49 +03:00
Brad Payne (Vir Linden) 9d44aaab46 SL-216 WIP, SL-220 WIP - stray triangles in hw skinning path 2015-09-08 12:56:44 -04:00
AndreyL ProductEngine 9ce8f7bfb4 MAINT-5602 FIXED Viewer crashes when loading physics from file
--HG--
branch : develop
2015-09-07 02:59:36 +03:00
Brad Payne (Vir Linden) 5cacd71c07 SL-205 WIP - bumped up max joint count in software-skinning pass. 2015-09-02 15:42:22 -04:00
Brad Payne (Vir Linden) dbc5b757c5 merge 2015-09-01 11:35:55 -04:00
Brad Payne (Vir Linden) 98166af9c7 SL-133 WIP, SL-134 WIP - more handling for out-of-range joints 2015-08-31 13:06:42 -04:00
andreykproductengine 1d22db9ed8 MAINT-5532 related crash fix and some log improvements 2015-08-26 21:00:57 +03:00
Brad Payne (Vir Linden) 2ea8df0593 SL-205 WIP - support for 152-joint rigged meshes with both hardware and software skinning. 2015-08-26 10:49:02 -04:00
andreykproductengine 067790ffa5 MAINT-5536 FIXED Mac viewer crash when started from a web browser handler 2015-08-21 19:38:24 +03:00
Brad Payne (Vir Linden) 0f9700af5b merge 2015-08-20 22:51:56 -04:00
Brad Payne (Vir Linden) fbe58c1bdf SL-109 WIP - default av is wings+tail, others available with debug settings AvatarFileName and SkeletonFileName 2015-08-20 16:45:02 -04:00
andreykproductengine bb7ac16318 MAINT-5532 FIXED upload of duck.dae from MAINT-4483 crashes mac viewer 2015-08-20 20:25:58 +03:00
Brad Payne (Vir Linden) 217fb29434 SL-135 WIP - added additional lad/skel configs 2015-08-19 16:23:01 -04:00
Brad Payne (Vir Linden) fa7d639f8a merge 2015-08-19 10:08:04 -04:00
andreykproductengine b3916451c1 Merge viewer-release and become version 3.8.4 2015-08-18 18:51:38 +03:00
Brad Payne (Vir Linden) 3d7ae2b2f2 merge 2015-08-17 20:06:49 -04:00
Brad Payne (Vir Linden) fe89d4c5c2 merge 2015-08-17 14:56:12 -04:00
Oz Linden 1be6320933 increment viewer version to 3.8.4 2015-08-17 14:54:41 -04:00
Oz Linden 37ae276999 Added tag 3.8.3-release for changeset 60572f718879 2015-08-17 14:54:41 -04:00
Brad Payne (Vir Linden) 2a57da2334 SL-125 WIP - updated base bento repo excluding dynamic skeleton. 2015-08-14 15:00:08 -04:00
Brad Payne (Vir Linden) 590d0e35e5 SL-109 WIP - brought over work from SL-125 repo that was not dynamic skeleton related 2015-08-12 15:23:57 -04:00
Brad Payne (Vir Linden) 932412e1db SL-109 WIP - code cleanup 2015-08-12 11:17:23 -04:00
Brad Payne (Vir Linden) 47093f6e52 merge 2015-08-11 16:55:34 -04:00
Brad Payne (Vir Linden) d0eed68502 SL-134 WIP - Possible fix for octree corruption/crash when mesh has unknown joints. 2015-08-11 15:53:00 -04:00
Brad Payne (Vir Linden) 003156a89d SL-133 WIP - possible fix for unknown joints warping to origin 2015-08-11 12:09:38 -04:00
andreykproductengine 8a6bfb0e22 Merge fix - clearing duplicates 2015-08-07 17:42:07 +03:00
andreykproductengine 3e11b8c917 merge conflict fix (isDead() check got missed) 2015-08-04 20:44:28 +03:00
andreykproductengine 666b9346ba merge conflict fix 2015-08-04 20:26:46 +03:00
andreykproductengine 01ba9f3cd6 Merge downstream code and become version 3.8.3 2015-08-04 16:36:30 +03:00
AndreyL ProductEngine b5378f93b2 Merge viewer-release and become version 3.8.3 2015-08-04 05:00:59 +03:00
Oz Linden 310ec101df increment viewer version to 3.8.3 2015-08-03 13:47:42 -04:00
Oz Linden 1753905ef2 Added tag 3.8.2-release for changeset 3a62616f3dd8 2015-08-03 13:47:42 -04:00