66 commits

Author	SHA1	Message	Date
David Kelly	e1700915f7	remove extra activity logger call	2017-05-31 13:28:57 -07:00
David Kelly	52c288bfed	Desktop users of different height can shake hands	2017-05-11 14:20:42 -07:00
David Kelly	4536d3c484	cr feedback	2017-05-10 10:09:45 -07:00
David Kelly	a45dc673be	minor handshake script update	2017-05-09 17:33:33 -07:00
David Kelly	5b33e0233c	fix typo in handshake script	2017-05-09 13:27:42 -07:00
David Kelly	a4125c1507	logic tweak	2017-05-04 16:33:50 -07:00
David Kelly	5b56956637	Some minor handshake improvements	2017-05-04 12:38:17 -07:00
Howard Stearns	fb8cfd720e	Merge pull request #10362 from cfresquet/requestModuleRefactor ... Request module refactor	2017-05-03 11:57:23 -07:00
CFresquet	afa72210e0	requested tweaks to makeUserConnection.js	2017-05-03 10:28:44 -07:00
CFresquet	28b166c51f	further request fiddling	2017-05-03 07:51:49 -07:00
CFresquet	b54ea63af7	incremental request module fixes	2017-05-03 07:35:30 -07:00
Howard Stearns	3a36feacad	On touch, grip is a trigger, not a button, so it can have lots of callbacks with slightly different values that we ignore. In that case, don't update hand/joint.	2017-05-02 11:29:51 -07:00
CFresquet	55fdf35c4a	merge of Request module	2017-05-01 13:02:18 -07:00
CFresquet	72a6403eb0	Merge remote-tracking branch 'upstream/master'	2017-05-01 08:11:26 -07:00
CFresquet	28aaa545d8	Created RequestModule	2017-05-01 08:07:16 -07:00
Howard Stearns	f980d6f435	Merge branch 'master' of https://github.com/highfidelity/hifi into handshake-cleanup-2	2017-04-30 15:51:12 -07:00
Howard Stearns	e740fb67f4	convert foreign handString to jointIndex once, not often	2017-04-30 15:50:30 -07:00
Howard Stearns	bc9049cb42	remove extra joint search	2017-04-30 14:19:33 -07:00
Howard Stearns	292065a918	It may be possible to switch hands without endHandshake, and thus not reset currentHandJointIndex on updateTrigger. That was filled in later by startHanshake ONLY if there was already waiting avatars so that we didn't have wait. As a result, our distance measure would be from hips instead of hand. This changes it to always compute currentHandJointIndex on updateTriggers (and not elsewhere).	2017-04-30 13:32:21 -07:00
Howard Stearns	eca7292651	check your own location data on failure, and notify if it is wrong	2017-04-30 09:44:34 -07:00
Howard Stearns	92481bf475	standardize data init/clear	2017-04-30 08:04:46 -07:00
Howard Stearns	d41a911fd2	setupCandidate	2017-04-29 19:39:50 -07:00
Howard Stearns	18dbe3568c	clarify names, particularly hand vs handString	2017-04-29 18:25:33 -07:00
Howard Stearns	9c83e21e17	fix that	2017-04-29 15:50:04 -07:00
Howard Stearns	d7a2e571a7	simplify animation load and code	2017-04-29 14:39:35 -07:00
Howard Stearns	274cc5b555	unique message for exceeding poll limit	2017-04-29 14:29:43 -07:00
Howard Stearns	84ac863a32	lint	2017-04-29 13:58:20 -07:00
David Kelly	168cfa9b5d	upping polling time plus min grip	2017-04-28 16:39:58 -07:00
David Kelly	a99c242646	increase minimum grip pressure to initiate handshake	2017-04-28 15:52:32 -07:00
Thijs Wenker	bf81ae78b9	Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix ... # Conflicts: # scripts/system/makeUserConnection.js	2017-04-26 22:52:57 +02:00
Thijs Wenker	d05229d3b4	fix conversion	2017-04-26 22:11:56 +02:00
Thijs Wenker	20a9b60e7b	this might make it work	2017-04-26 21:42:36 +02:00
Thijs Wenker	0363e96f34	Allow skeletons with different bone structures to become friends (still requires hands)	2017-04-26 18:55:50 +02:00
Thijs Wenker	a25584c90f	ESLINT, style and spelling fixes	2017-04-26 18:51:55 +02:00
Zach Fox	3e24296996	Swap the two lines	2017-04-26 09:10:05 -07:00
howard-stearns	b089fd03b8	make connection messaging when not logged in	2017-04-06 16:48:11 -07:00
David Kelly	1b6bf90843	initial analytics for connections	2017-04-05 11:10:06 -07:00
Zach Fox	4712ec7400	Reset pollCount; debug log when expired generated by client	2017-03-30 17:02:15 -07:00
Howard Stearns	3056bb16a2	typo, and delete request on abort/fail	2017-03-30 12:40:54 -07:00
Howard Stearns	53d484c318	makes connections!	2017-03-29 13:23:31 -07:00
Howard Stearns	b0c97d3a82	putative connection integration for 2-machine testing	2017-03-29 12:22:26 -07:00
David Kelly	92718b6051	cr feedback	2017-03-28 08:57:27 -07:00
David Kelly	76657a670c	added notifications (faked user name for now), along with switch to avatar entities	2017-03-27 11:28:57 -07:00
David Kelly	0edcdde746	better key mapping	2017-03-23 10:40:34 -07:00
David Kelly	a08346719c	one bit of defensive code, plus some temporary logging	2017-03-23 10:29:45 -07:00
David Kelly	aa085e577d	more vis work	2017-03-23 09:19:04 -07:00
David Kelly	7b52afb58b	vis changes to fade. Still needs more work	2017-03-22 17:01:42 -07:00
David Kelly	020dcca78d	end handshake when successful, stop handshake sound if other guy pulls out	2017-03-22 14:55:57 -07:00
David Kelly	34a89e4b9a	added sounds, new haptics, and some cleanup	2017-03-22 13:26:51 -07:00
David Kelly	a594419688	friend->connection which I should have done long ago	2017-03-22 10:09:48 -07:00