135 commits

Author	SHA1	Message	Date
Jeffrey Ventrella	8ecfbce15e	fixed some small formatting things	2013-05-09 14:00:40 -07:00
Jeffrey Ventrella	14d47d87d8	thingy	2013-05-09 13:52:03 -07:00
Jeffrey Ventrella	14b943f1f7	added lean code for Philip...	2013-05-09 13:48:05 -07:00
Jeffrey Ventrella	b61a9687f8	thingy	2013-05-09 13:14:08 -07:00
Jeffrey Ventrella	17c61c88c7	cleaned up avatar slow-down upon nearness; fixed mouse pressed bug;	2013-05-09 13:04:22 -07:00
Jeffrey Ventrella	7cfc9844a3	Merge remote-tracking branch 'upstream/master'	2013-05-09 11:22:55 -07:00
Jeffrey Ventrella	e923f5446d	clean up	2013-05-09 11:22:24 -07:00
Jeffrey Ventrella	a75f655e40	Merge remote-tracking branch 'upstream/master'	2013-05-08 22:46:57 -07:00
Jeffrey Ventrella	0ac2765b09	cleaned up a few small code thingies; added a check for where avatar velocity updates avatar position;	2013-05-08 22:45:28 -07:00
Philip Rosedale	39c35ea5c4	spacing	2013-05-08 21:19:33 -07:00
Philip Rosedale	5db7b74c1e	spacing	2013-05-08 21:19:15 -07:00
Philip Rosedale	2bf9b3e6fd	Fixed problem with springy body repositioning on startup	2013-05-08 21:18:10 -07:00
Philip Rosedale	408a21b515	Fixed Eve's missing mouth and the bad triangles!	2013-05-08 20:26:38 -07:00
Philip Rosedale	14f0ecdc51	Lowered avatar drag to allow faster flight, increased drag when near others	2013-05-08 20:07:27 -07:00
Philip Rosedale	ddc97a6ac9	Merge remote-tracking branch 'upstream/master'	2013-05-08 19:36:45 -07:00
Philip Rosedale	76c5a74876	Added gyro pitch to view, moved onscreen displays around to look nicer.	2013-05-08 19:35:48 -07:00
Jeffrey Ventrella	bbd85664d6	Merge remote-tracking branch 'upstream/master'	2013-05-08 19:24:07 -07:00
Jeffrey Ventrella	7a24c50063	put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer	2013-05-08 19:22:21 -07:00
Philip Rosedale	fd5789abb8	Merge remote-tracking branch 'upstream/master'	2013-05-08 14:40:53 -07:00
Philip Rosedale	a9882d054f	Invensense gyros now correctly controlling head motion, code cleanups.	2013-05-08 14:39:41 -07:00
Philip Rosedale	131377aaf9	Converted gyro values to floats and converted to exact degrees/second per docs.	2013-05-08 11:22:49 -07:00
Jeffrey Ventrella	9e60c8a36e	increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder	2013-05-08 08:59:29 -07:00
ZappoMan	005b2fce35	Merge pull request #223 from Ventrella/master ... cleaned up a bunch of spacings inside of parentheses	2013-05-07 17:51:43 -07:00
Philip Rosedale	be1b803656	Noise Test function, adjust chat position	2013-05-07 10:41:39 -07:00
Jeffrey Ventrella	fe11d929e3	cleaned up code spacing	2013-05-07 08:43:14 -07:00
Philip Rosedale	c7635604a9	Fixes in merge.	2013-05-07 08:40:11 -07:00
Jeffrey Ventrella	65181cb4e0	changed some spacing formatting things	2013-05-06 22:23:16 -07:00
Philip Rosedale	00c8673ceb	Added Utility function angleBetween() which returns the positive angle between any two 3D vectors.	2013-05-06 18:45:06 -07:00
Jeffrey Ventrella	22a0e39d6c	more work on avatar touch, reachable radius, and hand states	2013-05-06 18:29:20 -07:00
Jeffrey Ventrella	9fc56a6230	working out avatar touch stuff	2013-05-06 16:59:43 -07:00
Jeffrey Ventrella	fd4a0c9acd	working on detection of avatars entering into each other's peripersonal space	2013-05-06 16:17:16 -07:00
Jeffrey Ventrella	c1ac3eb320	improving the code for detecting collisions, hand movement and handholding	2013-05-06 15:14:13 -07:00
Jeffrey Ventrella	114dfeacf6	thingy	2013-05-06 14:22:01 -07:00
Jeffrey Ventrella	40771e4c47	thingy	2013-05-06 14:18:14 -07:00
Jeffrey Ventrella	6273594f51	made a call to initializeBodySprings at the end of initializeSkeleton	2013-05-06 12:56:31 -07:00
Jeffrey Ventrella	2a1bbcc168	improved avatar gravity code and moved source of gravity vector to main.cpp	2013-05-06 12:35:52 -07:00
Jeffrey Ventrella	40213dfedd	Merge remote-tracking branch 'upstream/master'	2013-05-06 11:31:33 -07:00
Jeffrey Ventrella	5c7fd0fe7d	a few small formatting and glitch fixes	2013-05-06 11:29:18 -07:00
Stephen Birarda	928beac8e0	Merge branch 'master' of github.com:worklist/hifi into invensense	2013-05-06 10:38:53 -07:00
ZappoMan	7d1e271c39	fix bug in bogus avatar data file	2013-05-04 08:23:06 -07:00
Jeffrey Ventrella	f8762c5e37	added avatar data file stuff that got lost during a merge or something	2013-05-03 16:58:52 -07:00
Jeffrey Ventrella	cb8e68f300	fixed a physics bug in avatar body spring (forgot to use deltaTime) - and adjusted various physics constants accordingly.	2013-05-03 16:11:35 -07:00
Stephen Birarda	24c1ea5e7f	resolve conflicts on merge with upstream master	2013-05-03 15:37:22 -07:00
Jeffrey Ventrella	85ad5601d7	added avatar shadow	2013-05-03 15:22:01 -07:00
Stephen Birarda	1a8564f9d9	store avatar position and yaw in file to restore on relaunch	2013-05-03 15:05:28 -07:00
Jeffrey Ventrella	8457b91fe0	cleaned up a bunch of leftover tabs and converted each to 4 spaces	2013-05-03 11:15:49 -07:00
Jeffrey Ventrella	026ee4345c	Merge remote-tracking branch 'upstream/master'	2013-05-03 10:54:07 -07:00
Jeffrey Ventrella	e0b33e56da	couple of small code cleanups	2013-05-03 10:52:44 -07:00
Andrzej Kapolka	346f213e3b	Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: interface/src/Avatar.cpp interface/src/Avatar.h interface/src/main.cpp	2013-05-03 10:31:40 -07:00
Philip Rosedale	1fbc13941d	Fixes per merge (Ventrella)	2013-05-03 10:16:58 -07:00