732 commits

Author	SHA1	Message	Date
Philip Rosedale	b9fb888073	Small speed/cleanup to thrust setting	2013-04-25 10:02:14 -07:00
Philip Rosedale	ba55175870	Gravity is ON near origin, off in space, and a gravity field can be created with getGravity()	2013-04-25 09:50:35 -07:00
Philip Rosedale	fd329cd1bb	Merge remote-tracking branch 'upstream/master'	2013-04-24 17:56:57 -07:00
Jeffrey Ventrella	80576120ee	Merge remote-tracking branch 'upstream/master'	2013-04-24 17:54:31 -07:00
Jeffrey Ventrella	72e6e18992	fixed avatar collisions	2013-04-24 17:54:09 -07:00
Philip Rosedale	fe1357aba2	Merge remote-tracking branch 'upstream/master'	2013-04-24 17:45:58 -07:00
Philip Rosedale	2a3d06f6de	Fixed warning in starfield code	2013-04-24 17:45:26 -07:00
birarda	d4e64462dd	Merge pull request #141 from PhilipRosedale/master ... Wider log, log screen in menu	2013-04-24 17:05:12 -07:00
Jeffrey Ventrella	2163976f06	adding the files	2013-04-24 17:01:59 -07:00
Philip Rosedale	0e4da5198d	Merge remote-tracking branch 'upstream/master'	2013-04-24 16:59:18 -07:00
Jeffrey Ventrella	ff1334d8b6	Merge remote-tracking branch 'upstream/master'	2013-04-24 16:58:54 -07:00
Philip Rosedale	bc65126004	Wider log window, log panel on by default, menu->tools->log to control.	2013-04-24 16:58: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
Philip Rosedale	6c986a1049	Merge pull request #127 from tschw/19188 ... 19188	2013-04-24 16:53:04 -07:00
birarda	b8054790b0	Merge pull request #138 from Ventrella/master ... major changes to hand holding logic (ordering mostly)	2013-04-24 16:45:33 -07:00
Jeffrey Ventrella	a9ff483d3d	fix	2013-04-24 15:35:11 -07:00
Andrzej Kapolka	6c435569c2	Merge branch 'master' of https://github.com/worklist/hifi	2013-04-24 15:31:10 -07:00
Andrzej Kapolka	e02aaa39f7	To fix font rendering on Linux (which uses points), we need to restore the ... default point size attenuation settings.	2013-04-24 14:59: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
Philip Rosedale	055e62c165	Merge remote-tracking branch 'upstream/master'	2013-04-24 12:24:09 -07:00
Andrzej Kapolka	63a581dae4	Added normals to voxel geometry, enabling lighting.	2013-04-24 11:47:44 -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
Philip Rosedale	50af1f68bf	Merge remote-tracking branch 'upstream/master'	2013-04-24 08:46:27 -07:00
Jeffrey Ventrella	ee9ae3f220	improved avatar hand-holding logic	2013-04-24 08:13:15 -07:00
tosh	225188a6f9	Merge branch 'master' of git://github.com/worklist/hifi into 19188	2013-04-24 13:32:30 +02: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
Philip Rosedale	d65f577268	Merge remote-tracking branch 'upstream/master'	2013-04-23 21:12:24 -07:00
Jeffrey Ventrella	48da3f726e	fixed bug - didn't change bodyPosition in eve or voxel	2013-04-23 21:07:40 -07:00
Philip Rosedale	a440570cb4	Merge remote-tracking branch 'upstream/master'	2013-04-23 21:00:53 -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
Philip Rosedale	99a4d0f3dc	Merge remote-tracking branch 'upstream/master'	2013-04-23 20:11:35 -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
Philip Rosedale	be7fb7bce5	Merge remote-tracking branch 'upstream/master'	2013-04-23 13:32:15 -07:00
Philip Rosedale	d550b09399	Added 'gyro look' option to have gyro drive your render yaw, added render menu.	2013-04-23 13:31:05 -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