1355 commits

Author	SHA1	Message	Date
humbletim	d3127ba975	remove unintended merge line	2017-06-19 20:18:39 -04:00
humbletim	fc33e95e2d	Merge branch 'master' into 21180-C++	2017-06-16 16:16:42 -04:00
Stephen Birarda	e6ef153148	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants	2017-06-15 15:43:13 -07:00
Stephen Birarda	8f154321a4	never process null avatar ID in avatar manager	2017-06-15 14:25:10 -07:00
Stephen Birarda	6cf4ff1daf	remove debug and fix peek of session ID	2017-06-15 13:44:44 -07:00
Stephen Birarda	bfa5df778d	remove avatar entity data debug	2017-06-14 14:59:49 -07:00
Stephen Birarda	e3c3831efa	only output sequence number information if debug is requested	2017-06-14 14:56:15 -07:00
Stephen Birarda	5b45beaa39	cleanup some debug from identity packet changes	2017-06-14 14:51:28 -07:00
Stephen Birarda	f2a61fa59d	change incoming/outgoing seq num handling	2017-06-14 14:41:25 -07:00
Stephen Birarda	ddb6db9f6a	fix repeated pushing of avatar identity seq nums	2017-06-14 14:31:22 -07:00
Stephen Birarda	50b56ec761	don't unpack avatar identity that is old	2017-06-14 14:02:22 -07:00
howard-stearns	2deb26551f	typos in comments/help-strings	2017-06-14 11:56:47 -07:00
howard-stearns	6271b8ee7c	avatar whitelist	2017-06-13 16:56:18 -07:00
Seth Alves	9fcc1e15b8	remove some cruft	2017-06-05 15:52:47 -07:00
humbletim	7cab0363a9	standalone 21180 branch with just the C++ changes	2017-06-05 15:57:54 -04:00
samcake	257813ec38	comment the code	2017-06-01 09:19:02 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00
David Rowe	3aebe96afe	Merge branch 'master' into 21359	2017-05-19 09:03:11 +12:00
David Rowe	f6c1fa4213	Merge branch 'master' into 21359	2017-05-18 16:40:20 +12:00
David Rowe	26e390fa89	Tidy code setting head orientation	2017-05-18 13:55:06 +12:00
David Rowe	223b1a858b	Fix avatar eye look-at in recording playback	2017-05-18 12:27:31 +12:00
Howard Stearns	95111d24b2	Merge branch 'master' into dk/sequenceNumberForAvatarIdentity	2017-05-17 17:09:47 -07: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
David Kelly	057718bde3	remove clockSkew, reference new version for Avatar packets	2017-05-17 15:14:56 -07:00
David Kelly	689a0b5bad	Switch from timestamp to sequence id for avatar identity	2017-05-17 14:22:36 -07:00
Zach Fox	d4752926b8	First pass - checking performance	2017-05-17 13:51:27 -07: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
David Rowe	7897bf8aa8	Fix display name not getting cleared	2017-05-17 08:17:55 +12:00
David Rowe	733b0feabd	Fix attachment data not getting cleared	2017-05-17 08:17:33 +12:00
Zach Fox	bc1e97032a	Thanks to Andrew!	2017-05-15 17:39:19 -07:00
Zach Fox	64ae5119ae	Merge pull request #10462 from zfox23/fixIdentityUpdatedAt ... Force _identityUpdatedAt to stay above 0, fixing more identity packet bugs	2017-05-15 15:44:26 -07:00
Zach Fox	e492ca9364	Improve the test - thanks Dave!	2017-05-15 14:55:05 -07:00
Zach Fox	a2a24b22a8	Force _identityUpdatedAt to stay above 0	2017-05-15 14:25:47 -07: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
Zach Fox	9289cd2022	Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder ... Fix the PAL not showing user info for user who opened PAL	2017-05-11 15:16:05 -07:00
Andrew Meadows	04827c3a2a	use const auto& where appropritate	2017-05-11 14:51:52 -07:00
Andrew Meadows	f4df223d23	cleanup Head::simulation() code	2017-05-11 14:46:00 -07:00
Zach Fox	15574f509e	Clarifying comments	2017-05-11 11:45:07 -07:00
David Rowe	e426d70437	Improve variable name	2017-05-11 18:37:23 +12:00
David Rowe	98b943269b	Sum of blendshapes is used sent through avatar mixer	2017-05-11 18:17:35 +12:00
David Rowe	21f9594f81	Sum of blendshapes is used for recording	2017-05-11 18:17:12 +12:00
David Rowe	3b06b03e01	Rename blendshapes variables in preparation for repurposing	2017-05-11 16:46:36 +12:00
Zach Fox	ae983658be	Finally, the actual fix?	2017-05-10 15:59:19 -07:00
Zach Fox	d7e4f02291	This is a better method.	2017-05-09 15:33:33 -07:00
Zach Fox	9ab643c416	I think this is all that must be done.	2017-05-09 15:33:33 -07:00
trent	a3545661dc	Merged hifi/master into this PR and resolved merge conflicts.	2017-05-09 15:09:53 -04:00
Andrew Meadows	13186dcb78	replace tab characer r with spaces	2017-05-08 14:28:08 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07: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
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
trent	d446640bc8	Fixed tab issues.	2017-05-01 13:28:26 -04:00
trent	773563850c	Merge hifi/master with my branch, fixed merge issue.	2017-05-01 13:23:02 -04:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Andrew Meadows	75b563d598	restore rendering of avatar receive stats	2017-04-27 13:16:50 -07:00
trent	53f47c132f	Avatar snap-turn rotation smoothing (sent out from the local client outward).	2017-04-27 16:12:25 -04:00
ZappoMan	bc2f893294	format and spelling changes	2017-04-26 21:47:54 -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
ZappoMan	1f9e07b828	more logging	2017-04-26 16:40:13 -07:00
humbletim	f8bbd9174c	Merge remote-tracking branch 'upstream/master' into 21281	2017-04-26 18:26:15 -04:00
ZappoMan	7154a11192	add some more logging	2017-04-26 14:03:36 -07:00
Andrew Meadows	4511156d7b	cache avatar identity info forever	2017-04-26 12:50:48 -07:00
ZappoMan	517bbc795f	interface/	2017-04-26 11:29:42 -07:00
ZappoMan	5164aa4056	hacking	2017-04-25 18:21:09 -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
humbletim	28b3eef7aa	add getJointTranslations() methods	2017-04-24 19:22:02 -04:00
ZappoMan	088cdae320	CR feedback	2017-04-21 11:14:47 -07:00
ZappoMan	f133713d0e	CR feedback	2017-04-21 10:21:34 -07:00
ZappoMan	fbc699d6b2	handle overflow case	2017-04-21 09:30:00 -07:00
ZappoMan	c03182546b	some cleanup	2017-04-21 09:11:51 -07:00
ZappoMan	125b3d5f4e	ignore old identity packets	2017-04-21 07:51:17 -07:00
ZappoMan	c197979354	add more logging	2017-04-20 18:36:00 -07:00
ZappoMan	e89b6c5d2c	some initial debugging on tpose avatars	2017-04-20 17:26:31 -07:00
kunalgosar	ffdbc12968	copy into new vector	2017-04-18 12:20:03 -07:00
kunalgosar	06c5fa0585	correctly resizing blendshapes vector	2017-04-18 11:44:59 -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
Zach Fox	e13000410e	Whoops	2017-04-17 11:02:27 -07:00
Andrew Meadows	e364b8d33e	avatar-mixer resends to avoid stale avatar	2017-04-13 13:35:59 -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
Stephen Birarda	db6fc40277	fix ScriptAvatar promotion of AvatarData	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	16be0ca70c	Birarda's CR changes	2017-04-10 22:15:44 -07:00
Zach Fox	5edd5d2b30	It's working...it's workinggit add -A!	2017-04-10 22:15:44 -07:00
Zach Fox	a16e261735	Checkpoint before a number of confusing changes	2017-04-10 22:15:44 -07:00
Zach Fox	297da90118	Semicolons lol	2017-04-10 22:15:44 -07:00
Zach Fox	bc75ff4462	Checkpoint	2017-04-10 22:15:44 -07:00
Zach Fox	177445c371	Does this work?	2017-04-10 22:15:44 -07:00
Stephen Birarda	4ed22ad7ac	move audio loudness to AvatarData, change AvatarData to ScriptOwnership	2017-04-10 22:15:44 -07:00
Zach Fox	1ed53113a9	Commit for birarda - testing QSharedPointer instead; doesn't work right now	2017-04-10 22:15:44 -07:00
Zach Fox	6ddd7a612c	Initial pass at fix looks promising	2017-04-10 22:15:44 -07:00