598 commits

Author	SHA1	Message	Date
Seth Alves	b64ff70d6c	add show-lookat-targets DebugDraw. remove old/unused eyetracker code.	2019-09-17 09:43:19 -07:00
sabrina-shanman	b944db3e79	std::vector-ize joints and materials in hfm::Model	2019-09-11 16:54:07 -07:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
luiscuenca	3da2a6038d	Const ajustments	2019-08-29 16:27:54 -07:00
luiscuenca	265b6f57a1	Try to mitigate the effect of background mic noise when simulating talking	2019-08-29 15:19:17 -07:00
Anthony Thibault	2b74e2a7fa	Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes ... Avatar sitting bug fixes	2019-08-20 11:09:25 -07:00
Simon Walton	150b4e45d4	More robust handling of the avatar verify-failed property	2019-08-16 17:30:28 -07:00
Anthony J. Thibault	381f7c6bc4	Avatar sitting bug fixes ... * Added seatedToIdle transition, to make transition quicker to better match the capsule physics. * Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms. * Created "isNotSeated" anim var for exiting the seated state. * MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called. * MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation. Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing. * Disable leg IK in HMD mode while seated.	2019-08-16 10:57:03 -07:00
Sabrina Shanman	0728df8a8f	Merge pull request #16025 from sabrina-shanman/picks_debug ... (BUGZ-1059) Improve debug API for picks/pointers	2019-08-07 12:01:26 -07:00
sabrina-shanman	20fa78e51d	Fix some dates and no newline at EOF	2019-08-02 16:13:07 -07:00
HifiExperiments	078ca7edea	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
SamGondelman	60600779c9	merge with master	2019-07-12 11:01:17 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
SamGondelman	37feb7f027	merge with master	2019-06-10 10:29:39 -07:00
Sam Gateau	4c18ce7ae6	Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state ... (BUGZ-559) Improve transition debugging and transition clean-up	2019-06-06 16:35:04 -07:00
sabrina-shanman	833946ceb3	Clean up transition naming	2019-06-06 13:25:06 -07:00
David Rowe	6299d38673	Distinguish between Uuid API and Uuid type in JSDoc	2019-06-05 14:39:05 +12:00
Seth Alves	426f97fb35	avoid div by zero	2019-06-04 13:00:26 -07:00
Sam Gondelman	3d05a954bc	Merge branch 'master' into proceduralMesh	2019-05-23 09:35:14 -07:00
SamGondelman	264051ed6d	fix myavatar setSkeletonModelURL	2019-05-21 10:40:58 -07:00
Sam Gondelman	a7842fe3ea	Merge branch 'master' into proceduralMesh	2019-05-21 09:51:33 -07:00
SamGondelman	3273f46179	fix avatar loading spheres	2019-05-17 15:29:27 -07:00
SamGondelman	f4f687cf83	trying to fix build	2019-05-16 23:19:55 -07:00
SamGondelman	da254c2ccc	(¬‿¬)	2019-05-15 23:48:04 -07:00
Brad Hefta-Gaub	51f2d1748e	Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state ... (BUGZ-40) Check for possible avatar fade race condition	2019-05-13 13:41:09 -07:00
SamGondelman	eb8c722080	fix runtime switch	2019-05-13 09:58:55 -07:00
sabrina-shanman	6f5bf01f2b	Add sanity check and logging for possible avatar fade lambda race condition	2019-05-10 14:33:25 -07:00
Sam Gondelman	222d36c7d0	Merge pull request #15480 from SamGondelman/tests ... Case 22418: Fix model bounds on resize	2019-05-01 16:50:07 -07:00
luiscuenca	6e2ac14c23	Change while loops	2019-05-01 12:42:41 -07:00
SamGondelman	0bcd8b81e1	trying and failing to fix models	2019-05-01 12:01:49 -07:00
luiscuenca	73454b06a2	Fix crash accessing _modelJointIndicesCache	2019-05-01 08:57:09 -07:00
SamGondelman	5a184bd584	fix model bounds	2019-04-30 13:38:11 -07:00
SamGondelman	d99af64410	fix wearables not disappearing with avatar	2019-04-29 16:01:38 -07:00
Anthony Thibault	4761a69a4d	Merge pull request #15438 from luiscuenca/skeletonTrait ... Skeleton Trait Implementation	2019-04-26 10:14:47 -07:00
luiscuenca	080f891c9f	Fix scale and refactor debug function	2019-04-25 14:54:40 -07:00
luiscuenca	b10aca10d4	Fix code standard issues	2019-04-23 09:45:39 -07:00
luiscuenca	9c90a2b684	more fixes	2019-04-22 13:17:42 -07:00
luiscuenca	20cac4cd4d	Rotation fix and refactor	2019-04-22 11:38:27 -07:00
luiscuenca	1ad197df26	Send avatar skeleton trait	2019-04-16 17:40:43 -07:00
Shannon Romano	50f39e88d6	Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check ... Better head vs camera checks for avatar head cauterization	2019-04-16 15:07:46 -07:00
Anthony J. Thibault	7aeb4bca87	Include head rotation in getEyeModelPositions	2019-04-11 14:05:15 -07:00
David Rowe	ca3f45163f	Merge branch 'master' into M21989	2019-04-11 10:37:34 +12:00
Anthony J. Thibault	02d5769991	Better head vs camera checks for avatar head cauterization ... * cameraInsideHead() check now uses detailed avatar collision when possible. * head is now more constantly hidden in first person camera mode * getEyeModelPositions() uses a better estimate when avatar eye joints are missing. * moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp * added isPlayingOverrideAnimation() method to Rig class	2019-04-09 12:57:03 -07:00
Anthony Thibault	0e2c5ea3c2	Merge pull request #15291 from luiscuenca/multiSpheresMixFix ... Fix avatar multi-sphere bad scaling on some avatars	2019-04-05 15:55:13 -07:00
David Rowe	2a17ad3da5	AvatarList and AvatarManager JSDoc	2019-04-04 10:11:54 +13:00
Shannon Romano	cf7eeb7355	Merge pull request #15285 from danteruiz/avatar-fading ... Case 21415: Avatars stay behind after they disconnect	2019-04-01 18:04:42 -07:00
danteruiz	8115ef6d36	addressing more requested changes	2019-04-01 16:46:15 -07:00
danteruiz	db17f094da	adding entities to fade out list;	2019-03-29 15:23:16 -07:00
luiscuenca	bea45e67cb	Fix multisphere scale, desyncronize visualization and support joint scaling	2019-03-28 17:38:17 -07:00
danteruiz	b9d04c6ebb	adding entity to a faded list	2019-03-28 16:42:29 -07:00
danteruiz	40d424a01d	avatar fading	2019-03-27 16:42:34 -07:00
Andrew Meadows	fb7daa185d	improved physics for grabbed AvatarEntities	2019-03-27 10:12:59 -07:00
Seth Alves	fa36f12145	lock wearables when adjust-wearables page is opened	2019-03-27 10:12:57 -07:00
Seth Alves	29af3b1612	add a button to Avatar panel to lock or unlock wearables. ... allow grabbing / adjusting others' wearables if they are unlocked.	2019-03-27 10:12:57 -07:00
David Rowe	cf4370ed3a	Merge branch 'master' into M21222	2019-03-26 09:44:48 +13:00
David Rowe	b78ae80ae6	Address review comments and add further examples	2019-03-26 09:40:47 +13:00
Andrew Meadows	9d11e44b4b	update AvatarEntity trait when parentID changes	2019-03-20 11:37:16 -07:00
SamGondelman	79dda7a6c7	build errors	2019-03-15 14:29:50 -07:00
SamGondelman	c985fc735d	clean up avatar rendering and ring gizmo normals	2019-03-14 14:43:43 -07: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
Jeff Clinton	3776472550	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats ... cases 20709 and 20715: wear and see mexico hats	2019-01-22 12:58:56 -08:00
luiscuenca	43244193e8	Mesh picking against default pose with transformed ray	2019-01-18 12:46:18 -07:00
Andrew Meadows	74f9a415d3	move _cauterizationNeedsUpdate back to MyAvatar	2019-01-17 13:58:34 -08:00
Seth Alves	4fbc257be0	don't cauterize head-children when they are grabbed	2019-01-17 13:34:36 -08:00
luiscuenca	67cc5bd7f2	Fix warnings and wrong shapes position for myAvatar	2019-01-16 10:52:34 -07:00
luiscuenca	a7f143dbce	Merge branch 'master' into multiSphereAvatar04 ... # Resolved Conflicts: # interface/src/avatar/MyAvatar.h # interface/src/avatar/OtherAvatar.cpp	2019-01-15 18:27:04 -07:00
luiscuenca	71e7023a3e	Refactor and optimizations	2019-01-15 18:07:50 -07:00
Roxanne Skelly	6317ceb9b3	Case20277 - Ignoring user causes loading orb to appear at /0,0,0 ... Loading orb was created for all other avatars upon OtherAvatar object creation without checking the ignore list.	2019-01-15 13:34:29 -08:00
luiscuenca	19701ef333	Fix scale and add rayTest	2019-01-11 15:36:07 -07:00
Andrew Meadows	9ea6968e35	fix bug where attached AvatarEntities do not update in timely fashion	2019-01-09 17:40:18 -08:00
Andrew Meadows	c998ddbb9e	ScriptableAvatar::setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	a4be4fb6c0	MyAvatar.setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	cbcd70aee6	namechanges and comments to help clarify necessary fixes	2019-01-09 17:28:00 -08:00
Andrew Meadows	9f404ef006	Agent bots can manipulate AvatarEntities again	2019-01-09 17:28:00 -08:00
Andrew Meadows	d622635a71	fix wording in comment to reflect new 'HostType' parameter	2019-01-09 17:27:14 -08:00
Andrew Meadows	c4115bece3	remove unused ScriptEngine instance	2019-01-09 17:27:14 -08:00
Andrew Meadows	09f3b8f485	add bit of sanity checking for incomming AvatarEntities data	2019-01-09 17:27:14 -08:00
Andrew Meadows	61b8d005b5	scripts can edit AvatarEntities again	2019-01-09 17:27:14 -08:00
Andrew Meadows	e37b5b52f0	correctly load AvatarEntities from settings redux	2019-01-09 17:27:14 -08:00
Andrew Meadows	01fc442695	save AvatarEntities settings as strings	2019-01-09 17:27:14 -08:00
Andrew Meadows	d3fea94540	send AvatarEntities via raw data packet	2019-01-09 17:27:14 -08:00
luiscuenca	95fca826a5	Add fit AABox for avatar and implement multisphere on shapeManager	2019-01-09 17:49:19 -07:00
John Conklin II	e4abb66199	Merge pull request #14627 from AndrewMeadows/fewer-avatar-entity-updates ... case 20304: please don't flood the avatar-mixer with unnecessary AvatarEntity udpates	2019-01-09 14:55:23 -08:00
luiscuenca	39dc25ea92	Merge branch 'master' into multiSphereAvatar04 ... # Conflicts: # interface/src/avatar/OtherAvatar.h # libraries/avatars-renderer/src/avatars-renderer/Avatar.h	2019-01-08 15:41:33 -07:00
Sam Gondelman	db3187ec6c	Merge branch 'master' into propFix	2019-01-07 14:57:38 -08:00
Jeff Clinton	75d26dc45f	Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption ... Add menu checkbox to toggle collisions with other avatars	2019-01-07 08:58:09 -08:00
SamGondelman	b5b7574c48	set created	2019-01-04 16:52:11 -08:00
luiscuenca	d630fe9dbd	Add menu checkbox to toggle collisions with other avatars	2019-01-04 16:38:48 -07:00
Jeff Clinton	c2c744b44e	Merge pull request #14622 from SimonWalton-HiFi/avatar-scaling-delayed ... Correctly set avatar-scale timestamp when changing in Avatar class	2019-01-04 10:00:46 -08:00
Andrew Meadows	65a7e15f5d	don't send AvatarEntity updates when not necessary	2019-01-03 17:57:11 -08:00
Anthony Thibault	fa137f0586	Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation	2019-01-03 13:19:11 -08:00
Seth Alves	3c0243419b	trying again on avatar-entity grab releases	2019-01-03 08:17:52 -08:00
Seth Alves	895e8cdba1	fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again	2019-01-03 08:17:52 -08:00
Seth Alves	fc128b49de	don't crash when releasing an entity that has expired	2019-01-03 08:17:52 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
Anthony Thibault	d87bc3e898	Update eye look at interest calculation ... This now takes distance, your facing toward them, and their facing toward you into the interest calculation. Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar. Previously these two separate elements where merged together in a single loop.	2018-12-31 13:37:22 -08:00
luiscuenca	bd21d0589a	Merge branch 'master' into otherAvatarMotionStates01	2018-12-30 10:55:05 -07:00
luiscuenca	4a8bbd79fe	other avatars motion states	2018-12-30 10:53:28 -07:00
Simon Walton	9cb53af023	Correct set avatar-scale timestamp when changing in Avatar class	2018-12-19 16:13:12 -08:00
amantley	42a17980cb	fixed mac build conflict, unused variable	2018-12-17 16:21:22 -08:00
Angus Antley	77fa4e7d13	took out the unnecessary hfm.jointindex code	2018-12-16 17:29:16 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00