3456 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	bb3feb13eb	correct the currentBufferPosition for injector packets as well	2013-05-29 16:57:13 -07:00
Jeffrey Ventrella	88ff0ea7aa	merge	2013-05-29 16:54:15 -07:00
Jeffrey Ventrella	a35ff8e944	Merge remote-tracking branch 'upstream/master'	2013-05-29 16:53:28 -07:00
Jeffrey Ventrella	4c7d75b39e	testing avatar touch	2013-05-29 16:52:48 -07:00
Geenz	f0d7b47c37	Merge branch 'master' of https://github.com/worklist/hifi into 19308	2013-05-29 19:47:54 -04:00
birarda	73168af4d1	Merge pull request #458 from birarda/master ... move the mouth out farther in front of the face	2013-05-29 16:38:35 -07:00
Stephen Birarda	089dc3669d	push the mouth out in front of the face	2013-05-29 16:37:40 -07:00
Jeffrey Ventrella	f7a0e8018a	Merge remote-tracking branch 'upstream/master'	2013-05-29 16:15:16 -07:00
Jeffrey Ventrella	63434da23c	testing avatar touch	2013-05-29 16:14:55 -07:00
birarda	64d02f5f5f	Merge pull request #457 from birarda/master ... make it harder to quit accidentally	2013-05-29 16:06:40 -07:00
ZappoMan	3a80e09165	Merge pull request #456 from birarda/master ... allow the injector to fire based on a trigger distance	2013-05-29 16:05:30 -07:00
Stephen Birarda	b0a8de818d	make quit CMD-Q instead of just Q	2013-05-29 16:05:03 -07:00
Stephen Birarda	c0a9914efd	add trigger based firing to audio injector	2013-05-29 16:03:32 -07:00
Jeffrey Ventrella	9f603c3eff	Merge remote-tracking branch 'upstream/master'	2013-05-29 15:54:20 -07:00
Jeffrey Ventrella	5750adf6fd	test	2013-05-29 15:53:47 -07:00
birarda	6060e5e42e	Merge pull request #455 from ZappoMan/disco ... dance floor	2013-05-29 15:52:36 -07:00
Jeffrey Ventrella	56dbef9e78	Merge remote-tracking branch 'upstream/master'	2013-05-29 15:49:46 -07:00
ZappoMan	1fcf787991	dance floor	2013-05-29 15:42:29 -07:00
birarda	c8bc2f0f14	Merge pull request #454 from birarda/camera-fix ... one line fix for camera transition	2013-05-29 15:32:30 -07:00
Stephen Birarda	02333644dc	one line fix in AvatarTouch	2013-05-29 15:31:18 -07:00
Jeffrey Ventrella	72688d86ca	Merge remote-tracking branch 'upstream/master'	2013-05-29 15:25:05 -07:00
Jeffrey Ventrella	66c7da6552	simplify avatar proximity check for 1p transition	2013-05-29 15:24:37 -07:00
Stephen Birarda	7611972bca	link the avatars library to the injector target	2013-05-29 15:06:10 -07:00
Stephen Birarda	c259b025db	fix a crash in audio injector when there is no audio mixer	2013-05-29 15:05:39 -07:00
Stephen Birarda	19e29585fc	remove some spacing at the bottom of eve main	2013-05-29 15:04:22 -07:00
ZappoMan	46c6f2f9b5	latest copy paste	2013-05-29 15:02:28 -07:00
Stephen Birarda	eb5375869d	also return the list of avatars to audio injectors	2013-05-29 14:34:58 -07:00
Geenz	c33d2ee25e	Coding standard cleanup based upon ZappoMan's suggestions.	2013-05-29 16:46:47 -04:00
birarda	23e24287d3	Merge pull request #452 from ZappoMan/master ... Temporary hack fix to voxels not discarding	2013-05-29 12:16:06 -07:00
ZappoMan	c70ade0cc1	temporary hack fix to not discarding voxels	2013-05-29 12:14:45 -07:00
ZappoMan	377fb1e936	latest copy and paste	2013-05-29 12:06:58 -07:00
Philip Rosedale	eb4c2358a5	Merge pull request #451 from Ventrella/master ... increased hand motion sensitivity	2013-05-29 11:52:39 -07:00
Jeffrey Ventrella	ab1c00dac6	Merge remote-tracking branch 'upstream/master'	2013-05-29 11:51:34 -07:00
Jeffrey Ventrella	e34193f1d7	increased hand motion sensitivity	2013-05-29 11:51:16 -07:00
ZappoMan	408fef0de8	Merge pull request #450 from birarda/master ... make audio echo a menu option instead of forcing it with the mirror mode	2013-05-29 11:47:38 -07:00
Stephen Birarda	b6a0662c98	inline the shouldEchoAudio	2013-05-29 11:47:02 -07:00
Philip Rosedale	7fc8b6932d	Merge pull request #448 from Ventrella/master ... transparency fix	2013-05-29 11:44:34 -07:00
Jeffrey Ventrella	ab3b0c8aa3	alpha	2013-05-29 11:43:42 -07:00
Stephen Birarda	a5a30efec9	CR fixes	2013-05-29 11:42:10 -07:00
Jeffrey Ventrella	f02e8dae23	Merge remote-tracking branch 'upstream/master'	2013-05-29 11:40:19 -07:00
Jeffrey Ventrella	350bd878fc	fix	2013-05-29 11:39:53 -07:00
Stephen Birarda	5d74a865e8	make audio echo a menu option instead of forcing with mirror	2013-05-29 11:35:32 -07:00
ZappoMan	0443942ccb	Merge pull request #449 from birarda/mixer-crash ... temporary fix for mixer crash	2013-05-29 11:35:26 -07:00
Stephen Birarda	76f7752f2f	remove debugging used to track down mixer crash	2013-05-29 11:31:46 -07:00
Stephen Birarda	56e0e3882d	kill agents who send NaN bearings	2013-05-29 11:29:38 -07:00
Jeffrey Ventrella	39805db040	Merge remote-tracking branch 'upstream/master'	2013-05-29 11:27:36 -07:00
Jeffrey Ventrella	39499e4a92	fix to head transparency	2013-05-29 11:26:06 -07:00
Stephen Birarda	1fb61faded	fix the isnan check for agent bearing	2013-05-29 11:22:25 -07:00
Stephen Birarda	f45062a097	don't use audio when the bearing sent by the agent is garbage	2013-05-29 11:14:50 -07:00
Stephen Birarda	78df9fb2ed	last pieces of debugging for mixer crash	2013-05-29 11:04:46 -07:00