Jeffrey Ventrella
|
4f0ca2f33e
|
added quaternions to avatar body and bone structure (but not using them yet)
|
2013-04-17 12:31:03 -07:00 |
|
Jeffrey Ventrella
|
3cee28f0ef
|
added back the av position
|
2013-04-17 11:23:47 -07:00 |
|
Jeffrey Ventrella
|
a6f82e1236
|
moved renderOrientstionDiretions to Utils
|
2013-04-16 23:39:43 -07:00 |
|
Jeffrey Ventrella
|
1fb8d0b268
|
consolidated some code in Head.cpp
|
2013-04-16 20:35:50 -07:00 |
|
Stephen Birarda
|
1dd21a450e
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-16 12:00:55 -07:00 |
|
Stephen Birarda
|
e71f21b7bf
|
fix broken builds from last commit, pull new avatar data in VoxelAgentData
|
2013-04-16 11:59:03 -07:00 |
|
Stephen Birarda
|
5c091a51a6
|
change signature of parseData to use unsigned char*, include packet header always
|
2013-04-16 11:51:36 -07:00 |
|
Philip Rosedale
|
b3e99513cb
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-15 18:37:59 -07:00 |
|
Philip Rosedale
|
cd3e414eda
|
Removed unneeded variables in main.cpp for pitch,yaw. Renamed routines to make it more clear where gyros are being read. Re-enabled marker box being driven by head gyros.
|
2013-04-15 18:37:46 -07:00 |
|
Stephen Birarda
|
288a259ac1
|
more conflict resolutions for broken build after pull
|
2013-04-15 18:37:25 -07:00 |
|
Stephen Birarda
|
2b49442039
|
resolve conflicts on merge with upstream master
|
2013-04-15 18:34:40 -07:00 |
|
Stephen Birarda
|
c6f8cc50a9
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-15 18:34:18 -07:00 |
|
Stephen Birarda
|
a5a93443c6
|
re-work AvatarData to handle body position and rotation
|
2013-04-15 18:05:22 -07:00 |
|
Jeffrey Ventrella
|
1e388347dc
|
yargh
|
2013-04-15 18:03:34 -07:00 |
|
Jeffrey Ventrella
|
fc8c0498cf
|
adjusted avatar height and camera up to compensate - improves navigation
|
2013-04-15 16:16:05 -07:00 |
|
Stephen Birarda
|
a4011934c6
|
move Orientation class to avatars library, constants to SharedUtil
|
2013-04-15 15:39:23 -07:00 |
|
Jeffrey Ventrella
|
99c2480642
|
small tweaks to get ready for bigger tweaks in avatar bone logic
|
2013-04-15 15:29:49 -07:00 |
|
Jeffrey Ventrella
|
427253b8b0
|
cleaned up formatting in Head
|
2013-04-15 15:05:30 -07:00 |
|
Jeffrey Ventrella
|
e97383be2e
|
updated many aspects of the avatar hand motion as determined by mouse motion and mouse click
|
2013-04-15 14:58:32 -07:00 |
|
Jeffrey Ventrella
|
574ab04e09
|
Merge remote-tracking branch 'origin/master'
|
2013-04-15 12:06:48 -07:00 |
|
Philip Rosedale
|
d5d746ff9e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-12 21:01:15 -07:00 |
|
Philip Rosedale
|
1d69acef56
|
Removed hand class files, relocated transmitter receiver function to Head.h
|
2013-04-12 21:01:01 -07:00 |
|
Jeffrey Ventrella
|
ca05823010
|
added some smoothness to the camera
|
2013-04-12 18:06:11 -07:00 |
|
ZappoMan
|
5a8c5ff011
|
coding standards clean up
|
2013-04-12 16:55:57 -07:00 |
|
Jeffrey Ventrella
|
6ddebd523c
|
cleaned up Orientation calls to right, up, front
|
2013-04-12 16:52:31 -07:00 |
|
ZappoMan
|
5504d87212
|
Merge and Cleanup
-Cleanup glmUtils(as in, get rid of it)
-Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
|
2013-04-12 16:32:46 -07:00 |
|
Jeffrey Ventrella
|
84ca2dcb32
|
added get avatar bone
|
2013-04-12 16:12:31 -07:00 |
|
ZappoMan
|
25f1f1ae3f
|
include glmUtils.h so that we get vec3 opertator*
|
2013-04-12 15:08:57 -07:00 |
|
Jeffrey Ventrella
|
265fcc6095
|
a few small fixes on the avatar springs
|
2013-04-12 15:00:48 -07:00 |
|
Jeffrey Ventrella
|
948ca6279c
|
improved avatar handshake forces
|
2013-04-11 17:39:18 -07:00 |
|
Jeffrey Ventrella
|
1dc390bf3a
|
working on avatar local ori motions
|
2013-04-11 16:51:08 -07:00 |
|
Jeffrey Ventrella
|
556f11a0c0
|
added test 'other' avatar for proxemixs testing
|
2013-04-11 15:32:35 -07:00 |
|
Jeffrey Ventrella
|
6f0881f40d
|
reversed left-right strafe
|
2013-04-11 13:06:47 -07:00 |
|
Jeffrey Ventrella
|
dbbe7500ac
|
removed negative z hack in avatar. Avatar getting less hacky
|
2013-04-10 21:52:18 -07:00 |
|
Jeffrey Ventrella
|
6b4486c8c9
|
removed Vector3D class and fixed bug in avatar springs
|
2013-04-10 21:34:54 -07:00 |
|
Jeffrey Ventrella
|
f294cc8782
|
working on avatar orientation issues
|
2013-04-10 21:12:15 -07:00 |
|
Jeffrey Ventrella
|
020c21d1d6
|
removed Vector3D class and fixed bug in avatar springs
|
2013-04-10 16:52:48 -07:00 |
|
Jeffrey Ventrella
|
3871c220b2
|
improved hand movement - now transformed to av rotation
|
2013-04-10 15:27:04 -07:00 |
|
Jeffrey Ventrella
|
a523a24c23
|
fixed hand motion stuff
|
2013-04-10 15:00:28 -07:00 |
|
Jeffrey Ventrella
|
797cec4513
|
hello!
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 14:29:14 -07:00 |
|
Jeffrey Ventrella
|
7b4d0b5598
|
removed bone spam
|
2013-04-10 14:29:08 -07:00 |
|
ZappoMan
|
4b7b5437ac
|
some cleanup of view frustum debugging code
|
2013-04-10 13:26:21 -07:00 |
|
Jeffrey Ventrella
|
228f76c789
|
Thingy!
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 12:54:57 -07:00 |
|
Jeffrey Ventrella
|
be5044c560
|
flipped y direction of up-down avatar navigation
|
2013-04-10 12:54:52 -07:00 |
|
Philip Rosedale
|
d57a4428d9
|
deleted unused stuff that caused conflict with myAvatar change
|
2013-04-10 12:47:40 -07:00 |
|
Jeffrey Ventrella
|
089271f615
|
whatever you say, git.
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-10 12:13:03 -07:00 |
|
Jeffrey Ventrella
|
ab8140e0ef
|
fixed a bug in avatar head lookat direction
|
2013-04-10 12:12:57 -07:00 |
|
vincent
|
1e2e505301
|
Another merge and fix ...
|
2013-04-10 20:41:46 +02:00 |
|
Jeffrey Ventrella
|
8f969f9ca9
|
adding ground plane grid (again???)
|
2013-04-10 01:03:35 -07:00 |
|
Jeffrey Ventrella
|
81b311f753
|
added a method to ask the avatar for it's head lookat vector
|
2013-04-09 18:41:01 -07:00 |
|