3297 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrzej Kapolka	fff9d1c372	Formatting.	2013-05-30 10:23:19 -07:00
Andrzej Kapolka	b502321b57	Moved gravity influence multiplier into constant, reduced.	2013-05-30 10:00:52 -07:00
Andrzej Kapolka	021dce72be	Moved direction vectors to AvatarData, made them align with OpenGL view space ... (to avoid the 180 degree rotations).	2013-05-30 09:55:34 -07:00
Andrzej Kapolka	9b301eb235	Merge branch 'master' of https://github.com/worklist/hifi into reorient ... Conflicts: interface/src/Avatar.cpp	2013-05-29 19:13:18 -07:00
Andrzej Kapolka	d6855b6430	Massive changes to orientations: use quaternions rather than Orientation ... class.	2013-05-29 19:05:33 -07:00
birarda	6d57324d0b	Merge pull request #465 from birarda/master ... stop continous killing of audio injectors	2013-05-29 18:37:43 -07:00
Stephen Birarda	1f4e9f3051	update last heard from time for audio injectors	2013-05-29 18:37:03 -07:00
birarda	b4e4e80321	Merge pull request #463 from birarda/master ... distance attenuation tuning	2013-05-29 17:47:23 -07:00
Stephen Birarda	8ba23bc027	tune distance attenuation	2013-05-29 17:46:54 -07:00
birarda	cad55ffb60	Merge pull request #462 from birarda/master ... distance attenutation tuning for audio-mixer	2013-05-29 17:38:43 -07:00
Stephen Birarda	a3942a072f	more tuning on distance attenuation for audio mixer	2013-05-29 17:38:00 -07:00
birarda	14bc87b08c	Merge pull request #461 from birarda/master ... distance attenutation tuning on audio mixer	2013-05-29 17:32:49 -07:00
Stephen Birarda	1b2b0afe3a	tune the distance attenuation on audio-mixer	2013-05-29 17:32:32 -07:00
birarda	f20dd82240	Merge pull request #460 from ZappoMan/disco ... new floor	2013-05-29 17:07:29 -07:00
ZappoMan	49f4df3a5e	coding standard cleanup	2013-05-29 17:07:12 -07:00
ZappoMan	871cddfcc1	coding standard cleanup	2013-05-29 17:05:22 -07:00
ZappoMan	ffffa71d1a	new floor	2013-05-29 16:58:17 -07:00
birarda	8cfbff4bb7	Merge pull request #459 from birarda/master ... fix a crash in the avatar-mixer	2013-05-29 16:57:41 -07:00
Stephen Birarda	bb3feb13eb	correct the currentBufferPosition for injector packets as well	2013-05-29 16:57:13 -07: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
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
birarda	6060e5e42e	Merge pull request #455 from ZappoMan/disco ... dance floor	2013-05-29 15:52:36 -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
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
Stephen Birarda	eb5375869d	also return the list of avatars to audio injectors	2013-05-29 14:34:58 -07: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
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