Commit graph

155 commits

Author SHA1 Message Date
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
Philip Rosedale
dd33cedf8d Removed old serial code for Maple ADC 2013-05-09 14:01:22 -07:00
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