186 commits

Author	SHA1	Message	Date
Stephen Birarda	a1ea7b58dd	remove unused GLUQuadric sphere from Avatar class	2013-05-17 10:45:26 -07:00
Stephen Birarda	0e7c0776f2	refactor the Head class to remove _sphere and use default copy constructor	2013-05-17 10:43:26 -07:00
Jeffrey Ventrella	0edf72a2be	trying to fix merge conflicts	2013-05-17 09:20:42 -07:00
Jeffrey Ventrella	7e0877e753	cleanup	2013-05-17 08:48:54 -07:00
Philip Rosedale	e55efb81a8	Added acceleration decay of pitch (you look up/straight if you start moving)	2013-05-16 19:12:48 -06:00
Jeffrey Ventrella	1c126e2525	resolved conflicts	2013-05-16 17:32:54 -07:00
Jeffrey Ventrella	750a48bb73	cleaned up head class - made most members private. Added copy constructor	2013-05-16 17:20:00 -07:00
ZappoMan	068e863fb4	Merge pull request #334 from PhilipRosedale/master ... Mouse moves pitch, yaw when near screen edge, gravity bouncing fixed!	2013-05-16 16:24:42 -07:00
Philip Rosedale	aad5f3bfff	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-16 17:21:24 -06:00
Andrzej Kapolka	26badc56e0	Added shadow and outline effects to TextRenderer, use the shadow effect in ... our text to separate it from the background.	2013-05-16 16:10:38 -07:00
Philip Rosedale	9f57787ece	Fixed jerking on gravity, added mouse pitch, yaw behavior.	2013-05-16 17:05:45 -06:00
Philip Rosedale	b2709652b4	Tweaks to improve mouse Yaw behavior.	2013-05-16 14:43:46 -06:00
Philip Rosedale	78bd5ab40f	Fixes per review	2013-05-16 13:34:48 -06:00
Jeffrey Ventrella	aafb557b02	turned off look at behavior - until it is finished and working correctly	2013-05-16 12:14:36 -07:00
Jeffrey Ventrella	04828c8224	cleaned up copyright header notifications in several files	2013-05-16 12:06:36 -07:00
Philip Rosedale	1b039c3755	Transmitter V2 drives the hand, and rendering levels with 'l' shows the hand transmitter data. Physics will need to be tuned.	2013-05-16 00:10:10 -06:00
Philip Rosedale	124f04820e	Removed renderPitch(), and renderYaw() from code/classes - we will use bodyPitch(), headPitch() only.	2013-05-15 09:52:12 -07:00
Philip Rosedale	daaf86a634	restrict avatar body yaw to be between 0-360	2013-05-15 08:06:53 -07:00
Jeffrey Ventrella	a0e8c0da74	more work on avatar lookat	2013-05-14 18:15:54 -07:00
Jeffrey Ventrella	f53b49c496	working on lookat (eye contact)	2013-05-14 17:30:41 -07:00
Philip Rosedale	6cfdf96dea	Added mouse panning in the Yaw direction - at edges of screen.	2013-05-14 17:11:16 -07:00
Jeffrey Ventrella	acda87502e	more work on camera shifting between modes	2013-05-14 11:43:51 -07:00
Jeffrey Ventrella	6c3de00bcd	cleaned up some code spacing	2013-05-13 14:53:05 -07:00
Jeffrey Ventrella	3ab0fa4e8c	added code to detect mouse hovering over avatar joints for various touch effects	2013-05-13 14:00:25 -07:00
Jeffrey Ventrella	ab9fa0a556	cleaned up some code	2013-05-10 22:31:51 -07:00
Jeffrey Ventrella	f1346604f4	indentation	2013-05-10 22:10:06 -07:00
Jeffrey Ventrella	847bfbdadd	mode cleanup after head operation	2013-05-10 17:29:04 -07:00
Jeffrey Ventrella	7fc2756257	I just did a headotomy (removed all head-related stuff from Avatar and made it its own class)	2013-05-10 17:05:52 -07:00
Jeffrey Ventrella	2032264e7e	pull avatar from handshake	2013-05-10 13:42:51 -07:00
Jeffrey Ventrella	ca5adb791c	pull avatars from handholding	2013-05-10 13:25:40 -07:00
Jeffrey Ventrella	9db5d7e202	hand holding	2013-05-10 12:45:37 -07:00
Jeffrey Ventrella	87f8df7e7b	...	2013-05-10 12:28:46 -07:00
Jeffrey Ventrella	685df2c65c	thingy	2013-05-10 12:23:58 -07:00
Jeffrey Ventrella	619c1a843f	working on hand holding algo	2013-05-10 12:18:49 -07:00
Jeffrey Ventrella	40e7603e49	removed print statements	2013-05-10 11:27:07 -07:00
Jeffrey Ventrella	470349d662	made avatars taller an fixed proportions a bit	2013-05-09 23:31:45 -07:00
Jeffrey Ventrella	6254a6886f	cleaned up camera code and improved first person mode	2013-05-09 22:11:33 -07:00
Jeffrey Ventrella	697e0d0cbe	fixed spacing issue	2013-05-09 17:51:05 -07:00
Jeffrey Ventrella	6dfa20976d	Merge remote-tracking branch 'upstream/master'	2013-05-09 17:24:50 -07:00
Jeffrey Ventrella	eed56db9e5	more fixes to hand holding	2013-05-09 17:24:16 -07:00
Jeffrey Ventrella	ede3cc2f3d	tweak tweak	2013-05-09 17:18:26 -07:00
Jeffrey Ventrella	ab3ee1688d	more work on hand holding	2013-05-09 17:14:54 -07:00
Jeffrey Ventrella	6c58dbeab2	thingy	2013-05-09 17:02:40 -07:00
Jeffrey Ventrella	9d548c43ad	twiddle tweak iterate whittle	2013-05-09 16:54:01 -07:00
Jeffrey Ventrella	513701391e	working on hand touching	2013-05-09 16:07:43 -07:00
Jeffrey Ventrella	c2deba6e39	improved avatar touch code	2013-05-09 15:15:28 -07:00
Philip Rosedale	52337a1fae	Merge remote-tracking branch 'upstream/master'	2013-05-09 15:03:45 -07:00
Philip Rosedale	c0a54eca14	Added head lean to broadcast data packets, lean now being set from invensense accelerometers.	2013-05-09 15:03:19 -07:00
Jeffrey Ventrella	3ba93397bd	fixed a bug in menu clicking	2013-05-09 14:37:13 -07:00
Philip Rosedale	ef1848a68c	Merge remote-tracking branch 'upstream/master'	2013-05-09 14:03:03 -07:00