Commit graph

41 commits

Author SHA1 Message Date
Jeffrey Ventrella
de49d7fc6c more fixes 2013-05-31 17:32:30 -07:00
Jeffrey Ventrella
fdfc639c23 merge 2013-05-31 13:52:22 -07:00
Andrzej Kapolka
fff9d1c372 Formatting. 2013-05-30 10:23:19 -07:00
Andrzej Kapolka
9b301eb235 Merge branch 'master' of https://github.com/worklist/hifi into reorient
Conflicts:
	interface/src/Avatar.cpp
2013-05-29 19:13:18 -07:00
Andrzej Kapolka
d6855b6430 Massive changes to orientations: use quaternions rather than Orientation
class.
2013-05-29 19:05:33 -07:00
Jeffrey Ventrella
63434da23c testing avatar touch 2013-05-29 16:14:55 -07:00
Jeffrey Ventrella
5750adf6fd test 2013-05-29 15:53:47 -07:00
Stephen Birarda
02333644dc one line fix in AvatarTouch 2013-05-29 15:31:18 -07:00
Jeffrey Ventrella
66c7da6552 simplify avatar proximity check for 1p transition 2013-05-29 15:24:37 -07:00
Jeffrey Ventrella
350bd878fc fix 2013-05-29 11:39:53 -07:00
Jeffrey Ventrella
31ff768363 fixed some glitches in avatar render alpha transition between 3p and 1p 2013-05-29 08:30:14 -07:00
Jeffrey Ventrella
0e329af03e made inline 2013-05-28 18:55:21 -07:00
Jeffrey Ventrella
b98d03337d fixed bug causing camera to not get updated position of other av 2013-05-28 18:49:16 -07:00
Jeffrey Ventrella
e4c0aeb9a0 added AVATAR_FACING_THRESHOLD to avatarTouch 2013-05-28 18:15:29 -07:00
Jeffrey Ventrella
2b31e79a0b cleanup 2013-05-26 15:23:44 -07:00
Jeffrey Ventrella
883d21a5e4 added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code 2013-05-26 15:17:58 -07:00
Jeffrey Ventrella
04828c8224 cleaned up copyright header notifications in several files 2013-05-16 12:06:36 -07:00
Jeffrey Ventrella
939665419d made some improvements to handshake 2013-05-10 13:04:41 -07:00
Jeffrey Ventrella
eb49a9e4f2 hand holding 2013-05-10 12:52:39 -07:00
Jeffrey Ventrella
619c1a843f working on hand holding algo 2013-05-10 12:18:49 -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
Jeffrey Ventrella
3ba93397bd fixed a bug in menu clicking 2013-05-09 14:37:13 -07:00
Jeffrey Ventrella
8ecfbce15e fixed some small formatting things 2013-05-09 14:00:40 -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
fe11d929e3 cleaned up code spacing 2013-05-07 08:43:14 -07:00
Jeffrey Ventrella
65181cb4e0 changed some spacing formatting things 2013-05-06 22:23:16 -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
35a8066bd6 fixed merge problem 2013-05-02 11:05:51 -07:00
Jeffrey Ventrella
c88a7f8f55 fixed merge 2013-05-01 13:51:59 -07:00
Jeffrey Ventrella
b388e9a760 (1) re-designed and debugged the orientation class and cleaned up quaternion code, and fixed issues in camera and main related to yaw and camera transforms (2) improved hand-holding algorithm 2013-05-01 13:00:08 -07:00
Andrzej Kapolka
8b742e43e6 GCC fails on these constants (ISO C++ forbids initialization of member
‘COLLISION_BALL_FORCE’), so I moved them into the CPP (they don't seem to
require external visibility anyway).
2013-04-30 10:15:48 -07:00
Jeffrey Ventrella
fe9ab0a213 improved collisions 2013-04-29 14:11:33 -07:00
Jeffrey Ventrella
caac600030 improved hand holding algorithm 2013-04-27 22:00:02 -07:00
Jeffrey Ventrella
ce1ceb849f Added HandControl class and also Avatar Touch class 2013-04-25 23:32:04 -07:00