206 commits

Author	SHA1	Message	Date
Jeffrey Ventrella	bbeac7701a	small fix	2013-05-18 14:43:23 -07:00
Jeffrey Ventrella	5a4813d5c9	improved algorithm for rotating eyes to look at target	2013-05-18 14:31:27 -07:00
Jeffrey Ventrella	f2af37801e	tidied up the head class and fixed a negated pitch value in orientation	2013-05-17 14:56:14 -07:00
Stephen Birarda	ce7918108c	remove a lingering comment	2013-05-17 11:09:23 -07:00
Stephen Birarda	194035e464	repair indentation in Head constructor	2013-05-17 11:08:44 -07:00
Stephen Birarda	a11ddee974	fix the width and height for the new iris texture	2013-05-17 10:55:11 -07:00
Stephen Birarda	b2518e0595	change the iris texture	2013-05-17 10:51:29 -07:00
Stephen Birarda	c214e9b179	use the default Avatar destructor, comment out unused consts in Head	2013-05-17 10:46:59 -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	7e0877e753	cleanup	2013-05-17 08:48:54 -07: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
Philip Rosedale	9f57787ece	Fixed jerking on gravity, added mouse pitch, yaw behavior.	2013-05-16 17:05:45 -06:00
Philip Rosedale	78bd5ab40f	Fixes per review	2013-05-16 13:34:48 -06:00
Jeffrey Ventrella	cd248188d9	thingy	2013-05-16 12:19:20 -07: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	72d657b51d	Preventing render bug with mis-scaled mouth (part of screen all black)	2013-05-15 10:00:30 -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
Jeffrey Ventrella	acda87502e	more work on camera shifting between modes	2013-05-14 11:43:51 -07:00
Jeffrey Ventrella	ab9fa0a556	cleaned up some code	2013-05-10 22:31:51 -07:00
Jeffrey Ventrella	b2d5bfab2b	clean up from headotomy	2013-05-10 17:12:16 -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	e54fd0dd7d	renamed "Head" to "Avatar" and did a bunch a cleanups, including removing the three-lined comments	2013-04-24 16:54:07 -07:00
Jeffrey Ventrella	a9ff483d3d	fix	2013-04-24 15:35:11 -07:00
Jeffrey Ventrella	e93430d553	fix	2013-04-24 14:56:29 -07:00
Jeffrey Ventrella	bfc4befb9b	Merge remote-tracking branch 'upstream/master'	2013-04-24 14:55:25 -07:00
Jeffrey Ventrella	86086ef20c	just did a fairly major re-ordering of avatar interaction logic in Head.cpp	2013-04-24 14:52:04 -07:00
Stephen Birarda	9c3ebf9f64	only set hand state for mouse press for me	2013-04-24 14:11:07 -07:00
Philip Rosedale	179bdc9fa2	Merge remote-tracking branch 'upstream/master'	2013-04-24 13:12:40 -07:00
Philip Rosedale	33f95c696b	Fixes per code review	2013-04-24 13:12:08 -07:00
Stephen Birarda	cfbe8a719c	fix getter for hand state in AvatarData	2013-04-24 12:39:25 -07:00
Jeffrey Ventrella	4e7f1ee422	more cleanup of hand holding code	2013-04-24 11:39:43 -07:00
Philip Rosedale	78aa4fdf80	Simplified average loudness calculation, mouths and eyebrows of other people now move again!	2013-04-24 11:26:59 -07:00
Jeffrey Ventrella	eca6999c2c	added behavior in Eve for alternating between grasping and ungrasping hand (tho unable to test transmission). Also, improved readability of hand grasping logic in Head.cpp	2013-04-24 11:02:23 -07:00
Jeffrey Ventrella	ee9ae3f220	improved avatar hand-holding logic	2013-04-24 08:13:15 -07:00
Jeffrey Ventrella	8135a45ccf	removed pinky orientation lines in avatar bones	2013-04-23 22:05:02 -07:00
Jeffrey Ventrella	54aac82e9c	cleanup	2013-04-23 21:30:53 -07:00
Jeffrey Ventrella	61a17060c3	one more glitch...	2013-04-23 21:17:39 -07:00
Jeffrey Ventrella	48da3f726e	fixed bug - didn't change bodyPosition in eve or voxel	2013-04-23 21:07:40 -07:00
Jeffrey Ventrella	428cb89895	Merge remote-tracking branch 'upstream/master'	2013-04-23 20:44:50 -07:00
Jeffrey Ventrella	61d7a82fc6	made lots of changes in the logic of how my avatar encounters other avatars and detects hand state	2013-04-23 20:44:12 -07:00
Jeffrey Ventrella	eb631e2ef6	renamed "bodyPosition" to "position". (This corresponds to the position of the avatar on the ground, where y=0). I will next add a new "getBodyPosition" which returns the avatar's center of gravity - is useful for certain purposes, such as setting collision volumes, etc.	2013-04-23 14:05:23 -07:00
Jeffrey Ventrella	a73ea8c255	some preparation for adding hand state to avatar interactions	2013-04-23 13:48:34 -07:00
Stephen Birarda	42ba5a51d4	Merge remote-tracking branch 'upstream/master'	2013-04-23 13:38:59 -07:00
Stephen Birarda	7ae320d7e1	intial version of eve that says WALL-E every so often	2013-04-23 13:37:49 -07:00
Jeffrey Ventrella	e19d4fd5f9	changes from Philip's push - I assume	2013-04-23 12:23:08 -07:00
Jeffrey Ventrella	a1e3149d6a	Merge remote-tracking branch 'upstream/master'	2013-04-23 12:20:26 -07:00
Philip Rosedale	5556686875	Fixes from brad's review	2013-04-23 11:59:43 -07:00