440 commits

Author	SHA1	Message	Date
David Rowe	b78ae80ae6	Address review comments and add further examples	2019-03-26 09:40:47 +13:00
David Rowe	7445d73857	Merge branch 'master' into M21222 ... # Conflicts: # libraries/avatars/src/AvatarData.h	2019-03-13 16:14:14 +13:00
David Rowe	4779a6b156	Merge branch 'master' into M21222	2019-03-09 07:57:53 +13:00
Thijs Wenker	d985d1bff0	use Rig instead of Avatar for height calculations	2019-03-08 03:36:56 +01:00
David Rowe	0b7cddb886	Fill in and tidy MyAvatar JSDoc	2019-03-08 13:49:10 +13:00
amer cerkic	ad69611b7c	removing redef of the two functions in avatar.h	2019-03-01 11:08:00 -08:00
amerhifi	35dc13e06a	Merge branch 'master' into quest-demo	2019-02-28 14:06:47 -08:00
David Rowe	d73ff2e855	Revise current MyAvatar API JSDoc	2019-02-28 10:40:10 +13:00
David Rowe	e79594ef53	Fill in and tidy Avatar JSDoc	2019-02-27 09:53:11 +13:00
amantley	9b73c83ebc	removed merge markers ... (cherry picked from commit 4286142daac70269de155c99c9bbdb1f951eaff6)	2019-02-22 11:55:14 -08:00
amantley	87d98e5b85	These are the squashed commits for the ik optimization for the Quest ... Implmented using a new AnimSplineIK node in the anim graph (cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)	2019-02-22 11:21:36 -08:00
amantley	c9db426ce4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-21 14:36:13 -08:00
amantley	64ec28ef44	added back missing unity meta files	2019-02-21 11:37:14 -08:00
amantley	afed0b5442	review changes	2019-02-21 11:08:29 -08:00
SamGondelman	c8ffb130a3	only update sub items on change	2019-02-19 17:38:47 -08:00
David Rowe	f58a5db0b0	Reorganize JSDoc inheritance for MyAvatar and Avatar	2019-02-19 09:47:51 +13:00
David Rowe	50a1e07ed2	Stub missing MyAvatar, Avatar, and Agent functions and properties JSDoc	2019-02-18 18:32:49 +13:00
SamGondelman	06ac2b291b	attachments and wearables cull with avatar parent	2019-02-17 17:52:10 -08:00
SamGondelman	935d827421	try to cull wearables with avatars	2019-02-17 02:10:25 -08:00
Angus Antley	70764bc3c4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-15 19:24:30 -08:00
Sam Gondelman	9aa99f24f0	Merge pull request #14905 from SamGondelman/materialMapping ... Case 20242: FST materialMapping supports our material JSON format	2019-02-15 11:21:51 -08:00
amantley	0fcaa695ba	Merge remote-tracking branch 'upstream/master' into animArmIK	2019-02-15 10:35:33 -08:00
amantley	425413419a	fixed merge conflict in avatar.h	2019-02-15 08:26:54 -08:00
Anthony Thibault	a3407b96b0	Merge branch 'master' into bug-fix/revert-anim-pose-optimization	2019-02-14 16:56:17 -08:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -08:00
Andrew Meadows	ed8481ead9	fix grab bugs	2019-02-12 14:04:56 -08:00
SamGondelman	77a8ddb3f0	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-11 16:35:05 -08:00
Anthony Thibault	e6cdfe3377	Merge pull request #14827 from luiscuenca/FixShapeInfoAssertion ... Case 14722: Fix assertion when trying to create multisphere shapeInfo with empty data (80.0/master)	2019-02-08 15:10:44 -08:00
Sabrina Shanman	baf72eaae0	Merge pull request #14802 from sabrina-shanman/hfm_prep_joints ... Case 20887: Move FST joint property handling to the model preparation step	2019-02-08 15:02:23 -08:00
Anthony Thibault	d012d07519	Merge pull request #14865 from hyperlogic/feature/anim-optimizations ... Animation System Optimizations	2019-02-08 12:44:10 -08:00
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
SamGondelman	3addcb630c	Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping	2019-02-07 11:45:59 -08:00
Anthony Thibault	569bef50fd	AnimPose operator* optimizations	2019-02-05 14:48:05 -08:00
amantley	61b019d176	added new constructor for cubichermitespline that takes quat and vec3. this means we don't need computeSplineFromTipAndBase to be declared in multiple files	2019-01-31 14:13:51 -08:00
amantley	f68ee4e7ce	merged with master	2019-01-31 09:56:46 -08:00
luiscuenca	5438bddc84	Fix assertion on shapeInfo when creating multisphere with empty data	2019-01-31 09:43:30 -07:00
amantley	d174fb1b5c	removed print statements	2019-01-30 16:59:12 -08:00
amantley	7a1c1252ff	cleanup	2019-01-30 16:09:10 -08:00
amantley	2e1a4545c6	cache the spine2 spline default offset and ratio	2019-01-30 14:47:03 -08:00
Seth Alves	3ab2db96b6	deactivate grab action when grab is released	2019-01-30 14:43:11 -08:00
Seth Alves	0846eb8ec6	attempt to allow position edits in releaseGrab entity-method	2019-01-30 14:43:11 -08:00
sabrina-shanman	203e8e2455	Realize joint properties isFree and freeLineage are unused, so tear them out	2019-01-29 11:55:35 -08:00
luiscuenca	a6dce5dd84	Merge branch 'master' into multiSphereAvatar04	2019-01-28 17:48:22 -07:00
Andrew Meadows	f2b9f088b4	fix bad comparison causing undeleted grabs	2019-01-28 08:58:57 -08:00
luiscuenca	f54f9e5bfd	Merge branch 'master' into multiSphereAvatar04	2019-01-25 13:54:01 -07:00
luiscuenca	df4be641eb	More fixes	2019-01-25 13:42:18 -07:00
Andrew Meadows	09fe9735fa	plug grab leak, more correct names	2019-01-24 14:57:54 -08:00
Andrew Meadows	ee3fde9df1	unravel spaghetti, prefer std over Qt containers	2019-01-24 14:39:00 -08:00
Andrew Meadows	fd457a9c0e	remove cruft and fix a resource leak	2019-01-23 23:19:20 -08:00
Andrew Meadows	1bdcf8f0cb	MyAvatar bids for ownerhsip on grab	2019-01-23 21:26:10 -08:00