overte-JulianGro

mirror of https://github.com/JulianGro/overte.git synced 2025-08-29 21:25:16 +02:00

Author	SHA1	Message	Date
Stephen Birarda	b31837168d	fix bad lock, optimize some operations, clarify comment	2018-09-24 11:27:20 -07:00
luiscuenca	82b14b6e9b	Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport	2018-09-22 05:47:05 -07:00
luiscuenca	01f87a0645	lerp myavatar	2018-09-22 05:34:17 -07:00
Seth Alves	86e502637e	Make Settings thread safe	2018-09-21 15:46:35 -07:00
luiscuenca	a7a128f1f1	Particle effect and ease movement	2018-09-20 18:37:42 -07:00
luiscuenca	cad8425c7b	Time-based frames, max distance and setting animation from script	2018-09-19 16:43:45 -07:00
Stephen Birarda	3a7785d10f	fix for deadlock in other avatar entity removal	2018-09-18 17:52:24 -07:00
amantley	42e248ef84	maded more changes to support sitting state to do: add option for stuck pose reset	2018-09-18 17:37:44 -07:00
luiscuenca	96e8b060eb	Enable transit animations	2018-09-18 12:42:37 -07:00
amantley	96da9b7e54	cleaned up code for squatty fix	2018-09-18 10:31:19 -07:00
amantley	14fb7e1d44	removed redundant code	2018-09-17 17:53:08 -07:00
amantley	ff0d938d37	initial changes to stop the squatty potty from happening when users are sitting down in vr mode	2018-09-17 16:53:15 -07:00
luiscuenca	f339bbdd7f	Fix bug while walking	2018-09-17 13:29:04 -07:00
luiscuenca	ff319ebd95	Bypass position updates from mixer	2018-09-17 09:47:22 -07:00
John Conklin II	65ef04ae75	Merge pull request #13937 from luiscuenca/stt_teleport_wip Safe Teleport Target	2018-09-14 15:11:18 -07:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00
luiscuenca	c5669ef1f5	better property names	2018-09-13 15:22:18 -07:00
luiscuenca	6a9a898b62	make updateCollisionCapsule private	2018-09-13 15:07:34 -07:00
luiscuenca	ceccc6d6ec	make getCollisionCapsule thread safe	2018-09-13 14:49:35 -07:00
John Conklin II	b675e6cc6b	Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling Performance improvements for Avatar Mixer	2018-09-13 13:43:18 -07:00
luiscuenca	b517808bc2	Fix smaller size avatar capsule and land on detailed mesh	2018-09-12 21:24:19 -07:00
Stephen Birarda	b1f44d2ad7	perform avatar entity cleanup in AvatarManager::handleRemovedAvatar	2018-09-12 12:30:15 -07:00
luiscuenca	b9fbcce403	init frames per meter	2018-09-12 10:15:00 -07:00
luiscuenca	4d381b9d04	Smooth other avatars positions	2018-09-12 10:01:41 -07:00
John Conklin II	f67deb9f65	Merge pull request #13938 from wayne-chen/interstitalMerged Interstitial Page with 404 Redirect	2018-09-12 08:39:52 -07:00
Brad Hefta-Gaub	d319bea2ac	Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb Avatar loading orb now indicates loading status	2018-09-11 18:01:40 -07:00
Wayne Chen	63ad85215b	Merge branch 'master' into interstitalMerged	2018-09-11 17:17:33 -07:00
Anthony Thibault	23ed314250	Fix for missing return warning	2018-09-11 14:50:50 -07:00
Dante Ruiz	b665dbe13e	finished requested changes	2018-09-11 14:18:12 -07:00
Anthony Thibault	bc5d9a46a2	Avatar loading orb now indicates status white - no url has been received yet for this avatar purple - a url has been received for this avatar but it's content is still downloading/loading blue - (only visible breifly) content has succesfully loaded red - (only visible briefly) content has failed to download.	2018-09-11 13:12:46 -07:00
luiscuenca	fedea6e84d	Comply with review comments	2018-09-11 12:23:25 -07:00
Simon Walton	d12376187c	Merge branch 'master' into avatar-mixer-scaling	2018-09-10 10:15:49 -07:00
luiscuenca	a9f676354b	Only invisible pointers and scale fix	2018-09-10 08:54:53 -07:00
Stephen Birarda	adac872a11	clear other avatars in agent on avatar mixer disconnect	2018-09-07 15:04:14 -07:00
luiscuenca	d09391faa5	Fix invisible error	2018-09-07 12:17:40 -07:00
luiscuenca	02065518cb	Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip	2018-09-07 11:57:48 -07:00
John Conklin II	405e2da91e	Merge pull request #13949 from sabrina-shanman/stt_parenting_scale Scale Collision Pick to match parent	2018-09-07 11:54:02 -07:00
Simon Walton	741d4ba998	Merge branch 'master' into avatar-mixer-scaling	2018-09-07 09:30:39 -07:00
SamGondelman	ed7f993c0d	avatar mixer and manager perf improvements and cleanup	2018-09-06 16:57:20 -07:00
amantley	90a51e6181	added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area	2018-09-06 13:12:48 -07:00
sabrina-shanman	727b62144f	Fix MyAvatarHeadTransformNode not using avatar scale	2018-09-06 12:03:13 -07:00
Dante Ruiz	200f6d540a	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-09-06 09:59:51 -07:00
amantley	6fb335429d	starting to re-implement the walking state detection for smoothwalking	2018-09-05 17:55:27 -07:00
luiscuenca	abb632afda	Update capsule when scale/load and teleport without safe landing	2018-09-05 16:51:34 -07:00
amantley	73e628bb8d	merge with master fixes	2018-09-05 14:42:49 -07:00
Anthony Thibault	584d39744f	Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode HMD mode bug fix for avatars with no eyes	2018-09-05 10:57:21 -07:00
Andrew Meadows	4a1bd98584	Merge pull request #13914 from SamGondelman/avatarmanager Miscellaneous low-level performance improvements	2018-09-05 10:12:05 -07:00
Simon Walton	262dbaf5ed	Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling	2018-09-04 15:27:41 -07:00
Simon Walton	695fabf4f5	Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling	2018-09-04 15:27:18 -07:00
Simon Walton	6ae2ca1576	Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling Merge of Samuel's change to use simple sort instead of priority queue	2018-09-04 15:26:26 -07:00
Anthony Thibault	b21fa1037f	Code review feedback and bug fixes for calibraiton matrices	2018-09-04 11:55:52 -07:00
SamGondelman	ade58a52cc	reserve priority sort util vectors	2018-09-04 11:21:43 -07:00
Anthony Thibault	3a034fdf66	HMD mode bug fix for avatars with no eyes Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing. Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes. This is more accurate for characters that don't quite have human proportions.	2018-09-04 10:13:57 -07:00
Sam Gondelman	7cdc7dcc66	Merge pull request #13873 from sabrina-shanman/stt_parenting Collision Pick Parenting	2018-08-31 14:43:55 -07:00
SamGondelman	d01b438cb3	CR	2018-08-31 11:25:17 -07:00
SamGondelman	5f08ed5027	misc perf improvements	2018-08-30 16:55:15 -07:00
Anthony Thibault	78d7c321b8	Merge pull request #13796 from amantley/noNeckFix Avatar without Neck Joint bug 14620	2018-08-30 14:52:44 -07:00
John Conklin II	8fa4a2855e	Merge pull request #13641 from amantley/rotateFilterChange Hand Azimuth Controls Shoulder Rotation	2018-08-30 13:59:00 -07:00
John Conklin II	bf0ab865bb	Merge pull request #13903 from birarda/bug/av-entity-delete-master send MyAvatar avatar entity updates through entity tree	2018-08-30 10:25:31 -07:00
Dante Ruiz	8c77820e30	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-30 09:45:41 -07:00
Stephen Birarda	aaf5f593c5	send MyAvatar avatar entity updates through entity tree	2018-08-29 16:30:24 -07:00
Angus Antley	9fb0f8b7c0	added condition to prevent overwriting tracker input with estimated orientation for spine2 joint	2018-08-30 00:25:53 +01:00
sabrina-shanman	0981f08b22	Do not propagate avatar scale in AvatarHeadTransformNode	2018-08-29 14:48:27 -07:00
Angus Antley	f7d0cdda02	added a check for whether the head to shoulder azimuth is greater than 100 degrees. If so unflip the chest azimuth	2018-08-29 20:44:21 +01:00
Angus Antley	ee33f5dc97	normalize the hip hand vector in getSpine2RotationRigSpace, made computeHandAzimuth a const function that returns a vec2	2018-08-29 01:57:49 +01:00
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -07:00
amantley	3c792a04c1	fixed roll rotation added to azimuth in MySkeletonModel.cpp	2018-08-28 11:25:42 -07:00
amantley	89b508251e	added some comment to explain rig to avatar transform	2018-08-27 17:57:50 -07:00
amantley	055f03878e	made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now	2018-08-27 14:44:27 -07:00
danteruiz	e2cd695dfb	PR code clean up	2018-08-27 11:01:29 -07:00
amantley	8406fb2359	Merge remote-tracking branch 'upstream/master' into steppingReboot	2018-08-24 16:48:26 -07:00
amantley	dd8a00983c	Merge remote-tracking branch 'upstream/master' into rotateFilterChange	2018-08-24 16:29:20 -07:00
amantley	2bec867863	added the sanity check to see if the shoulders have flipped	2018-08-24 16:29:08 -07:00
Dante Ruiz	af19849a75	fixing merge conflict	2018-08-24 15:48:42 -07:00
sabrina-shanman	3167d3c0c7	Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head	2018-08-24 15:47:52 -07:00
SamGondelman	70f4d0c634	Merge remote-tracking branch 'upstream/master' into perf	2018-08-24 14:04:37 -07:00
SamGondelman	3d048c77ba	Merge remote-tracking branch 'upstream/master' into recurse	2018-08-24 11:39:05 -07:00
amantley	a60ab863a3	demo version of the head and hands determining the rotate function	2018-08-24 11:06:36 -07:00
Angus Antley	25610c7587	got the hands turning the shoulders, needs error checking	2018-08-24 11:04:36 +01:00
Angus Antley	44a6c7df5f	added hook to myskeleton model to update spine2, need to get the rotation from myavatar then we have spine rot	2018-08-24 07:17:17 +01:00
amantley	0e0561bb24	latest rotate code	2018-08-23 17:59:18 -07:00
Dante Ruiz	11ab6dd0b5	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-23 13:20:09 -07:00
Andrew Meadows	8f2141b592	fix compile error	2018-08-23 12:59:28 -07:00
Andrew Meadows	f5cae61b43	fix typo causing compile failure	2018-08-23 12:59:28 -07:00
Andrew Meadows	87223946ad	add/remove avatars according to workload region	2018-08-23 12:59:28 -07:00
Andrew Meadows	3ecabb6583	cleanup after removing spaghetti	2018-08-23 12:59:28 -07:00
Andrew Meadows	99aafb1f95	move code from Avatar to OtherAvatar	2018-08-23 12:59:28 -07:00
Andrew Meadows	615b8addd0	fix order of includes	2018-08-23 12:59:28 -07:00
Andrew Meadows	598a227f1a	use OtherAvatar instead of Avatar in AvatarMotionState	2018-08-23 12:59:28 -07:00
Andrew Meadows	3c01433e12	stub for avatars changing workload regions	2018-08-23 12:59:28 -07:00
Andrew Meadows	21adbf49c0	remove cruft	2018-08-23 12:59:28 -07:00
Andrew Meadows	15665b25e8	give OtherAvatars a proxy in workload	2018-08-23 12:59:28 -07:00
John Conklin II	1320a34a18	Merge pull request #13841 from luiscuenca/noAttachmentsToJSON Don't include old attachment data on new avatar recordings	2018-08-23 10:51:33 -07:00
Dante Ruiz	54258a8707	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-23 09:53:20 -07:00
Angus Antley	30ef544c6d	starting the c++ version of shoulder rotation	2018-08-23 15:57:14 +01:00
SamGondelman	c474f38860	force coarse picking, sort avatars	2018-08-22 18:07:16 -07:00
SamGondelman	5c0b12abf6	ordered ray/parabola intersection code	2018-08-22 16:29:17 -07:00
Wayne Chen	9518b8cdaf	rearrangement	2018-08-22 15:46:02 -07:00
Wayne Chen	c32cc1ead2	adding implementation	2018-08-22 15:42:15 -07:00
Dante Ruiz	f5441b2721	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-22 15:28:42 -07:00
luiscuenca	b3d127c953	Fix flickering	2018-08-22 14:31:34 -07:00
amantley	9dfaf32b72	fixed the step animation but it still needs work	2018-08-22 14:12:19 -07:00
amantley	2dd812935f	Merge remote-tracking branch 'upstream/master' into rotateFilterChange	2018-08-22 12:57:16 -07:00
amantley	1e3ca6f902	added quicker follow code and added head to rotate calculation	2018-08-22 12:57:06 -07:00
amantley	456b8bf2a9	tweaked the animvars callback to update the spine2 position	2018-08-22 09:36:52 -07:00
luiscuenca	5f4903f884	Record entities	2018-08-22 08:53:51 -07:00
amantley	1fabc77244	latest update to stop lurching, and allow leaning, and stop perma leans	2018-08-21 12:34:05 -07:00
Stephen Birarda	1723f3d3d8	don't use entity tree to clear all avatar entities	2018-08-21 12:21:29 -07:00
Stephen Birarda	a177e49877	Revert "send attachment clears through setAvatarEntityData" This reverts commit `25876bca63`.	2018-08-21 12:18:11 -07:00
Stephen Birarda	25876bca63	send attachment clears through setAvatarEntityData	2018-08-21 10:32:05 -07:00
Stephen Birarda	f0ba61ff05	add missing local ID, reset client processed trait versions	2018-08-21 10:32:05 -07:00
Stephen Birarda	e33f349d53	fix flagging for avatar entity update/delete	2018-08-21 10:32:05 -07:00
Stephen Birarda	ea7c0e923a	make client traits handler a unique ptr in AvatarData	2018-08-21 10:31:15 -07:00
Stephen Birarda	a0df68f32f	move skeleton model URL emit to AvatarData	2018-08-21 10:31:14 -07:00
Stephen Birarda	a80d19a44a	remove skeleton from identity, handle in clients	2018-08-21 10:31:14 -07:00
Stephen Birarda	ac835650b7	add skeleton trait sending to Agent, queuing in AvatarMixer	2018-08-21 10:31:14 -07:00
Stephen Birarda	486557e28a	initial trait packet sending on skeleton URL change	2018-08-21 10:31:14 -07:00
Dante Ruiz	db3d3d3d93	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-21 09:56:59 -07:00
amantley	2dcdd60750	added new AvatarConstants and more frequent horizontal recentering to deal with lurching walk in large tracked volumes	2018-08-20 17:32:52 -07:00
SamGondelman	9ab1fc0500	Merge remote-tracking branch 'upstream/master' into perf	2018-08-20 17:04:42 -07:00
amantley	baa17395f0	Merge remote-tracking branch 'upstream/master' into rotateFilterChange	2018-08-20 16:47:21 -07:00
amantley	94026fb4dd	added activate(rotation) to prephysics update	2018-08-20 16:47:14 -07:00
SamGondelman	05ff99a1d2	working on blendshapes	2018-08-20 11:40:25 -07:00
amantley	471bb28545	Merge remote-tracking branch 'upstream/master' into steppingReboot	2018-08-20 09:50:45 -07:00
Andrew Meadows	90429f07cb	don't forget to use enqueue the Transaction	2018-08-16 14:38:32 -07:00
John Conklin II	1edf1b4337	Merge pull request #13555 from SamGondelman/destroy Trying to fix dependency shutdown	2018-08-16 13:14:58 -07:00
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
Seth Alves	0a5c96ecc1	Merge pull request #13792 from luiscuenca/attachmentsAPImgr Attachments API returns avatar entities	2018-08-13 14:21:13 -07:00
amantley	c2612af7a8	changed the spine stretch limit, will check the scale implications next	2018-08-10 17:10:33 -07:00
luiscuenca	dd93055d89	Convert and load attachments when rig is ready	2018-08-10 16:15:30 -07:00
Sam Gateau	d5c5bd714f	Merge pull request #13785 from AndrewMeadows/no-update-fading-avatars don't call Avatar::simulate() on fading avatars	2018-08-10 15:44:07 -07:00
John Conklin II	644ff1eafa	Merge pull request #13655 from amantley/animationBlendChanges New Default Strafe Animations Plus Animation Tuning Support	2018-08-10 15:03:30 -07:00
Wayne Chen	769e7eab03	removing domainLimitedScale property and changing read property of scale	2018-08-09 17:38:58 -07:00
amantley	c8a31bc59f	created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3	2018-08-09 17:38:57 -07:00
Wayne Chen	d533e3b341	adding domainLimitedScale property	2018-08-09 17:29:13 -07:00
amantley	f26d6b8c3d	cleaned up code and changed the forward offset for the default eyes when there is no neck bone	2018-08-09 12:15:35 -07:00
luiscuenca	9ca0ee05dc	Fix wanings	2018-08-09 12:13:03 -07:00
amantley	a3f2fd1f23	removed some print statements and added the code to use the head parent when the neck is missing, this allows for cauterization	2018-08-09 11:33:27 -07:00
luiscuenca	8c121a531d	Turn attachments into avatar entities	2018-08-09 10:35:15 -07:00
Andrew Meadows	8153e660bf	don't simulate/animateScaleChanges for fading avatars	2018-08-09 08:54:28 -07:00
amantley	c774dd7f5b	debugging to solve the no-neck crazy scale problem	2018-08-08 17:52:22 -07:00
Andrew Meadows	9b0dcb45ba	don't update fading avatars	2018-08-08 14:00:44 -07:00
r3tk0n	32165dff40	Fixed rotations in MyAvatar::goToFeetLocation()	2018-08-07 14:31:48 -07:00
amantley	1353406254	more whitespace	2018-08-07 12:56:28 -07:00
amantley	84619e7adc	cleaned up to match coding standards	2018-08-07 10:40:11 -07:00
MuteTab	b590ff793a	New function for changing location in domains such that the AVatar's leg-length is taken into account.	2018-08-06 20:26:44 -07:00
amantley	1ad6b041cd	updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed	2018-08-06 18:36:32 -07:00
SamGondelman	e3756a6dae	Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy	2018-08-06 11:21:51 -07:00
SamGondelman	9806bce403	weak pointers to nodeList	2018-08-06 11:21:32 -07:00
Sam Gondelman	2edefe3209	Merge branch 'master' into destroy	2018-08-06 09:51:14 -07:00
amantley	08889b627a	Merge remote-tracking branch 'upstream/master' into animationBlendChanges	2018-08-06 09:16:53 -07:00
Dante Ruiz	cca76f7022	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-06 08:02:03 -07:00
John Conklin II	00a8b73814	Merge pull request #13751 from danteruiz/fix-flying fix flying	2018-08-03 19:27:47 -07:00
Dante Ruiz	f30b552e19	fix-flying	2018-08-03 15:50:11 -07:00
Sam Gateau	aac4ff0b7e	Merge pull request #13749 from samcake/punk Fix the other avatars not being removed when Avatar mixer reset	2018-08-03 15:37:13 -07:00
Dante Ruiz	683b42e35b	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-03 09:59:35 -07:00
Sam Gateau	da252a70c1	Same as https://github.com/highfidelity/hifi/pull/13747	2018-08-03 09:22:29 -07:00
Dante Ruiz	048196ec6f	disble sending avatar and audio packets during interstitial mode	2018-08-02 11:39:06 -07:00
amantley	bd88d5f15b	merging with ik leg fix code in master	2018-08-02 09:48:04 -07:00
amantley	6b2c67e5bd	more doug support	2018-08-01 18:22:51 -07:00
SamGondelman	1ba28de5b6	try to fix nodelist not getting destroyed	2018-08-01 17:52:27 -07:00
Andrew Meadows	e336c9276d	first set shape THEN use it	2018-08-01 17:39:57 -07:00
SamGondelman	8a9c27ed92	Merge remote-tracking branch 'upstream/master' into destroy	2018-08-01 16:07:48 -07:00
Andrew Meadows	bd6f00e707	eliminate angular dynamics of other-avatars	2018-08-01 11:58:52 -07:00
Andrew Meadows	c939699879	ignore other-avatar angularVelocity in physics simulation	2018-08-01 11:22:58 -07:00
amantley	02dd2f4f28	added velocity scaling for forward and back	2018-07-31 18:26:44 -07:00
John Conklin II	16940cc9b7	Merge pull request #13716 from r3tk0n/17170-flying-crash Remove deprecated flying setting from MyAvatar.cpp saveData()	2018-07-31 09:48:01 -07:00
John Conklin II	bd2ab38bfe	Merge pull request #13701 from ElderOrb/FB16702 FB16702 - Avatar App does not save Animation JSON Override URL	2018-07-30 14:51:32 -07:00
r3tk0n	63de16bac5	Remove deprecated flying setting from MyAvatar.cpp saveData()	2018-07-30 11:40:15 -07:00
Sam Gondelman	8201997a16	Merge pull request #13660 from SamGondelman/parabolic Parabolic Picking + Pointers	2018-07-30 10:49:02 -07:00
John Conklin II	021e09d083	Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash fix a crash when grabbing a non-dynamic entity with an overlay child	2018-07-27 12:49:14 -07:00
John Conklin II	d4cbbfe4c1	Merge pull request #13692 from amantley/leanBackSittingFix Fix For Unnatural Hips Behaviour When Sitting In HMD	2018-07-27 12:30:31 -07:00
Seth Alves	91d509f5a4	fix a crash when grabbing a non-dynamic entity with an overlay child	2018-07-27 10:35:26 -07:00
Seth Alves	41af82a7f6	Merge pull request #13702 from r3tk0n/17016-flying-settings 17016 flying settings	2018-07-27 10:07:13 -07:00
Alexander Ivash	29f7cab7df	FB16702 - Avatar App does not save Animation JSON Override URL note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'	2018-07-27 02:08:44 +03:00
r3tk0n	f3d0d9b4a0	Clean up garbage comments.	2018-07-26 15:37:42 -07:00
r3tk0n	f8c611b1d0	Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp	2018-07-26 15:35:12 -07:00
amantley	12cb212dc7	used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards	2018-07-26 12:05:17 -07:00
Anthony Thibault	6c92949aed	Merge pull request #13672 from luiscuenca/fixElbowPoleVector Redesign and enable hand's Pole Vectors for elbow simulation	2018-07-26 11:51:33 -07:00
amantley	37540c79b3	removed print statement and added const upper leg fraction	2018-07-25 10:51:19 -07:00
amantley	c5599623f7	added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting	2018-07-25 10:29:29 -07:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
luiscuenca	e7d70a832d	Pole Vectors always calculated when arms are crossed	2018-07-24 08:58:17 -07:00
John Conklin II	2ac9463830	Merge pull request #13653 from ElderOrb/fake-wearables-fix FB16870: Avatar Wearables showing incorrect number	2018-07-23 15:55:11 -07:00
luiscuenca	2adb334034	unused code deleted	2018-07-23 14:25:30 -07:00
luiscuenca	9d2d7c3aa4	Redesign and enable hand's Pole Vectors for elbow simulation	2018-07-23 13:16:11 -07:00
Alexander Ivash	33c858774b	fix coding standard compliance	2018-07-23 21:01:43 +03:00
r3tk0n	bc91affa70	Bring this PR inline with RC70.1 PR.	2018-07-20 15:13:44 -07:00
SamGondelman	763e6465a2	followNormal, fixin stuff	2018-07-20 10:41:24 -07:00
Alexander Ivash	849c91d8f6	remove not necessary EntityTreeRenderer from removeAvatarEntities's condition	2018-07-20 19:32:58 +03:00
Alexander Ivash	fb8640de47	FB16870: Avatar Wearables showing incorrect number	2018-07-20 02:51:17 +03:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
MuteTab	dfcf47e8ee	Removed useless comment.	2018-07-19 14:44:32 -07:00
MuteTab	8d65e14193	Remove one change, turned out to be unnecessary.	2018-07-19 14:43:46 -07:00
MuteTab	3080539b63	Make getFlyingEnabled() always true when in desktop.	2018-07-19 14:40:20 -07:00
amantley	5ec7ab3a7d	removed the other way of computing the average lookat which used a ring buffer	2018-07-18 17:20:47 -07:00
amantley	a8c4f4e650	removed extra whitespace	2018-07-18 17:10:09 -07:00
amantley	7cc724a27b	added properties to allow the toggling of the debug draw the look at vector, and the reset moving average look at on step detection	2018-07-18 17:08:04 -07:00
amantley	ef2d3c9f16	Merge remote-tracking branch 'upstream/master' into rotateFilterChange synching with master	2018-07-18 09:00:18 -07:00
Qliemillar	080d664341	Merge pull request #13619 from luiscuenca/handTouchDisabler Allow creators to disable hand touch from javascript	2018-07-18 08:16:37 -06:00
amantley	33f9acde67	latest	2018-07-17 17:42:11 -07:00
luiscuenca	e3594fe1b7	mutex added	2018-07-17 17:23:03 -07:00
luiscuenca	ba884f8a94	Forgotten coment	2018-07-17 16:42:59 -07:00
luiscuenca	6225435385	some ortographic fixes	2018-07-17 16:38:34 -07:00
luiscuenca	fcb7614f7e	Format and fixes	2018-07-17 16:34:30 -07:00
SamGondelman	845ddda695	parabola-overlay and -avatar intersection, handle case where acceleration == 0	2018-07-17 12:41:03 -07:00
Qliemillar	d498d6bb3d	Merge pull request #13617 from amantley/rotateRecenter Reduce Frequent Flipping of Avatar Facing Direction By Resetting _headControllerFacingMovingAverage	2018-07-17 08:57:24 -06:00
luiscuenca	82a3b73de8	Added disable hand touch for entityID	2018-07-17 07:06:48 -07:00
luiscuenca	84dac94379	Allow creator to disable hand touch	2018-07-16 17:03:50 -07:00
amantley	abb2c7ef14	Added reset of the _headControllerFacingMovingAverage in MyAvatar.cpp prePhysicsUpdate(). This stops some of the flipping back and forth that has been happening with rotational recenter.	2018-07-16 11:29:49 -07:00
Zach Fox	ac2351e49f	Make JSDoc happy	2018-07-16 11:00:27 -07:00
Zach Fox	4daa0c6537	CR feedback	2018-07-13 12:47:45 -07:00
Zach Fox	92756d81ad	Implement MS16562: Massive PAL speedup!	2018-07-12 15:05:31 -07:00
Anthony Thibault	1d33f51ca4	Merge pull request #13528 from amantley/integratedStepping Step Detection From Head and Hands Tracking	2018-07-10 09:59:22 -07:00
John Conklin II	81f5631ce9	Merge pull request #13386 from ElderOrb/FB13949 AvatarApp	2018-07-09 15:20:18 -07:00
amantley	cb421fd5b0	fixed build errors for mac and linux	2018-07-09 15:09:45 -07:00
amantley	55ae08c071	Merge remote-tracking branch 'upstream/master' into integratedStepping	2018-07-09 13:55:59 -07:00
amantley	b2d77ef51a	bracket spacing	2018-07-09 13:54:18 -07:00
amantley	7ed8f17b57	tweaked posterior threshold and head velocity threshold	2018-07-09 13:49:21 -07:00
amantley	a3417cace9	implemented code review changes. 1. checking for divide by zero before glm::normalize. 2. clearing the ring buffer on reset. 3. renaming _standingHeightMode to _currentStandingHeight	2018-07-09 11:58:02 -07:00
John Conklin II	e6801c303a	Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request Implement AvatarRequestIdentity and use if interface gets unknown avatar data	2018-07-09 10:07:19 -07:00
amantley	defd6f88e6	started changes suggested by code review, ie mode computation	2018-07-06 18:17:13 -07:00
Simon Walton	607a898c32	Transmit a maximum number of identity requests before giving up	2018-07-06 15:16:13 -07:00
Alexander Ivash	aaa2e3f6a8	fix issue with duplicated wearables on switching between bookmarks / cancelling 'adjust wearables'	2018-07-06 21:00:56 +03:00
Alexander Ivash	7fa09aef8f	slightly update jsdoc with functions description	2018-07-06 21:00:55 +03:00
Alexander Ivash	dbcc654af1	remove comments	2018-07-06 21:00:55 +03:00
Alexander Ivash	3ac44376b2	bind Settings page to a backend	2018-07-06 21:00:53 +03:00
Alexander Ivash	b6769f9678	avatar selection & wearables adjustments work-on-progress	2018-07-06 21:00:52 +03:00
Alexander Ivash	5007c259bb	query real avatar favorites (but use fake urls for now)	2018-07-06 21:00:52 +03:00
Dante Ruiz	533164e1e4	some more fixes	2018-07-06 08:55:20 -07:00
Simon Walton	f77b2903a1	Minor tweaks	2018-07-05 17:13:27 -07:00
SamGondelman	7954865141	trying to fix dependency shutdown	2018-07-05 14:34:37 -07:00
amantley	0ebc7fc29e	fixed the mode computation so that it can keep track of all long term height frequencies. This makes it unnecessary to reset the mode, because it will revert back to the highest frequency	2018-07-05 13:41:06 -07:00
Anthony Thibault	c840670a54	Merge pull request #13519 from hyperlogic/bug-fix/stable-pole-vector-smoothing Bug fix for unexpected avatar knee shifts for users wearing Vive Trackers.	2018-07-03 21:50:57 -07:00
amantley	6460c9e861	fixed case for 0.0 as the filter length	2018-07-03 17:11:19 -07:00
Simon Walton	ec67b8ad56	Address reviewer comments	2018-07-03 15:31:34 -07:00
amantley	4995b57712	removed print statements and fixed rotation threshold update code	2018-07-03 14:31:36 -07:00
amantley	59dfe80940	Merge remote-tracking branch 'upstream/master' into integratedStepping	2018-07-03 11:47:09 -07:00
amantley	9e5763ea5c	adding the recentering back into the non hmd lean code	2018-07-03 11:46:59 -07:00
amantley	3424f412aa	Merge pull request #13437 from amantley/lurchfix Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)	2018-07-03 19:38:01 +01:00
amantley	f216316b55	removed some comments and whitespace	2018-07-02 18:19:31 -07:00
amantley	47110d080f	removed clang induced changes to MyAvatar.cpp	2018-07-02 17:06:16 -07:00
amantley	7f5f762208	fixing merge conflict	2018-07-02 15:54:21 -07:00
amantley	096d0d2827	reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update	2018-07-02 15:43:57 -07:00
Anthony J. Thibault	fff4348a0f	Bug fix for poleVector smoothing Needs to occur in sensor space rather then avatar space.	2018-06-29 17:54:21 -07:00
amantley	44d9edec3c	added the properties for filter length and rotation threshold to MyAvatar class This will help us test the right combo for head based turning	2018-06-29 14:42:23 -07:00
amantley	c9c222a253	added the failsafe code to the stepping	2018-06-29 11:33:42 -07:00
amantley	15a17ae32a	finished the step detection, need to finish the failsafe	2018-06-28 18:36:13 -07:00
John Conklin II	0a0e1668d5	Merge pull request #13478 from amantley/glowingOrbMaster The client should render "something" for an avatar even if mesh or identity is not available	2018-06-28 12:12:16 -07:00
amantley	3e6d54e83c	added all the parts for the step conditional to do: failsafe	2018-06-28 11:56:46 -07:00
John Conklin II	138342ba91	Merge pull request #13485 from zfox23/MS16257_clearOverlay Implement MS16257: Remove 'clear overlay when moving' setting and code	2018-06-28 09:31:04 -07:00
Angus Antley	2307c8e24a	more work on the mode threshold	2018-06-28 15:40:42 +01:00
amantley	621ca7d2b4	more work on the mode function	2018-06-27 18:46:24 -07:00
amantley	61a935dbb5	added the first pass at mode computation	2018-06-27 18:02:11 -07:00
John Conklin II	0cb8b4dfa1	Merge pull request #13471 from danteruiz/disable-flying-by-default Disable flying by default	2018-06-27 16:04:16 -07:00
amantley	205cd44a49	removed override keyword from OtherAvatar and MyAvatar destructors, also added the virtual keyword to the createOrb virtual method in OtherAvatar	2018-06-27 14:31:39 -07:00
amantley	7b49ae4950	added the within threshold of height function and to do: the mode computation	2018-06-27 14:23:24 -07:00
Zach Fox	cfc8c0fb09	Implement MS16257: Remove 'clear overlay when moving' setting and code	2018-06-27 14:07:04 -07:00
John Conklin II	b9439d1e6b	Merge pull request #13384 from ctrlaltdavid/21892 Fix entity detaching from head joint not becoming visible	2018-06-27 12:32:52 -07:00
amantley	99ff5f9140	made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly	2018-06-27 11:59:53 -07:00
amantley	1804422df0	remove orb in the otherAvatar destructor, and check _otherAvatarOrbMeshPlaceholder pointer before updating the position	2018-06-27 11:15:42 -07:00
amantley	3893b7e339	added the head angular velocity check	2018-06-27 10:37:54 -07:00
amantley	8cf59783d1	removed white space	2018-06-27 09:20:46 -07:00
amantley	be6fadbc2d	Merge remote-tracking branch 'upstream/master' into integratedStepping	2018-06-27 09:16:43 -07:00
Angus Antley	eba4a27329	added newline to the end of AvatarManager.cpp	2018-06-27 05:59:53 +01:00
amantley	39edc21423	spaced comment fixed	2018-06-26 17:47:36 -07:00
amantley	8b13905d6c	final final final coding standards	2018-06-26 17:43:45 -07:00
amantley	a89c2ea734	removed crust	2018-06-26 16:40:51 -07:00
amantley	46c70d948f	Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn	2018-06-26 15:11:58 -07:00
Dante Ruiz	3cf36bed55	making small adjustments	2018-06-26 14:57:15 -07:00
Dante Ruiz	1fec900ba6	disable flying by default	2018-06-26 13:31:59 -07:00
amantley	fa1a9d04e0	everything working before trying to move otheravatar to interface	2018-06-26 13:18:26 -07:00
Angus Antley	b8dea4b869	adding changes to add the orb when an avatar is processed by the avatar mixer and when a new model is being loaded for an avatar. The orb is removed when the geometry has loaded.	2018-06-26 06:27:18 +01:00
Andrew Meadows	756f34761f	don't build AvatarMotionStates until physics enabled	2018-06-25 10:37:54 -07:00
David Rowe	af3861def8	Code review	2018-06-25 16:33:05 +12:00
David Rowe	40fb627504	Merge branch 'master' into 21892	2018-06-25 16:04:44 +12:00
Simon Walton	0dca842102	Add avatar identity requests to analytics	2018-06-22 17:06:33 -07:00
Simon Walton	269d803812	New approach to tracking no-identity duration	2018-06-22 16:42:37 -07:00
John Conklin II	b7069fff71	Merge pull request #13382 from SamGondelman/particleFix Fix Particle Entities	2018-06-22 13:27:11 -07:00
Simon Walton	e5b35b1cd9	Clang doesn't support digit separators yet	2018-06-22 12:01:00 -07:00
Sam Gondelman	44a7d04b2a	Merge pull request #13426 from SamGondelman/avatarPriority Highest loading priorities for avatars and attachments	2018-06-22 11:22:10 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
amantley	3027f8242c	added the conditional for leaving the base of support to pre physics update in MyAvatar.cpp	2018-06-21 17:23:03 -07:00
Simon Walton	6796af4b6a	Move sendAvatarIdentityRequest() to a more logical location	2018-06-21 15:00:51 -07:00
amantley	e4ca6c6303	added the fixes for the lurch that happens when driving or flying	2018-06-21 11:22:26 -07:00
amantley	8fc04776f9	starting to implement the step detection code in MyAvatar.cpp	2018-06-21 10:59:07 -07:00
Simon Walton	d789c4573b	Add couple of comments	2018-06-20 17:44:58 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
SamGondelman	8014f61243	loading priorities for avatars and attachments	2018-06-20 12:29:28 -07:00
Simon Walton	d638bdd986	First pass at requesting ID for unknown data Keep list of AvatarData that was created from a data packet without a matching ID. If items get old enough send an ID request and remove them.	2018-06-20 12:21:39 -07:00
sabrina-shanman	a8b2da14cf	Format numeric constant in strafe crash commit to match coding standards	2018-06-20 08:45:12 -07:00
sabrina-shanman	45fdf3d68f	Fix crash when walking sideways	2018-06-19 17:23:00 -07:00
Andrew Meadows	085130e3c9	avatars collide again again	2018-06-18 13:17:32 -07:00
David Rowe	be4b929301	Fix cauterization when reparent entity to a different joint	2018-06-16 16:31:06 +12:00
David Rowe	4dd6ba1d18	Fix Mac crash	2018-06-16 16:29:45 +12:00
David Rowe	249f72758e	Fix entity detaching from head joint not becoming visible	2018-06-15 16:36:16 +12:00
John Conklin II	0ba97fa83b	Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags Scripted Blendshapes and Procedural Face Movement Flags	2018-06-13 10:32:59 -07:00
Clement	920263ef49	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-06-12 17:00:25 -07:00
Andrew Meadows	d31ee52d79	revert PR-13162 from RC68	2018-06-12 03:51:55 -07:00
Anthony J. Thibault	042f902d2e	Merge branch 'master' into scriptedBlendshapesFaceFlags	2018-06-11 17:13:30 -07:00
Anthony J. Thibault	f773aef053	Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68	2018-06-11 11:06:21 -07:00
Anthony J. Thibault	b8379045a8	Fix MyAvatar::isReadyForPhysics() in serverless domains.	2018-06-11 09:53:34 -07:00
Sam Gondelman	be28097279	Merge pull request #13339 from SamGondelman/avatarHash Possibly fix avatarHash crash	2018-06-11 09:39:40 -07:00
Anthony Thibault	044d142635	Merge pull request #13133 from amantley/nativeCGCode Center of Gravity Leaning	2018-06-08 17:53:55 -07:00
SamGondelman	a7d75b121f	fix avatarHash crash	2018-06-08 11:20:41 -07:00
amantley	913d78841d	Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes synching with upstream master	2018-06-07 16:20:11 -07:00
Anthony J. Thibault	608575cf17	Large avatars should instantly shrink when entering small height domains Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.	2018-06-07 15:31:40 -07:00
amantley	836c3da858	cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement	2018-06-07 15:11:57 -07:00
amantley	97831e61f0	removed stray comments	2018-06-07 12:54:46 -07:00
Sam Gateau	a1899e80c0	Merge pull request #13290 from AndrewMeadows/update-queryAACube update server-side bounding box more correctly for grabbed things	2018-06-06 11:46:09 -07:00
amantley	f21431ca88	added check for the actual face tracker in MyHead.cpp to prevent crash	2018-06-05 16:33:28 -07:00
Anthony J. Thibault	b5a3b25adc	Tuned hip smoothing times.	2018-06-05 16:07:54 -07:00
Anthony J. Thibault	993d035d37	Smooth out fly to idle transition, to prevent hip thrusting and pops.	2018-06-05 15:45:19 -07:00
amantley	5132466ca0	kept the transient coeff. and sending the blendshapes accross the network. and removed procedural updates to face from myhead.cpp	2018-06-05 13:32:45 -07:00
Anthony J. Thibault	558711f906	Smooth hips transition between idle and fly. Also, take dt into account for the critically damped spring lerp calculation.	2018-06-04 16:57:41 -07:00
amantley	61592cdada	completed first try at all changes for scripted blendshapes	2018-06-04 16:37:47 -07:00
David Rowe	b5028a9626	Merge branch 'master' into 21880 # Conflicts: # interface./src/scripting/WindowScriptingInterface.h	2018-06-05 09:13:54 +12:00
Anthony J. Thibault	c3d1daf855	Merge branch 'master' into nativeCGCode	2018-06-04 09:32:38 -07:00
Andrew Meadows	9ae19714b5	also update queryAACube for children of worn entities	2018-06-01 16:38:57 -07:00
amantley	01848fafe0	made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present	2018-06-01 11:37:11 -07:00
amantley	3bda5bf6a0	added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h	2018-05-31 17:58:37 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
amantley	7cc5e96f2d	Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes merging hifi master to update the branch	2018-05-31 10:35:31 -07:00
Sam Gateau	513acc529e	INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine	2018-05-30 23:31:54 -07:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
samcake	873cabe284	Cleaning the code	2018-05-29 17:46:25 -07:00
David Rowe	0db440931e	Miscellaneous JSDoc fixes	2018-05-30 10:02:30 +12:00
samcake	82503a9e64	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-29 08:59:37 -07:00
Sam Gateau	678effdb48	Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey	2018-05-26 23:28:59 -07:00
Sam Gateau	aa49595a23	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-24 18:19:55 -07:00
NissimHadar	d01482bf68	Now looks for an actual change in the boom length (vs a change has been requested).	2018-05-24 17:44:39 -07:00
NissimHadar	9ed8c04097	Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode	2018-05-24 17:40:21 -07:00
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c JSDoc fixes	2018-05-24 16:44:55 -07:00
samcake	44a8d880fa	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-24 14:31:53 -07:00
Andrew Meadows	31dd59d212	double bits in collision groups	2018-05-24 11:28:52 -07:00
Sam Gateau	13d02011f3	There and back again...	2018-05-24 00:53:29 -07:00
samcake	5bede45c85	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-23 11:26:07 -07:00
NissimHadar	e07e716d40	Fixed stupid gcc warning.	2018-05-23 07:35:25 -07:00
NissimHadar	06203d44d8	Correct `Camera.mode` command.	2018-05-22 17:08:28 -07:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
samcake	3aaa01788c	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-18 17:42:30 -07:00
samcake	36a08fdd84	Friday night end of the day, last compilation.... almost	2018-05-18 17:41:28 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
samcake	aa18aaa7b1	Maybe	2018-05-17 18:06:46 -07:00
David Rowe	6db4dd8673	Merge branch 'master' into 21872-b # Conflicts: # interface/src/ui/Snapshot.h	2018-05-17 20:11:14 +12:00
samcake	735db27919	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-16 17:18:23 -07:00
John Conklin II	8d437892cb	Merge pull request #13175 from luiscuenca/fixAvatarDisappearing Fix hips position when flying	2018-05-16 12:37:07 -07:00
Dante Ruiz	e676348c4f	fixing some menu reog bugs	2018-05-16 10:40:28 -07:00
luiscuenca	7b48dc2370	normalize vector	2018-05-16 10:17:38 -07:00
David Rowe	f629022b8c	AvatarList API JSDoc stubs	2018-05-16 10:16:13 +12:00
David Rowe	fdeb0e3305	Avatar API JSDoc stubs	2018-05-16 09:20:54 +12:00
luiscuenca	4b09f1dc30	Fix vector transformation when calculating flying hip position	2018-05-15 14:19:17 -07:00
Andrew Meadows	c5773cbe84	restore 'virtual' keyword for overrides	2018-05-15 13:59:22 -07:00
Thijs Wenker	8b4298514e	send out one last blendshape update when setting MyAvatar.hasScriptedBlendshapes to false	2018-05-15 21:39:17 +02:00
Thijs Wenker	bfe210da75	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-05-15 16:48:51 +02:00
Anthony J. Thibault	ec638d9d91	Avatar can now look straight down without spinning 180. Also, come code clean up and removal of unnecessary Y_180 flips.	2018-05-14 13:48:04 -07:00
Andrew Meadows	a30e06d594	don't blend avatar position when far from target	2018-05-14 09:58:16 -07:00
Anthony J. Thibault	1cc7eb635f	Fix ubuntu warning by removing cancelOutRollAndPitch2()	2018-05-14 09:13:26 -07:00
Anthony J. Thibault	274ac98bd6	Merge branch 'master' into nativeCGCode	2018-05-14 09:12:08 -07:00
vladest	0a67fc3b36	Merge conflicts	2018-05-12 11:24:35 +02:00
Andrew Meadows	6de175e794	avatars collide again	2018-05-11 17:01:48 -07:00
John Conklin II	5cd225e4de	Merge pull request #12947 from jherico/feature/splash2 Additional work on splash screen	2018-05-11 11:26:37 -07:00
amantley	20c960c0da	removed white space in MyAvatar.cpp	2018-05-09 15:00:20 -07:00
amantley	eff84de99f	added more straight forward computation of the hips rotation inMyAvatar.cpp contributed by AJT	2018-05-09 14:55:10 -07:00
amantley	50f225777a	removed debug code from cg code in MyAvatar.cpp	2018-05-09 11:31:19 -07:00
amantley	a7955b642a	removed the follow hips code from pre physics update	2018-05-09 11:27:04 -07:00
amantley	77aedc1512	changed lerp to saferLerp in cg code	2018-05-09 11:14:13 -07:00
amantley	8000bcd272	cleaned up cg code ie computeNewHipsRotation	2018-05-08 18:12:53 -07:00
amantley	6051f4b8ff	Merge remote-tracking branch 'origin/nativeCGCode' into nativeCGCode synching the branch with the remote repo	2018-05-08 10:55:14 -07:00
amantley	544967ef3b	added test function to cancel out roll and pitch	2018-05-08 10:55:10 -07:00
amantley	bbf8c73572	code review changes to declare functions static	2018-05-08 10:52:28 -07:00
amantley	3a10cacec0	1.added the swing twist code to update the follow rotation in MyAvatar.cpp 2.added step.js and cg_lean.js to the developer folder 3.added menu item for toggling the hips following between head and hips 4.added new function to return true if the root of MyAvatar is translating to be under the head. Used to smooth the path of the hips 5.added computeCounterBalance to MyAvatar.h and cpp 6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp 7.added head yaw into the calculation of the hip rotation for the center of gravity. This is already was happening in the deriveBodyFromHMD code that is default 8.Changed Constants in Avatar constants for the base of support 9.fixed the over rotation of the shoulders 10.fixed scaling problem in cg computation 11.added room for going up on the toes without stretching	2018-05-07 17:41:35 -07:00
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
Clément Brisset	39e2a78b1a	Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist Multifrustum queries punchlist	2018-05-04 15:50:44 -07:00
John Conklin II	c7bc479c60	Merge pull request #13094 from hyperlogic/bug-fix/case-14639 Fix for crash deep in QML after useFullAvatarURL	2018-05-04 11:33:28 -07:00
Clement	27c471ee97	Move all wire frustums to conical frustums	2018-05-03 18:19:29 -07:00
Stephen Birarda	21396287a4	Merge pull request #12990 from Atlante45/fix/spec-cam-av Add support for multifrustum avatar queries	2018-05-03 18:18:51 -07:00
Anthony J. Thibault	fc9bd7f905	Fix for crash deep in QML after useFullAvatarURL Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL(). This prevents the error case where a QEventLoop is entered during QML execution.	2018-05-03 14:06:06 -07:00
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
Seth Alves	b68d9ecd68	Merge pull request #12985 from druiz17/attachments-disappearing fixing avatr attachments not being visible when coming out of first person	2018-05-02 18:50:41 -07:00
John Conklin II	7a5fce4315	Merge pull request #12991 from luiscuenca/avatarScript Avatar Scripts	2018-05-02 12:23:13 -07:00
luiscuenca	689fbd2da0	added requested changes	2018-05-02 11:09:17 -07:00
Clement	538f24162f	Define ViewFrustums type alias	2018-05-01 18:03:21 -07:00
Clement	21213e81f4	Multiview support for priority queue	2018-05-01 18:03:21 -07:00
luiscuenca	2ac7fcadd2	load scripts once on rigReady	2018-05-01 09:37:01 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
Thijs Wenker	9e086dda3c	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-30 17:32:49 +02:00
vladest	be22f49c32	Merge branch 'master' into menu-updates	2018-04-28 20:22:28 +02:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
Anthony J. Thibault	c6b12307aa	Added custom jsdoc tags to High Fidelity There are 4 new jsdoc tags: * @hifi-interface - indicates that this namespace or class is available in Interface Scripts. * @hifi-assignment-client - indicates that this namespace or class is available in Assignment Client Scripts. * @hifi-client-entity - indicates that this namespace or class is available in Client Entity Scripts. * @hifi-server-entity - indicates that this namespace or class is avaialbe in Server Entity Scripts. These tags should appear just after the @class or @namespace tag. For example: /*jsdoc Your avatar is your in-world representation of you. The <code>MyAvatar</code> API is used to manipulate the avatar. * For example, you can customize the avatar's appearance, run custom avatar animations, * change the avatar's position within the domain, or manage the avatar's collisions with other objects. * * @namespace MyAvatar * * @hifi-interface * @hifi-client-entity *	2018-04-26 14:13:42 -07:00
Thijs Wenker	20b9e44844	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-26 22:37:15 +02:00
vladest	3296ae0db8	Merge branch 'master' into menu-updates	2018-04-26 22:21:40 +02:00
David Rowe	08dc9b133f	Docs to JSDoc review	2018-04-26 21:10:28 +12:00
luiscuenca	12f578c93c	More fixes	2018-04-25 19:46:31 -07:00
luiscuenca	e0770f06b1	Add scripts to Model Packager	2018-04-25 19:35:26 -07:00
Thijs Wenker	bbd31d590b	defaults	2018-04-26 03:12:44 +02:00
Thijs Wenker	8b7a07577c	Merge branch 'master' of git@github.com:highfidelity/hifi.git into feat/hasScriptedBlendshapes	2018-04-26 03:09:44 +02:00
MiladNazeri	0f87e53902	Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate Docs/docs to js docs update	2018-04-25 12:26:19 -07:00
Thijs Wenker	484e20ea55	JSDOC - change bool type to boolean, to match JS type	2018-04-25 19:01:18 +02:00
Thijs Wenker	192e48a376	style fix + JSDocs	2018-04-25 13:47:00 +02:00
milad nazeri	4c736b2d62	Fixed defaults	2018-04-24 21:38:48 -07:00
David Rowe	cae9447ac5	Doc review	2018-04-25 15:09:47 +12:00
luiscuenca	165c3214a7	Avatar Scripts	2018-04-24 18:43:53 -07:00
Dante Ruiz	29fce488e4	make some changes	2018-04-24 14:00:52 -07:00
Dante Ruiz	b2925c5843	fixing attachments not being visible when coming out of first person	2018-04-24 13:32:30 -07:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
Thijs Wenker	b0187ecfd3	add MyAvatar.hasAudioEnabledFaceMovement API property which is enabled by default	2018-04-24 19:24:23 +02:00
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
David Rowe	98f43b6a70	Interim JSDoc for MyAvatar - stubs for remainder	2018-04-24 10:47:33 +12:00
David Rowe	719062dd9f	Interim JSDoc for MyAvatar - first pass	2018-04-24 09:10:59 +12:00
milad nazeri	4ac06fe99f	Updating previous jsdocs	2018-04-22 22:22:33 -07:00
milad nazeri	e9b9c05b5d	removed cruft	2018-04-22 08:51:47 -07:00
vladest	6d53512c6c	Merge	2018-04-15 15:24:16 +02:00
Thijs Wenker	2e396fd1b9	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-12 23:36:27 +02:00
John Conklin II	7bcaa12c50	Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix Typo corrected: getAnimatationRoles to getAnimationRoles	2018-04-12 10:32:09 -07:00
Thijs Wenker	a0f6afb53d	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-03 16:45:11 +02:00
John Conklin II	74ca98dc81	Merge pull request #12727 from amantley/triggerRecenterBehaviour Trigger Avatar Recenter Behaviour	2018-04-02 14:42:21 -07:00
John Conklin II	796bd069b2	Merge pull request #12659 from alexiamandeville/script_charcontroller Updating char controller	2018-04-02 13:24:15 -07:00
amantley	3f44b88d2d	added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class	2018-03-29 10:09:51 -07:00
amantley	90d87c5b5d	changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety	2018-03-28 14:00:36 -07:00
amantley	4b1f974561	fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h	2018-03-28 11:57:48 -07:00
amantley	95f1d0e4fa	added get and set functions for the activate recenter variables	2018-03-28 10:33:00 -07:00
Thijs Wenker	3184aa51b1	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-03-28 19:15:13 +02:00
amantley	9f3b82a417	added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly	2018-03-27 18:21:14 -07:00
Thijs Wenker	7309f9d82c	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-03-23 17:51:43 +01:00
Dante Ruiz	f36a916fb6	revert comment change	2018-03-22 17:44:17 -07:00
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Flame Soulis	9d9b08803c	Corrected getAnimatationRoles to getAnimationRoles	2018-03-19 01:17:46 -04:00
samcake	a896e9872c	adressing the avatar vissibility switch	2018-03-14 17:09:23 -07:00
Dante Ruiz	00fa5cfd06	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-13 10:08:00 -07:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 Entities API JSDoc	2018-03-12 14:40:09 -07:00
Alexia Mandeville	c5b8a2d06e	Revert "Increasing speed on mousescroll - zooming in/out of avatar" This reverts commit `748507f1e3`.	2018-03-12 13:18:02 -07:00
Alexia Mandeville	6ddb91e593	Revert "Updating default mouse pitch/yaw input to be more stabilized" This reverts commit `2598be16f8`.	2018-03-12 13:17:48 -07:00
Alexia Mandeville	748507f1e3	Increasing speed on mousescroll - zooming in/out of avatar	2018-03-10 22:20:00 -08:00
Alexia Mandeville	2598be16f8	Updating default mouse pitch/yaw input to be more stabilized	2018-03-10 21:46:20 -08:00
samcake	10447bf10e	Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there	2018-03-09 13:04:04 -08:00
Dante Ruiz	c949b44f0c	conforming to coding standards	2018-03-09 10:42:19 -08:00
Dante Ruiz	cfa85b5137	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-09 09:37:08 -08:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
NissimHadar	d1b87b3116	Added missing avatar shadows.	2018-03-08 12:14:42 -08:00
Dante Ruiz	297273de08	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-07 13:09:47 -08:00
Dante Ruiz	a70509233e	making small changes	2018-03-07 08:25:27 -08:00
David Rowe	eeb7f5ca8d	Doc review	2018-03-07 17:29:39 +13:00
Thijs Wenker	90b77030d5	MyAvatar.hasScriptedBlendshapes property	2018-03-07 02:55:47 +01:00
Thijs Wenker	866bec0b34	rule -> role	2018-03-07 02:36:07 +01:00
Dante Ruiz	69af12fbc7	chaning speeds	2018-03-06 15:47:01 -08:00
Dante Ruiz	fe363e7f2a	changing keybaord mapping	2018-03-06 14:16:25 -08:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" This reverts commit `3201d2ba21`, reversing changes made to `c0f20900a0`.	2018-02-27 11:33:05 -08:00
David Rowe	1fb02d15d7	Entities actions JSDoc	2018-02-27 14:12:20 +13:00
John Conklin II	6316f33282	Merge pull request #12485 from dback2/avatarMotors Add dynamic mode for scripted avatar motor	2018-02-26 11:03:30 -08:00
John Conklin II	3201d2ba21	Merge pull request #12407 from NissimHadar/shadowControlsOffZvork Shadow control for zones, models and shapes	2018-02-26 10:13:40 -08:00
David Back	283b5724ba	CR changes	2018-02-23 15:02:51 -08:00
David Back	da391564a8	CR changes	2018-02-23 15:01:29 -08:00
David Back	a418129bea	simplify to just changing timescales	2018-02-23 15:00:23 -08:00
David Back	083e461eb0	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors	2018-02-22 17:20:49 -08:00
David Back	902672f85e	add dynamic mode for scripted avatar motor	2018-02-22 17:20:36 -08:00
Nissim Hadar	bf4ba07b72	Added parameters to canCastShadow - still sucks.	2018-02-21 12:36:34 -08:00
Zach Fox	74655bde49	Fix skeletonmodelURLchanged signal	2018-02-21 12:12:20 -08:00
Nissim Hadar	4c1f22f84e	Models and Avatar cast shadows (box doesn't, yet).	2018-02-16 14:01:33 -08:00
Nissim Hadar	194c7f4101	WIP - for review.	2018-02-16 09:28:15 -08:00
Bradley Austin Davis	33690e09b7	Merge pull request #12399 from samcake/blue Introducing group culling to avoid the avatar model to be partially culled	2018-02-14 15:38:52 -08:00
samcake	1d3ae1b187	Work in progress to get the render items beeing tagged correctly for groupCulled	2018-02-13 17:50:01 -08:00
Dante Ruiz	45f09dde96	address tony's requests	2018-02-13 10:32:15 -08:00
Dante Ruiz	1a25332575	fix indenting	2018-02-12 10:59:25 -08:00
Dante Ruiz	3c84318918	fixing merge conflict	2018-02-12 10:57:55 -08:00
Dante Ruiz	d381beb213	cleaning up code	2018-02-12 10:53:42 -08:00
Dante Ruiz	5325b22b01	working on lambdas	2018-02-09 16:46:11 -08:00
Dante Ruiz	b3a3d92131	Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update	2018-02-09 10:31:43 -08:00
Dante Ruiz	beb41495d5	save avatarUrl when setting new skeletonModelUrl	2018-02-09 09:35:24 -08:00
Seth Alves	3e913cfcfe	AvatarActionHold has positional and rotational targets	2018-02-07 10:45:13 -08:00
Dante Ruiz	e87067f93d	fix variable naming and edge case	2018-02-05 15:31:37 -08:00
Dante Ruiz	d593e7107c	fix merge conflict	2018-02-02 13:29:31 -08:00
Seth Alves	861497e907	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-02-02 08:56:18 -08:00
Seth Alves	14d5029f4d	only update cauterization of child entities when something relevant changes	2018-02-02 08:56:11 -08:00
Anthony J. Thibault	b23f98b311	Removal of hips offset shifting from AnimInverseKinematics node With the addition of the hips IK target, the hips offset shifting code is no longer necessary. This PR should not effect any behavior, but it removes this unused code from the animation system.	2018-01-31 17:56:33 -08:00
Seth Alves	64a46bf5df	merge from upstream	2018-01-31 10:43:41 -08:00
Bradley Austin Davis	b97c938544	Merge pull request #12216 from thoys/feat/js-script-console-auto-complete JS scripting console auto-complete	2018-01-31 10:39:51 -08:00
MiladNazeri	3585bead96	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
Dante Ruiz	264aa7f4d2	Merge pull request #12191 from druiz17/entity-attachment-bookmark Bookmark avatar entities	2018-01-29 12:55:35 -08:00
Seth Alves	98e0e663e7	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-01-29 12:36:37 -08:00
Dante Ruiz	a670a0b9a2	Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark	2018-01-29 11:25:26 -08:00
Seth Alves	17ec79f182	add breaks in case statements that used to have returns	2018-01-26 10:36:16 -08:00
Sam Gateau	51dac04374	Introducing the tag in lieu of the vsisiblity mask	2018-01-26 02:59:43 -08:00
Seth Alves	b6f7d2eb89	print warnings if head position contains not-a-number	2018-01-25 15:15:59 -08:00
Thijs Wenker	45487a1e45	Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete # Conflicts: # interface/CMakeLists.txt	2018-01-25 22:51:35 +01:00
Dante Ruiz	2cbcc28bd4	only call init animGraph once	2018-01-24 10:44:04 -08:00
Seth Alves	1cbc2e31cf	merge from upstream	2018-01-23 15:21:03 -08:00
Dante Ruiz	071f7d54d9	Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update	2018-01-23 14:44:26 -08:00
Dante Ruiz	6a03557801	don't override sensorToWorldMatrix	2018-01-23 14:44:10 -08:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
Brad Davis	8ae0b09ea2	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
Thijs Wenker	e8955fcd32	Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete	2018-01-22 23:37:24 +01:00
Thijs Wenker	f4e6606c8d	fix MyAvatar JS API typo	2018-01-22 19:01:13 +01:00
Seth Alves	31c007d167	more backwards logic, added withViewVisibilityMask call in ItemKey	2018-01-18 14:15:30 -08:00
Seth Alves	fb974b0b9c	attempt to straighten out use of view-visibility masks	2018-01-18 10:09:23 -08:00
Anthony J. Thibault	c5efcf5d6a	Bug fix for cocked head after playing an input recording. I thought this was the cause of the Manuscript case 11454 but apparently not.	2018-01-18 09:21:15 -08:00
Seth Alves	76ef3d7c7d	pull from upstream	2018-01-18 07:01:50 -08:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
Dante Ruiz	eadd3b48bd	bookmark avatar-entities-done	2018-01-17 15:42:07 -08:00
Dante Ruiz	8f22c719b3	Merge pull request #12099 from sethalves/run allow avatar walk-speed to be set from javascript	2018-01-17 13:53:13 -08:00
Seth Alves	33c586de60	Merge pull request #12188 from hyperlogic/feature/small-anim-refactor Remove dangerous "Use Anim Pre and Post Rotations" menu item	2018-01-17 13:41:51 -08:00
Bradley Austin Davis	9f6c2c3cdd	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 11:44:00 -08:00
Dante Ruiz	ebb09f4271	Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark	2018-01-17 11:04:46 -08:00
Dante Ruiz	3abb3d6fcc	trying to add offset	2018-01-17 11:04:32 -08:00
Seth Alves	1e847cf32e	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-17 08:08:13 -08:00
Seth Alves	d3084dc0df	defang	2018-01-17 07:11:27 -08:00
Anthony J. Thibault	51ea2632c0	Remove Avatar UseAnimPreAndPostRotations option. This should always be true and can lead to hard to diagnose bugs if it is ever set to false.	2018-01-16 17:27:19 -08:00
Dante Ruiz	7707e68234	bookmarks add back avatar-entities	2018-01-16 15:37:03 -08:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Brad Davis	7579451c24	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
Seth Alves	e7a3d98ae5	don't draw head-descendent entities when in 1st-person camera mode	2018-01-11 19:34:54 -08:00
Dante Ruiz	96a97b5938	added model transform override	2018-01-11 16:41:45 -08:00
Seth Alves	c09f644612	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-11 09:09:11 -08:00
Seth Alves	aefd294bf2	Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera Improve stability for HMD third person avatars	2018-01-10 17:46:47 -08:00
Brad Davis	560fd38547	Merge remote-tracking branch 'upstream/master' into android	2018-01-10 17:31:50 -08:00
Brad Davis	97593bc4d8	Fixing compiled resource access	2018-01-10 17:18:12 -08:00
Anthony J. Thibault	ae997928c1	Bug fix to prevent wrists entering the avatar's torso. This was inadvertently disabled in PR #11978.	2018-01-10 11:51:44 -08:00
Dante Ruiz	c4253f3b3b	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-09 15:31:38 -08:00
Anthony J. Thibault	e28f13c1db	Merge branch 'master' into bug-fix/better-third-person-camera	2018-01-09 10:34:04 -08:00
Seth Alves	d0ddbc0092	fix warning	2018-01-08 16:52:07 -08:00
Seth Alves	8ed72dd276	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-08 15:53:21 -08:00
Seth Alves	ad389e5072	make avatar walk-speed adjustable from js. add a tablet button to control walking vs running	2018-01-08 15:27:41 -08:00
Anthony Thibault	f4c38b91b3	Merge pull request #12071 from luiscuenca/handTouch Touch feeling for near grab	2018-01-08 12:50:30 -08:00
Seth Alves	1c94c9c11d	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-08 12:27:42 -08:00
Seth Alves	f1c03b2d40	adjust RENDER_HEAD_CUTOFF_DISTANCE so that I don't see my head when I run	2018-01-08 12:27:35 -08:00
Anthony J. Thibault	61edd83987	Improve stability for HMD third person avatars Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person. The reason the hack existed was to make third person camera less nauseating for users. However this had a major drawbacks. It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera. To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.	2018-01-08 11:26:29 -08:00
John Conklin II	d660bbf6e5	Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit Bug fix for sit script.	2018-01-08 09:59:17 -08:00
Seth Alves	f6fed444b0	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-08 07:49:09 -08:00
Howard Stearns	724db93389	Merge pull request #12002 from howard-stearns/consistent-goToUser Consistent go to user	2018-01-07 11:07:39 -08:00
luiscuenca	8a7c68829d	Optimizations, cleanings and globals	2018-01-07 11:56:30 -07:00
Anthony J. Thibault	243dcb88ee	Bug fix for sit script.	2018-01-05 16:20:44 -08:00
luiscuenca	4f6a804fd1	Fix magic numbers	2018-01-05 16:27:48 -07:00
Seth Alves	3cd0ec3336	default run speed is faster, advanced movement on by default	2018-01-05 13:20:41 -08:00
luiscuenca	ef0164c272	Fix tabs	2018-01-04 11:43:51 -07:00
luiscuenca	28d9409bf0	Fix default hand poses	2018-01-04 11:37:37 -07:00
Dante Ruiz	6fa3446c57	joints are being relayed to children	2018-01-02 13:54:13 -08:00
luiscuenca	49bd62ca29	Touch feeling for near grab	2017-12-29 14:04:36 -07:00
Stephen Birarda	e3cbfd92a0	Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back	2017-12-22 15:48:04 -08:00
Stephen Birarda	7bf0cc2f63	cleanup other ref returns of shared pointers from sortables	2017-12-21 15:39:14 -08:00
humbletim	a146b778f7	support additional .extraInfo for ray intersections	2017-12-21 12:35:13 -05:00
howard-stearns	d730b7b87b	consistent goToUser behavior in PAL, and be able to go to flying user.	2017-12-15 17:00:54 -08:00
Anthony Thibault	f3fcac8e58	Merge pull request #11903 from Delanir/IPD8258 8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet	2017-12-15 15:37:27 -08:00
Anthony J. Thibault	c4a7f4843a	Much more stable hips IK target. Target is now estimated in sensor space from the head, which is very deterministic and not prone to feedback from the IK system. Previous the hip was estimated from accumulated IK error deltas, which was not stable, as the error would tend to accumulate if the IK targets could not be reached.	2017-12-13 11:12:32 -08:00
Daniela Fontes	46583a90be	Change abs to fabsf and other corrections requested.	2017-12-09 00:14:36 +00:00
Anthony J. Thibault	542af47e9e	Fix for hand controller avatar scaling. * Added getDomainMaxScale() and getDomainMinScale() to JS api. * Updated scaleAvatar controller module to use this to prevent scaling past the limits. * Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe, so that they can be invoked on the script thread. * Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton. and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.	2017-12-07 17:08:13 -08:00
Andrew Meadows	ed231fa4a1	Merge pull request #11894 from hyperlogic/bug-fix/flying Improvements to HMD flying	2017-12-07 16:31:33 -08:00
Anthony J. Thibault	47b52238d9	code review feedback	2017-12-07 10:49:23 -08:00
Anthony J. Thibault	68ad27a38d	Merge branch 'master' into bug-fix/flying	2017-12-07 10:28:13 -08:00
Anthony J. Thibault	fbcecbfc89	Merge branch 'master' into feature/domain-limited-height	2017-12-07 10:01:33 -08:00
Daniela Fontes	9bc165d8b4	Changing to Smaller Avatar Resizes Tablet	2017-11-30 18:49:53 +00:00
Anthony J. Thibault	a4d70e89df	hmd turn roll tuning * Tighten action motor timescale while flying. This should cause less drift as the user changes direction and should lead to more comfort and control. * Hmd head roll is only enabled if you are forward or backward faster then 2 meters per second. This should prevent un-intentional turning/rolling when hovering or moving at slow speeds. * Documented hmdRoll tuning parameters accessible from JavaScript. * Removed roll feathering code, because it is non-linear and can perhaps induce nausea. * Tuned default dead spot and turning speeds to match Eagle Flight's defaults.	2017-11-28 17:20:26 -08:00
Anthony J. Thibault	7327b79ce3	WIP	2017-11-28 11:37:58 -08:00
Andrew Meadows	e212ac67c1	enable custom avatar sort tuning	2017-11-28 11:30:06 -08:00
Andrew Meadows	d65101c4e9	sort and throttle avatar updates in interface	2017-11-28 09:07:17 -08:00
Anthony J. Thibault	b3896f664d	Made increaseScale and decreaseScale more responsive at limits	2017-11-22 14:45:52 -08:00
Anthony J. Thibault	9f54ce55f3	Change domain setting from min/max avatar scale to min/max avatar height * Domain settings version has been bumped from version 2.0 to 2.1 * Old domain settings for avatar scale will be auto-converted to avatar height * Avatar code has been changed so that limitDomainScale() works with the new height limits * Avatar getUnscaledEyeHeight() was added to C++. * MyAvatar.getHeight() was added to JS.	2017-11-21 13:25:47 -08:00
ZappoMan	b44ced4c21	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Seth Alves	93fd2a6a6b	clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared	2017-11-15 20:10:05 -08:00
luiscuenca	355b465109	make leaveDomain slot private	2017-11-09 16:05:53 -07:00
luiscuenca	10f484c668	6944 Avatar scale is saved across domains	2017-11-09 12:21:23 -07:00
MissLiviRose	45e58b93e5	add skeleton scale change signal so scripts can detect scaling change	2017-11-08 14:23:49 -08:00
ZappoMan	b5199220ab	cleanup SpatiallyNestable Velocity to match WorldVelocity naming	2017-11-02 17:07:53 -07:00
ZappoMan	afaad5fcd7	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-02 13:39:51 -07:00
Seth Alves	12792c3821	stop drawing ignored avatars, even if PAL is still open	2017-11-01 17:26:00 -07:00
ZappoMan	f63db42c0e	migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation	2017-10-28 10:14:25 -07:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -07:00
luiscuenca	f0eab58ebd	Bug 6719 fixed	2017-10-26 09:41:24 -07:00
Zach Fox	1f6d989044	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023	2017-10-23 17:37:43 -07:00
Seth Alves	f2cb5d4aff	clean-up concept of puffed queryAACube	2017-10-19 13:19:13 -07:00
David Rowe	fcc7a3e440	Code review	2017-10-18 21:08:10 +13:00
Seth Alves	f1abb0cd55	don't send avatar-entity updates for queryCube-changes, because avatar-entities don't use them	2017-10-17 19:01:24 -07:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
Bradley Austin Davis	4dcce6ef45	Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.	2017-10-12 17:37:05 -07:00
Anthony J. Thibault	0a943fbe7b	Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread. When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke the destructor of Entities and Overlays, which is very NOT thread safe. The fix is to use a pattern already in use in several places in our codebase. Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place. This allows any thread to use shared_ptrs of SpatiallyNestables without fear.	2017-10-11 17:32:34 -07:00
Seth Alves	23f41457be	Revert "Revert "fix importing of avatar entities"" This reverts commit `28a8b18060`.	2017-10-09 11:52:43 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
Seth Alves	b96fac2f00	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-05 11:43:25 -07:00
Seth Alves	53a49272dc	fix importing of avatar-entities	2017-10-05 11:43:19 -07:00
SamGondelman	0614fd9b4f	fix AvatarManger::findRayIntersection from script thread	2017-10-03 15:31:49 -07:00
Andrew Meadows	8d2153d2f3	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -07:00
Andrew Meadows	171151b92a	use new form of MovingEntitiesOperator ctor	2017-09-29 11:34:32 -07:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 Secondary IPD fixes	2017-09-26 11:53:45 -07:00
Anthony J. Thibault	09c61deda8	Fixes for Vive puck calibration	2017-09-20 15:41:49 -07:00
Cain Kilgore	322b7fc060	Cleanup from Merge	2017-09-20 23:37:33 +01:00
Cain Kilgore	796e9e7ab3	Fixed things	2017-09-20 23:23:30 +01:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
Anthony Thibault	c7fc45e0ae	Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering Avatar Attachments now render correctly	2017-09-15 13:28:00 -07:00
Anthony J. Thibault	3f6c88e77f	Avatar Attachments now render correctly * moved Avatar::fixupModelsInScene off the newly created render thread back to the main thread. * updated Avatar::postUpdate to take a scene pointer, necessary for Avatar::fixupModelsInScene * updated developer/tests/avatarAttachementTest.js to account for recent changes in avatar attachment scale, commit `712aff7ad`. * updated initialization of anim graph to use Model::isLoaded() instead of Model::initWhenReady() to know when the model was completely loaded.	2017-09-15 11:23:09 -07:00
Seth Alves	8a49edbecb	code review	2017-09-15 10:08:35 -07:00
Cain Kilgore	67a5c75a0d	Doesn't need to be here anymore	2017-09-15 06:08:22 +01:00
Cain Kilgore	c2e342ddac	Gravity Implementation	2017-09-15 06:03:56 +01:00
Seth Alves	d89f2b77da	rework ScriptEngine lifetimes using 'smart' pointers	2017-09-14 10:42:21 -07:00
Cain Kilgore	72ca62c4af	Initial Commit - more to do.	2017-09-14 00:25:11 +01:00
Dante Ruiz	fec8482b69	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
Anthony J. Thibault	23ff1b9ead	Fixes for scaling controller display Adds MyAvatar.sensorToWorldScaleChanged signal.	2017-09-05 15:03:41 -07:00
Dante Ruiz	9f2bdce190	Merge pull request #11005 from Armads/WL21424 WL21424 hide head attachments when head joint is hidden	2017-09-05 13:04:14 -07:00
Anthony J. Thibault	a1b94fd9d2	Bug fixes for laser offset and avatar hold action	2017-08-31 17:26:00 -07:00
Anthony J. Thibault	c9cdaadeb5	Better scale support in SpatiallyNestable class. Previously avatar used SpatiallyNestable scale to keep track of model rendering scale. It now uses a new member variable _modelScale instead. This is important because the notion of "Avatar" space does NOT include scale, so this is now reflected correctly in the SpatiallyNestable class. Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale field. a new _dimensions member variable is used instead. The SpatiallyNestable scale field for entities should always be one. Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale. This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint. Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions. Added qDebug stream support for Transform class.	2017-08-30 15:46:36 -07:00
Anthony J. Thibault	9cd8b6991e	Merge branch 'master' into feature/ant-man	2017-08-30 08:58:55 -07:00
Chris Collins	47a2e57e26	Merge pull request #10625 from humbletim/21180-C++ CR 21180-C++ Camera app -- core changes	2017-08-30 07:20:00 -07:00
Anthony J. Thibault	5230b03f4f	clang warning fixes	2017-08-28 10:35:03 -07:00
Anthony J. Thibault	573985c7c9	Merge branch 'master' into feature/ant-man	2017-08-28 09:27:04 -07:00
Anthony J. Thibault	937f400534	Bug fixes for Avatar::getEyeHeight() when no feet joints are present	2017-08-25 18:23:19 -07:00
Anthony J. Thibault	3ac09b7716	Fix run blends and removed debug draws	2017-08-25 15:48:53 -07:00
Anthony J. Thibault	4f830cf1dc	Calculate jump speed based on canonical jump height.	2017-08-25 15:34:51 -07:00
Anthony J. Thibault	e0ff7f5f40	Moved speed constants into AvatarConstants.h	2017-08-25 10:47:54 -07:00
Anthony J. Thibault	dd9ee28b18	Adjust avatar walking and flying speed based on sensor scale factor	2017-08-25 10:10:23 -07:00
Armads	b30562b9ce	Adding checks to hide avatar attachments to other head and facial joints	2017-08-25 10:25:34 -04:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
humbletim	9348048387	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04:00
Anthony J. Thibault	d62a0ea8ff	Correct controller offsets with sensor scaling	2017-08-22 11:43:39 -07:00
Anthony J. Thibault	ffdb10681e	Fix for laser rendering and positioning with sensor scale	2017-08-22 11:07:04 -07:00
Anthony J. Thibault	de2262968e	Fix for CAMERA_RELATIVE controllers with sensor scale	2017-08-22 09:44:32 -07:00
Anthony J. Thibault	8e56404c40	Fixes for flying and rotation re-centering in wikiplanet	2017-08-21 17:42:25 -07:00
Anthony J. Thibault	963ddce7bc	Use eye-height to match user and avatar scales, follow fixes Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.	2017-08-21 17:42:24 -07:00
Anthony J. Thibault	80b660b258	Added userHeight accessors and preference Also made Avatar::getHeight thread-safe	2017-08-21 17:42:23 -07:00
Anthony J. Thibault	d196743986	Added Avatar::getHeight() method	2017-08-21 17:42:22 -07:00
Anthony J. Thibault	a0d72f08ac	Fix for incorrectly scaled avatar collision on startup	2017-08-21 17:42:21 -07:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
SamGondelman	a641fb7a7f	rename qvector findRayIntersection to avoid script conflicts	2017-08-15 18:03:52 -07:00
Anthony Thibault	342f8acff5	Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision Improve avatar hand vs body collision	2017-08-15 13:43:21 -07:00
Anthony J. Thibault	6e0ddadb29	Fix for array size.	2017-08-15 11:45:22 -07:00
Anthony J. Thibault	04006a9f76	code review feedback	2017-08-15 11:19:41 -07:00
Anthony J. Thibault	cd57c0706a	more warning fixes	2017-08-11 17:46:50 -07:00
Anthony J. Thibault	9e1218b4a4	Use k-dop collision to prevent hands from entering body.	2017-08-11 14:50:00 -07:00
Anthony J. Thibault	49adf04913	Added Developer > Avatar > Show Detailed Collision menu option	2017-08-10 16:36:09 -07:00
Anthony J. Thibault	ae98974d79	improve 14-dop generation for avatar joint collision Also added debug rendering functionality.	2017-08-10 15:52:51 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Anthony J. Thibault	4d845bd208	Bug fix for HMD roll causing avatar yaw when standing still HMD roll should only cause the avatar to yaw when actively driving.	2017-08-09 15:52:27 -07:00
SamGondelman	3645bf04b6	possibly fix most annoying crash	2017-08-08 18:10:53 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Anthony J. Thibault	85500841fb	Crash fix for avatars that are missing "Hips", "Head" and other required joints.	2017-08-04 11:19:09 -07:00
Anthony Thibault	8a87ebd2a8	Merge pull request #11036 from AndrewMeadows/walkabout fix bugs preventing avatar from walking on spherical planet	2017-08-01 16:36:35 -07:00
humbletim	3a9b8c02a6	* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" * restore access to "View > Mirror" from HMD mode	2017-08-01 13:41:28 -04:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
humbletim	3bcbec87e0	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-30 16:15:34 -04:00
Andrew Meadows	3ec9640ea1	fix calculation of walk motor for HMD	2017-07-28 09:22:47 -07:00
David Rowe	c1d179eba1	Add "dominant hand changed" signal	2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub	d572510770	Merge pull request #11009 from AndrewMeadows/fix-QueryAACube update EntityItem bounding cube when on changed dimensions	2017-07-27 18:21:06 -07:00
Anthony J. Thibault	bcb4cc32d2	another clang error fix	2017-07-27 10:26:10 -07:00
Anthony J. Thibault	778c8bf9a7	clang build error fix	2017-07-27 10:08:35 -07:00
Anthony J. Thibault	8f5c41af2d	changed _controllerPoseMap from unordered_map to map	2017-07-27 09:44:37 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Ryan Huffman	9421e6ebb6	Merge pull request #11029 from cain-kilgore/dominant-hands WL 21453 - Add a "Dominant Hand" setting	2017-07-25 08:01:31 -07:00
Anthony J. Thibault	33a1d6e225	Merge branch 'master' into feature/secondary-pose-support	2017-07-24 17:27:33 -07:00
Andrew Meadows	8c55476c65	fix motor direction when walking upside down also maintain worldUp and remove unnecessary cruft	2017-07-24 16:00:13 -07:00
Andrew Meadows	f598b1f1f5	fix spelling typo in comment	2017-07-24 16:00:13 -07:00
Andrew Meadows	29be9aee65	move nextAttitude() from AvatarData to MyAvatar	2017-07-24 16:00:13 -07:00
Andrew Meadows	f0871c6878	avoid unnecessary and expensive gets	2017-07-24 16:00:13 -07:00
Cain Kilgore	9ff7891c88	Fixed reference error, Gustavo should build now.	2017-07-24 19:56:02 +01:00
Cain Kilgore	64ba159adf	Updating Small Reference	2017-07-24 19:12:14 +01:00
Cain Kilgore	fd2264f7c9	removed duplicate	2017-07-24 19:05:49 +01:00
Cain Kilgore	e6fd85f45a	Some code cleanup	2017-07-24 19:02:40 +01:00
Cain Kilgore	42742ba1f9	Changed the Return to a String "left/right" instead.	2017-07-24 18:31:16 +01:00
Cain Kilgore	630922dd95	Dominant Hands Branch Initial Commit Adds a new option in the Avatar Basics section of the Avatar Settings. API Accessible Functions: MyAvatar.getUseAlternativeHand() MyAvatar.setUseAlternativeHand() Defaults to false (Right Hand). Will return True if set to Left Hand.	2017-07-24 06:18:24 +01:00
vladest	33a8ab2d58	Adjusted according discussion in PR	2017-07-21 18:18:23 +02:00
Olivier Prat	7bc7b1eabc	Merge branch 'master' of git://github.com/highfidelity/hifi into fade2	2017-07-21 09:27:30 +02:00
Andrew Meadows	a8dac0cb79	don't send constant updates for grabbed objects	2017-07-20 15:45:50 -07:00
vladest	4b94d24c29	Change default mouse speeds for avatar	2017-07-18 23:51:19 +02:00
humbletim	f9e0e616f7	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-18 17:34:39 -04:00
humbletim	190e1ac7d9	move/scope viewOrientation into the related code block	2017-07-18 17:22:16 -04:00
Brad Hefta-Gaub	2dfaf7b02a	Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big Case 5783: Restarting Interface allows you to have Avatar Scale Too Big	2017-07-18 08:51:13 -07:00
Olivier Prat	9130c51319	Fixed incorrect removal of ALL avatar fade events. Fade out should now work again when avatar leaves domain	2017-07-18 14:46:49 +02:00
Olivier Prat	2bba6aa816	Revert "Removed all bubble fade event code on avatar side" This reverts commit `4b8545e8b5`.	2017-07-18 14:07:07 +02:00
Olivier Prat	4b8545e8b5	Removed all bubble fade event code on avatar side	2017-07-18 10:04:08 +02:00
NeetBhagat	ff51fa7199	Resolved review comments.	2017-07-18 10:42:01 +05:30
Olivier Prat	0123e2936b	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-17 11:44:10 +02:00
Anthony J. Thibault	c85e187c61	first stab at secondary target pose support	2017-07-13 18:12:33 -07:00
Anthony J. Thibault	fe711ccbe9	Refactored how controller poses are stored in MyAvatar.	2017-07-13 15:01:14 -07:00
Olivier Prat	b125fba2e1	Removed untested avatar bubble fade code. Made changes as requested by Andrew	2017-07-13 23:04:55 +02:00
Olivier Prat	b68ec4f933	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-13 22:36:52 +02:00
Cain Kilgore	f91a8c0f53	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
Cain Kilgore	521babb6bd	Avatar Scaler - should be PR Ready.	2017-07-13 19:18:51 +01:00
NeetBhagat	11f8f5cffc	Solve : implicit conversion from ‘float’ to ‘double’ issue	2017-07-13 18:26:52 +05:30
Olivier Prat	edcfecd5d4	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-13 11:05:14 +02:00
Olivier Prat	2d2722bfc5	Added async transition query on scene	2017-07-13 11:05:04 +02:00
Seth Alves	59ad3d50ec	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-12 12:45:58 -07:00
Seth Alves	ddf2312dc6	code review	2017-07-12 12:45:52 -07:00
Stephen Birarda	f6d9a79fb5	Revert "Revert "fix for invisible avatars after radius ignore""	2017-07-12 10:36:53 -07:00
Olivier Prat	2f9885870b	First merge with Sam's fader branch with custom pipeline support in shape plumber	2017-07-12 17:29:21 +02:00
Seth Alves	c52e7e180a	use const AudioInjectorPointer& in some places	2017-07-11 19:42:03 -07:00
Seth Alves	dbd46fc4b8	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-11 17:48:29 -07:00
Andrew Meadows	782155e9ea	Merge pull request #10876 from Atlante45/fix/ac-crash Fix AC crash (buffer overflow)	2017-07-11 14:26:08 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
Olivier Prat	7552cca316	First alpha version of bubble collision fade events. Missing a lot of information.	2017-07-11 19:26:15 +02:00
NeetBhagat	e08e9d6821	The current scale of avatar should not be more than domain's max_avatar_scale and not less than domain's min_avatar_scale.	2017-07-11 20:42:00 +05:30
Olivier Prat	381e0c64a8	Working avatar fade in / fade out except that it is also triggered on bubble collisions	2017-07-11 16:43:27 +02:00
NeetBhagat	1a47383d4f	Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big	2017-07-11 19:23:46 +05:30
NeetBhagat	dd2dbd9b39	Initial Commit to resolve problem :> When Max Avatar scale is set in Sandbox -> setting, take that value as default max value	2017-07-10 18:26:33 +05:30
Liv	060e3a9c5a	Add signal for avatar skeleton changing	2017-07-07 11:48:12 -07:00
NeetBhagat	685b1c2445	Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big	2017-07-07 11:30:54 +05:30
Atlante45	95abbd0ad4	Prevent Interface from trying to send packets bigger than an MTU	2017-07-05 17:08:04 -07:00
Dante Ruiz	b86a8b8338	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-05 18:27:33 +01:00
NeetBhagat	440b941730	Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big	2017-07-05 18:47:13 +05:30
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
humbletim	9053531bda	fix missing viewPosition + offset	2017-07-03 12:03:46 -04:00
humbletim	026e05f80c	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-03 11:55:59 -04:00
Dante Ruiz	6f30cb1825	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
Dante Ruiz	577969481d	head puck working	2017-06-30 23:43:12 +01:00
Ryan Downe Karpf	ddce264dd9	Merge pull request #10819 from Menithal/21387 WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2	2017-06-30 14:57:04 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
NeetBhagat	5ff0bc409b	solve the bug : Avatar scale value should be 3.0 ,if user has set scale value > 3.0 previously .	2017-06-30 15:40:38 +05:30
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Menithal	232382e6d0	21387: Fixed issue with av scaling via script	2017-06-26 19:52:11 +03:00
David Rowe	bed0e8ef87	Merge branch 'master' into 21396 # Conflicts: # interface/src/avatar/MySkeletonModel.cpp	2017-06-26 12:07:25 +12:00
Menithal	359642eb0e	Refining and allowing for Avatar Scale to be saved as well	2017-06-25 23:55:47 +03:00
anshuman64	8d5bdd2d84	Merge pull request #10730 from hyperlogic/feature/pole-vector Pole vector support for elbow and knee joints	2017-06-24 23:08:22 -07:00
humbletim	f6262ad54d	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-06-23 16:37:10 -04:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
David Rowe	b26f5c5811	Clear finger joints when finger poses no longer being updated	2017-06-23 16:15:40 +12:00
David Rowe	8682cee17a	Refactoring	2017-06-23 11:33:29 +12:00
Andrew Meadows	62e862fef0	Merge pull request #10733 from Menithal/21384 21384: Added Support to Disabling flight from client side	2017-06-22 13:38:01 -07:00
Anthony J. Thibault	79d9bbe6c5	Merge branch 'master' into feature/pole-vector	2017-06-22 13:37:55 -07:00
David Kelly	5da01f0074	updated comments	2017-06-22 07:09:24 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
David Rowe	c54a5d8506	Tidying	2017-06-22 23:32:16 +12:00
David Rowe	3bdf267900	Implement fingers control	2017-06-22 23:32:06 +12:00
David Kelly	94a33fea94	new switches to override avatarURL	2017-06-21 16:03:05 -07:00
Anthony J. Thibault	2dcca2125b	Merge branch 'master' into feature/pole-vector	2017-06-21 15:50:03 -07:00
Anthony Thibault	a12109ed26	Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes Bug Fixes for Eyeless Avatars	2017-06-21 10:59:55 -07:00
Zach Pomerantz	7e84f67391	Merge pull request #10744 from zzmp/audio/output-sample Add "Play sample sound" to audio setting	2017-06-20 15:32:57 -07:00
Matti Lahtinen	256484cd21	Removed Whitespace	2017-06-20 21:44:32 +03:00
Anthony J. Thibault	29e3af820b	Fix for avatars with no eyes. The calculation of the centerEyeCalibration matrix (and several others) were incorrect.	2017-06-20 10:14:34 -07:00
Anthony J. Thibault	21c0e45d87	recenter rotation while driving. This should reduce foot sliding in HMD mode.	2017-06-20 09:43:38 -07:00
Anthony J. Thibault	c236afe68c	Simplify passing data from MySkeletonModel to Rig	2017-06-19 16:54:39 -07:00
Zach Pomerantz	5c0e9e7496	improve wording for MyAvatar.qmlPosition doc	2017-06-19 14:52:32 -07:00
Zach Pomerantz	a7e1b75909	stopgap with MyAvatar.qmlPosition	2017-06-19 14:41:01 -07:00
Matti Lahtinen	82df64d5e7	flyingAllowed to zoneAllowsFlying	2017-06-19 21:44:43 +03:00
Matti Lahtinen	600a39c9b2	Fixed Zone overriding Client.	2017-06-18 13:14:01 +03:00
humbletim	fc33e95e2d	Merge branch 'master' into 21180-C++	2017-06-16 16:16:42 -04:00
Zach Fox	47e5fb56d3	Show MyAvatar's head in the SpectatorCamera view!	2017-06-15 11:31:20 -07:00
David Rowe	16bebdd409	Rename identifiers	2017-06-15 09:20:55 +12:00
David Rowe	55e0082792	Code review	2017-06-15 09:10:08 +12:00
Menithal	112f186304	Added minor Comments	2017-06-14 22:24:18 +03:00
Menithal	a1c2f71f30	Added couple of state getters This allow scripts to check if avatar is flying or if the avatar is in air (but not flying). Both of these allows one to distinguish if the avatar is flying or falling or just jumping with Velocity	2017-06-14 20:19:04 +03:00
Menithal	66d43b80e2	Added getters for State if in Air or Flying	2017-06-14 19:53:08 +03:00
Menithal	c92e22fd20	21384: Added Menu Option	2017-06-14 19:05:00 +03:00
Menithal	53fe5736d8	21384: Initial Disable Flying	2017-06-14 18:24:45 +03:00
David Rowe	be2bcb1c13	Turn with head roll in HMD when walking or flying	2017-06-14 12:20:46 +12:00
David Rowe	05f19d54f4	Add HMD roll control JavaScript API	2017-06-14 11:55:04 +12:00
Andrew Meadows	321e307c9f	Merge pull request #10609 from 1P-Cusack/21317 WL21317 helper functions for getting into avatar coordinate space	2017-06-12 11:18:29 -07:00
Chris Howe	08d93173f0	Minor code feedback changes, moving test scripts to developer/tests.	2017-06-09 11:07:56 -04:00
Seth Alves	3b47142592	fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at	2017-06-08 10:28:38 -07:00
howard-stearns	9cf027a68c	pr feedback	2017-06-07 16:44:13 -07:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
Seth Alves	69520ff3db	pull from upstream, code review	2017-06-07 10:28:02 -07:00
Chris Howe	8166fec0e0	Minor changes based on code review feedback See https://worklist.net/21317, https://github.com/highfidelity/hifi/pull/10609 and https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197	2017-06-06 12:11:57 -04:00
Howard Stearns	3de243b093	Include the radius of the sphere at the avatar's feet.	2017-06-05 18:48:11 -07:00
Seth Alves	7a276f027f	fix orientation used for 3d audio	2017-06-05 15:53:01 -07:00
humbletim	7cab0363a9	standalone 21180 branch with just the C++ changes	2017-06-05 15:57:54 -04:00
Seth Alves	27669d44a7	in deriveBodyFromHMDSensor, avoid using invalid head pose	2017-06-05 08:58:40 -07:00
Howard Stearns	ca526e0776	git rid of a lambda	2017-06-05 07:11:25 -07:00
Howard Stearns	05f41fb4f8	cleanup	2017-06-04 08:13:12 -07:00
Howard Stearns	a0ea306aed	cleanup, and include missing allowBackface parameter	2017-06-04 07:55:23 -07:00
Howard Stearns	fd01258c76	cleanup	2017-06-03 16:02:58 -07:00
Howard Stearns	02c46080f7	we don't need to force, but we do need some extra room for confined spaces	2017-06-03 15:43:14 -07:00
Howard Stearns	c48b729527	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-02 18:05:20 -07:00
Seth Alves	3359a0a794	work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation	2017-06-02 15:29:20 -07:00
Seth Alves	9088e288e0	don't worry about head controller being enabled, just check to see if head pose is valid	2017-06-02 13:57:53 -07:00
howard-stearns	6b2e4c5abc	zaru stuff	2017-06-01 17:08:22 -07:00
Seth Alves	7d21ab88b0	add some saftey checks. cleanups	2017-06-01 16:14:59 -07:00
Seth Alves	552b69bb1c	cleanups	2017-06-01 13:47:19 -07:00
Seth Alves	ac6135387c	display plugins are never head controllers	2017-06-01 13:37:16 -07:00
howard-stearns	1068a4a9bd	remove the optimization for upperId == lowerId. Doesn't work in zaru tunnels.	2017-06-01 13:21:24 -07:00
Seth Alves	b83620f7c5	Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller	2017-06-01 10:58:33 -07:00
Seth Alves	eca05d9c42	more use of head input	2017-06-01 10:57:53 -07:00
Seth Alves	eb94c48c5b	merge from upstream	2017-06-01 10:10:11 -07:00
Sam Cake	3c9b14ee94	Oene more fix	2017-05-31 23:26:20 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00
howard-stearns	1e1dd3a633	checkpoint with working detector	2017-05-31 17:10:37 -07:00
Seth Alves	e37387f45c	sync	2017-05-31 14:01:09 -07:00
Chris Howe	6edc6b2756	WL21317 New MyAvatar functions to support converting from avatar joint space to world space and vice versa. Added some tests to support these functions.	2017-05-31 15:05:43 -04:00
howard-stearns	07ea2e271b	hook into location changes	2017-05-30 14:59:19 -07:00
Seth Alves	ffe844a8e7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-30 13:42:20 -07:00
howard-stearns	92aeadd70f	rotation of local capsule offset	2017-05-26 16:34:08 -07:00
howard-stearns	f694691efb	add fixme comments and make isUp/isDown ordinary methods.	2017-05-26 16:15:18 -07:00
howard-stearns	4be31f1b18	thread safety	2017-05-26 15:31:59 -07:00
howard-stearns	7cee438298	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-26 11:36:04 -07:00
howard-stearns	905b5261d1	If collisions are enabled, turn them off in safeLanding, and restore.	2017-05-25 16:32:44 -07:00
Seth Alves	af5ba3a90a	ask display-plugins if they are head-controllers	2017-05-25 15:14:10 -07:00
howard-stearns	ac8cb63419	clean and DRY	2017-05-25 14:34:24 -07:00
Dante Ruiz	108c444cc7	clean up code	2017-05-25 21:59:06 +01:00
howard-stearns	9d73d0c931	works with nested enclosing entities	2017-05-25 12:09:22 -07:00
Seth Alves	3823ece153	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-25 10:57:46 -07:00
Seth Alves	bdbc6ddcc1	change some code to look at head-controller position rather than hmd position	2017-05-25 10:50:41 -07:00
howard-stearns	74c163d047	snapshot of safeLanding. Works as long as entities don't intersect.	2017-05-25 10:25:29 -07:00
Dante Ruiz	8cb9bfcc81	fixed merge conflict	2017-05-24 19:35:41 +01:00
Dante Ruiz	ac3c9655ec	added arms	2017-05-24 01:28:08 +01:00
Dante Ruiz	0cbdeaa1e8	Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks	2017-05-23 18:26:58 +01:00
Dante Ruiz	54d63f5155	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-23 18:19:38 +01:00
Anthony J. Thibault	06c26f029a	Merge branch 'master' into feature/faster-ik-iterations	2017-05-23 09:10:17 -07:00
Chris Collins	978eb0dfa9	Merge pull request #10492 from ctrlaltdavid/21359 Fix eye behavior in recording playback	2017-05-22 21:53:13 -07:00
Dante Ruiz	d98e7d5bc6	adding left and right arm	2017-05-23 00:26:12 +01:00
David Rowe	b0962865b2	Code review	2017-05-23 09:57:53 +12:00
David Rowe	eef707e4e9	Simplify code	2017-05-20 12:42:40 +12:00
Andrew Meadows	7b879a7964	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -07:00
Anthony J. Thibault	e99001d86c	debug draw ik chains, bug fix for flex coef on tips And opened up hip constraints.	2017-05-18 16:29:55 -07:00
Dante Ruiz	984f9e1ba5	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-18 21:23:06 +01:00
Andrew Meadows	09433a93ba	Merge pull request #10477 from AndrewMeadows/correct-avatar-mass More correct avatar mass	2017-05-17 16:22:06 -07:00
Dante Ruiz	a18940142e	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-17 16:23:50 +01:00
Brad Hefta-Gaub	764bfe94f5	Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 Feature/snap turn smoothing 21270	2017-05-16 21:05:38 -07:00
Andrew Meadows	d065b569d3	support for variable avatar mass by size	2017-05-16 16:03:51 -07:00
Andrew Meadows	805d23567d	fix simple typo	2017-05-16 16:03:50 -07:00
Dante Ruiz	724f849d88	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-16 00:15:18 +01:00
Dante Ruiz	975b1ab077	moved low velocity filter in the input system	2017-05-16 00:15:06 +01:00
Seth Alves	66a1dbfcfe	Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation cleanup Head::simulate() code	2017-05-15 11:21:43 -07:00
Vladyslav Stelmakhovskyi	cc10fc81b7	Fix crash in sit script	2017-05-13 20:57:04 +02:00
anshuman64	49d4cf4e68	Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config More stable IK when hips, feet and chest are controlled via external input	2017-05-12 17:22:29 -07:00
Seth Alves	c6131916e1	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-12 09:46:21 -07:00
Andrew Meadows	a43447310d	remove physics dependency from avatars-render lib	2017-05-11 15:22:22 -07:00
Andrew Meadows	f4df223d23	cleanup Head::simulation() code	2017-05-11 14:46:00 -07:00
David Rowe	1b855f2c6b	Voice modulation and facetrackers write to transient blendshapes	2017-05-11 18:15:38 +12:00
Anthony J. Thibault	93b8dc550c	Merge branch 'master' into feature/ik-solver-init-config	2017-05-10 09:03:21 -07:00
trent	a3545661dc	Merged hifi/master into this PR and resolved merge conflicts.	2017-05-09 15:09:53 -04:00
trent	9c8b844e26	Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270	2017-05-09 12:51:28 -04:00
trent	7faed38bb5	Just use the smooth time constant instead of a variable.	2017-05-09 12:51:25 -04:00
Seth Alves	1e1968357a	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-09 09:24:50 -07:00
Andrew Meadows	e92e710cdc	Merge pull request #10413 from humbletim/fix_lookat_regression Fix lookAt eye snapping	2017-05-09 08:51:10 -07:00
humbletim	29b1ac3572	optimizations per feedback	2017-05-08 21:50:24 -04:00
humbletim	42d1498d20	call Model::updateRig (not Parent::updateRig)	2017-05-08 21:19:18 -04:00
Andrew Meadows	2835a73c6b	Merge pull request #10071 from AndrewMeadows/walk-up-steps avatar can walk up steps	2017-05-08 18:17:16 -07:00
Seth Alves	de589a32f3	clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring	2017-05-08 16:36:51 -07:00
humbletim	ef0e32643d	update refactored logic to match previous application behavior	2017-05-08 18:53:47 -04:00
Anthony J. Thibault	712fcbe27a	Removed cruft/debug code & comments	2017-05-08 15:06:30 -07:00
Anthony J. Thibault	7af93f9fea	Hooked up IK constraint rendering	2017-05-08 15:06:29 -07:00
Anthony J. Thibault	e992d6703a	WIP: debug render joint constraints.	2017-05-08 15:06:28 -07:00
Anthony J. Thibault	a260163aee	WIP commit, first pass at generating limit center joints + debug draw	2017-05-08 15:06:27 -07:00
Andrew Meadows	afe0447322	remove unnecessary virtual keyword	2017-05-08 14:27:39 -07:00
Andrew Meadows	138a987a8f	_rotationChanged is a timestamp	2017-05-08 14:27:18 -07:00
Brad Davis	b63015eaea	Fix sped up animations	2017-05-06 14:34:28 -07:00
Andrew Meadows	fe401c7488	improved management of collisionless avatar state	2017-05-05 09:37:00 -07:00
Andrew Meadows	d34b667e82	remove kinematic character controller implemention	2017-05-05 09:35:49 -07:00
Andrew Meadows	0aa579225c	even more correct API: MyAvatar.collisionsEnabled	2017-05-05 09:35:49 -07:00
Andrew Meadows	559f5836c5	restore MyAvatar.setCharacterControllerEnabled()	2017-05-05 09:35:49 -07:00
Andrew Meadows	94ee6d6838	fix driving motion of collisionless avatars	2017-05-05 09:35:49 -07:00
Andrew Meadows	c47e26174c	support collisionless avatar when playing recording	2017-05-05 09:35:49 -07:00
Andrew Meadows	e21bd7a67a	help avatar walk up steps	2017-05-05 09:35:49 -07:00
Brad Davis	9def788956	Merge pull request #10314 from jherico/avatars-renderer Migrate Avatar rendering code to library	2017-05-04 14:23:49 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Seth Alves	a259d00b63	Merge pull request #10332 from sethalves/bullet-constraints-5 Bullet constraints	2017-05-03 16:30:34 -07:00
trent	d7ed727faf	Adjustments based on PR feedback, though it looks like this snap-turn-snafu-story is not yet complete.	2017-05-03 16:56:18 -04:00
trent	fc3cce6b73	Fixed the silly and stupid subtle issue that was causing the bug in inconsistencies.	2017-05-03 12:35:35 -04:00
trent	24f2678cdd	Adjusted the smooth time for the snap-turn remote view. Fixed tab issue.	2017-05-03 12:05:21 -04:00
trent	786838d092	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-02 20:21:35 -04:00
trent	557a8fffd7	Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D	2017-05-02 19:56:47 -04:00
Trent Polack	0a5dfbb9af	Changed l to interp. In my defense, if anyone ever looked at it and thought the 'l' was a '1', they should never be programming unless they used a special language where you could reassign numbers.	2017-05-02 19:10:33 -04:00
trent	f79e032841	Silly online git merge tool. You are silly. Errors fixed.	2017-05-02 14:48:27 -04:00
trent	6d1fb8a6f8	Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270	2017-05-02 13:55:39 -04:00
trent	49881b5ea2	Actually the full set of changes. Kids: don't forget to pop your stash.	2017-05-02 13:55:32 -04:00
samcake	df54ad2339	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-02 10:50:39 -07:00
Trent Polack	8f93a9a074	Merge branch 'master' into feature/snap-turn-smoothing-21270	2017-05-02 13:43:32 -04:00
trent	8f34ec4c7f	Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.	2017-05-02 13:41:34 -04:00
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
trent	6317857e3d	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-02 12:11:39 -04:00
samcake	4514da2a09	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-01 16:49:35 -07:00
Seth Alves	45a50f9a46	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5	2017-05-01 15:32:29 -07:00
Seth Alves	a75544a9fb	Merge pull request #10319 from hyperlogic/feature/head-standard-action Head, Hips and Chest IK can now be controlled from Controller inputs	2017-05-01 13:03:23 -07:00
trent	4d7eeed343	Marking MyAvatar's rotation as dirty if smoothing is going down.	2017-05-01 15:21:25 -04:00
Brad Davis	40e4e2f307	Merge pull request #10327 from jherico/face_tracker_refactor Remove Faceshift	2017-05-01 12:14:55 -07:00
trent	773563850c	Merge hifi/master with my branch, fixed merge issue.	2017-05-01 13:23:02 -04:00
Anthony J. Thibault	0c09823f67	clang warning fixes, unused variables...	2017-05-01 09:10:31 -07:00
Seth Alves	7ce0ef2ec4	fix spring action so that it can be linear or rotational or both	2017-04-30 10:04:07 -07:00
Brad Davis	2b43a1989f	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Andrew Meadows	994eed7b83	safer delete of AvatarMotionStates	2017-04-28 10:18:19 -07:00
Anthony J. Thibault	b80270400f	Merge branch 'master' into feature/hips-ik-target	2017-04-27 18:15:12 -07:00
Anthony J. Thibault	2120e63e3a	Merge branch 'master' into feature/head-standard-action	2017-04-27 17:51:13 -07:00
Anthony J. Thibault	764f6c69ea	Head input action will override the HMD for IK.	2017-04-27 17:39:25 -07:00
Andrew Meadows	aa90a6bd02	use static methods for setting avatar debug options	2017-04-27 13:16:50 -07:00
Andrew Meadows	75b563d598	restore rendering of avatar receive stats	2017-04-27 13:16:50 -07:00
Andrew Meadows	00b05ed137	connect menu options to avatar render features	2017-04-27 13:16:50 -07:00
Andrew Meadows	823f3a73c6	remove commented out cruft	2017-04-27 13:16:50 -07:00
Andrew Meadows	caf6a77baf	repair bad merge during rebase	2017-04-27 13:16:50 -07:00
Andrew Meadows	2441536de3	remove Avatar dependency on AvatarMotionState	2017-04-27 13:16:49 -07:00
trent	53f47c132f	Avatar snap-turn rotation smoothing (sent out from the local client outward).	2017-04-27 16:12:25 -04:00
Andrew Meadows	010d1dfa22	remove Menu dependency from Avatar class	2017-04-27 13:11:57 -07:00
Andrew Meadows	6393972874	remove AvatarManager dependency from Avatar	2017-04-27 13:11:57 -07:00
Andrew Meadows	65682a914d	remove cufty AvatarManager LocalLights feature	2017-04-27 13:11:57 -07:00
Andrew Meadows	4c212fb1e5	pull qApp spaghetti out of Avatar class some ends of spaghetti get pushed into AvatarManger class split Camera class into Camera base and FancyCamera derivation Application::getCamera() returns Camera by refence instead of pointer	2017-04-27 13:11:57 -07:00
ZappoMan	c0df82ff69	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 18:49:24 -07:00
ZappoMan	834a447d62	remove debugging code	2017-04-26 18:36:44 -07:00
humbletim	f8bbd9174c	Merge remote-tracking branch 'upstream/master' into 21281	2017-04-26 18:26:15 -04:00
Andrew Meadows	fd874429c1	remove unused cruft	2017-04-26 12:51:16 -07:00
Andrew Meadows	ac751029c0	remove identity cache code	2017-04-26 12:51:16 -07:00
Andrew Meadows	4511156d7b	cache avatar identity info forever	2017-04-26 12:50:48 -07:00
Anthony J. Thibault	ef43ff4b99	Add default pose matrices to InputCalibrationData structure	2017-04-26 11:55:24 -07:00
trent	2963d3d212	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-04-25 19:31:21 -04:00
ZappoMan	90cdeb9582	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 16:09:59 -07:00
Anthony J. Thibault	dc19f37726	input/controller routing thru skeleton model and rig.	2017-04-25 15:04:47 -07:00
trent	f28b58f56e	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-04-25 15:35:11 -04:00
Seth Alves	23592f4a53	get rid of _trackedHeadPosition (cherry picked from commit e909938b232e11400832ae7dd29de16968967668)	2017-04-25 11:03:43 -07:00
Seth Alves	0cd2863df4	start on routing HMD position and rotation through controller interface (cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)	2017-04-25 11:01:52 -07:00
ZappoMan	382645ddd0	more cleanup	2017-04-24 18:01:54 -07:00
ZappoMan	aa955ee360	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-24 17:36:30 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
Anthony J. Thibault	937f308ba8	code cleanup	2017-04-24 17:04:16 -07:00
humbletim	28b3eef7aa	add getJointTranslations() methods	2017-04-24 19:22:02 -04:00
Anthony J. Thibault	dc3803a225	Re-enable IK _hipsOffset computation when no hips IK target is present.	2017-04-24 13:59:02 -07:00
samcake	c36f8da4c0	Fixing build on mac	2017-04-24 10:46:29 -07:00
trent	b00cd66a2a	Revisited where smoothing was done (to a much lower-level); still needs testing.	2017-04-21 22:36:11 -04:00
Seth Alves	17b83dd64c	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-21 17:19:47 -07:00
Andrew Meadows	3f9f16cc98	Merge pull request #10223 from kunalgosar/blendshapesbug Make setBlendshape changes persist	2017-04-21 16:11:13 -07:00
ZappoMan	ff45ad53a3	some more CR cleanup	2017-04-21 10:40:41 -07:00
ZappoMan	f133713d0e	CR feedback	2017-04-21 10:21:34 -07:00
ZappoMan	c03182546b	some cleanup	2017-04-21 09:11:51 -07:00
ZappoMan	e89b6c5d2c	some initial debugging on tpose avatars	2017-04-20 17:26:31 -07:00
trent	805a74c074	First-pass attempt at remedying the smoothing issue (the avatar is never receiving the proper call).	2017-04-20 13:21:38 -04:00
Seth Alves	f7378abb08	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-20 02:40:10 -07:00
Seth Alves	0807e036e8	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-18 11:59:23 -07:00
Seth Alves	d077c9f1de	print rather than crash in what should be an impossible situation	2017-04-18 11:58:56 -07:00
Andrew Meadows	da55c96c4c	protect against crash on invalid scene on shutdown	2017-04-18 11:52:22 -07:00
Andrew Meadows	014d7b8d8d	use viewFrustum position for laser pointer render filtering	2017-04-18 11:52:22 -07:00
Andrew Meadows	71c5644c23	more shared_ptr by const reference	2017-04-18 11:52:22 -07:00
Andrew Meadows	31bfc98b87	use const reference for ScenePointer when possible	2017-04-18 11:52:22 -07:00
Andrew Meadows	a3682a1a0e	cleanup includes in Avatar.cpp and remove cruft	2017-04-18 11:52:21 -07:00
Andrew Meadows	5a458c9923	remove last qApp usage from Avatar class	2017-04-18 11:52:21 -07:00
Andrew Meadows	685a01482c	remove Camera argument from Avatar::render()	2017-04-18 11:52:21 -07:00
Andrew Meadows	fbacbd74f7	pass shared pointers by ref in Avatar::render()	2017-04-18 11:52:21 -07:00
Andrew Meadows	9cddbbc42a	more interface-only spaghetti out of Avatar	2017-04-18 11:52:21 -07:00
Andrew Meadows	1137bd1436	pull qApp spaghetti out of Avatar class some ends of spaghetti get pushed into AvatarManger class split Camera class into Camera base and FancyCamera derivation Application::getCamera() returns Camera by refence instead of pointer	2017-04-18 11:52:21 -07:00
kunalgosar	d215856b23	cleanup to blendshapes	2017-04-18 11:44:59 -07:00
kunalgosar	0a295fc258	setBlendshapes will presist	2017-04-18 11:44:59 -07:00
Seth Alves	b2de5ebdaf	Merge pull request #10136 from mittens/21217 Added quadratic ease-in-and-out smoothing to remote avatars	2017-04-18 10:05:48 -07:00
Anthony J. Thibault	a10b157aff	First pass at having an explicit Hips IK target. Also, AnimManipulator nodes support setting position and rotation on a single joint.	2017-04-14 17:00:44 -07:00
Seth Alves	d0144f4110	avatar-action-far-grab works now	2017-04-14 12:44:54 -07:00
Seth Alves	b1dc5be316	make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar	2017-04-14 11:48:06 -07:00
Seth Alves	0eb9507a10	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:25:50 -07:00
Chris Collins	c545558b8a	Merge pull request #10199 from AndrewMeadows/avatar-should-vanish Avatar should vanish when teleporting far away	2017-04-12 12:28:46 -07:00
Zach Fox	39587d5308	lol	2017-04-12 10:54:28 -07:00
Seth Alves	cc77fce95f	hinge is sort-of working	2017-04-12 07:12:05 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
Andrew Meadows	b8a3c856be	update model transform even when out of view	2017-04-11 15:03:11 -07:00
Zach Fox	6569de697d	Merge pull request #10187 from zfox23/fix/getAvatar_Fix Fix FB3999; Fix crashes caused by getAvatar() design bug	2017-04-11 11:17:48 -07:00
Seth Alves	bf16309917	Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002 avoid invisible avatars redux	2017-04-11 07:07:03 -07:00
Stephen Birarda	db6fc40277	fix ScriptAvatar promotion of AvatarData	2017-04-10 22:15:45 -07:00
Stephen Birarda	b8620f6919	make getAvatar in AvatarManager Q_INVOKABLE	2017-04-10 22:15:45 -07:00
Stephen Birarda	e7299a5435	add missing include for ScriptAvatar in AvatarManager	2017-04-10 22:15:45 -07:00
Stephen Birarda	84a5807ff1	return ScriptAvatarData raw pointer from getAvatar	2017-04-10 22:15:45 -07:00
Zach Fox	54ca8bd89e	grab audio loudness from correct avatar	2017-04-10 22:15:45 -07:00
Stephen Birarda	42a406e90a	add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts	2017-04-10 22:15:45 -07:00

... 17 18 19 20 21 ...

5527 commits