Andrzej Kapolka
|
021dce72be
|
Moved direction vectors to AvatarData, made them align with OpenGL view space
(to avoid the 180 degree rotations).
|
2013-05-30 09:55:34 -07:00 |
|
Stephen Birarda
|
9f2c0adec7
|
move audioLoudness to HeadData
|
2013-05-28 12:22:51 -07:00 |
|
Stephen Birarda
|
65168e6aec
|
add a yaw offset to the oculus so it can pull body
|
2013-05-24 15:23:25 -07:00 |
|
Stephen Birarda
|
59a6016f4b
|
use a NULL default for owningAvatar to simplify constructors
|
2013-05-24 12:18:38 -07:00 |
|
Stephen Birarda
|
49b483ef53
|
maintain a pointer to owning avatar from HeadData
|
2013-05-24 12:17:48 -07:00 |
|
Stephen Birarda
|
36892da488
|
keep a pointer to owning agent in AgentData
|
2013-05-24 12:17:34 -07:00 |
|
Jeffrey Ventrella
|
82af516471
|
ya ya
|
2013-05-22 18:16:11 -07:00 |
|
Jeffrey Ventrella
|
b7613497eb
|
fixed pitch yaw (not roll)
|
2013-05-22 18:14:18 -07:00 |
|
Stephen Birarda
|
4738fc888b
|
return Avatar Head by reference so setters actually do something
|
2013-05-22 16:43:41 -07:00 |
|
Jeffrey Ventrella
|
f866f39ac4
|
cleanups
|
2013-05-22 15:51:25 -07:00 |
|
Jeffrey Ventrella
|
4940a6ae9a
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 15:51:03 -07:00 |
|
Andrzej Kapolka
|
c97b4f5e1d
|
Fix the spacing, and while we're at it, change tabs to spaces.
|
2013-05-22 15:22:05 -07:00 |
|
Andrzej Kapolka
|
365bb10d6b
|
More work on righting based on gravity vector.
|
2013-05-22 13:30:30 -07:00 |
|
Jeffrey Ventrella
|
3c3a3fc82e
|
cleaning up look at code - Stephen helped find a transmission bug - fixed.
|
2013-05-22 13:12:11 -07:00 |
|
Jeffrey Ventrella
|
f7b101b4aa
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 11:43:12 -07:00 |
|
Philip Rosedale
|
8b65fcae75
|
Merge pull request #352 from tschw/master
refactors logging, adds comments, and revises names & formatting in all submitted code
|
2013-05-21 22:10:10 -07:00 |
|
Jeffrey Ventrella
|
e219cd8223
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-21 17:44:45 -07:00 |
|
Jeffrey Ventrella
|
c32d621d5f
|
improving lookat behavior
|
2013-05-21 17:38:17 -07:00 |
|
tosh
|
0261f50298
|
merge up
|
2013-05-21 23:13:03 +02:00 |
|
ZappoMan
|
9f23f846a9
|
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
|
2013-05-21 12:47:46 -07:00 |
|
ZappoMan
|
e29bc9972f
|
code cleanup
|
2013-05-21 11:34:31 -07:00 |
|
ZappoMan
|
3220f986d6
|
code cleanup
|
2013-05-21 11:33:32 -07:00 |
|
ZappoMan
|
4f9c7fed59
|
removed UI for want exists bits, defaults to true
|
2013-05-21 11:25:50 -07:00 |
|
tosh
|
bfaeb4a4d9
|
Merge branch 'master' of git://github.com/worklist/hifi
Conflicts:
libraries/avatars/src/AvatarData.cpp
|
2013-05-21 18:46:20 +02:00 |
|
Stephen Birarda
|
d2b2d36fcf
|
lazy allocation of HeadData in getBroadcastData
|
2013-05-20 17:31:33 -07:00 |
|
Stephen Birarda
|
564244ddd3
|
move _leanSideways and _leanForwards to HeadData
|
2013-05-20 17:13:40 -07:00 |
|
Stephen Birarda
|
28bab24e70
|
type squishes in AvatarData
|
2013-05-20 16:17:49 -07:00 |
|
Stephen Birarda
|
570dfba934
|
code review comments, cleanup Avatar constructor
|
2013-05-20 16:12:38 -07:00 |
|
tosh
|
a86b8a1d93
|
refactors logging
|
2013-05-21 01:00:10 +02:00 |
|
ZappoMan
|
e1c89aac87
|
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
|
2013-05-20 15:52:04 -07:00 |
|
ZappoMan
|
a53f84fcb9
|
latest hacking
|
2013-05-20 15:51:47 -07:00 |
|
Stephen Birarda
|
de84b7803f
|
move _lookAtPosition to HeadData class
|
2013-05-20 15:51:40 -07:00 |
|
Stephen Birarda
|
257a1d1f2e
|
move head rotations to new HeadData class to be used for transmission
|
2013-05-20 15:21:02 -07:00 |
|
Jeffrey Ventrella
|
44ef5d4bac
|
fix
|
2013-05-20 14:37:09 -07:00 |
|
Jeffrey Ventrella
|
b42d093b4a
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-20 14:36:13 -07:00 |
|
ZappoMan
|
4298b922a2
|
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
Conflicts:
libraries/avatars/src/AvatarData.cpp
|
2013-05-20 13:55:01 -07:00 |
|
ZappoMan
|
e9caa40d9a
|
added exists bits to avatar data
|
2013-05-20 13:54:02 -07:00 |
|
ZappoMan
|
321d1952d6
|
first cut at exists bits
|
2013-05-20 12:56:59 -07:00 |
|
Stephen Birarda
|
c5bba41385
|
resolve conflicts on merge with upstream master
|
2013-05-20 12:49:49 -07:00 |
|
ZappoMan
|
cf065a413c
|
merge
|
2013-05-20 12:36:16 -07:00 |
|
ZappoMan
|
24b34b19b1
|
merge
|
2013-05-20 12:35:18 -07:00 |
|
ZappoMan
|
17c961f1b0
|
merge
|
2013-05-20 12:34:15 -07:00 |
|
ZappoMan
|
6cf8ec32a7
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
libraries/avatars/src/AvatarData.cpp
libraries/avatars/src/AvatarData.h
|
2013-05-20 12:31:35 -07:00 |
|
Stephen Birarda
|
d6ceca4f4b
|
move constructor for AvatarData to implemenation file
|
2013-05-20 12:16:56 -07:00 |
|
ZappoMan
|
fe1f02beff
|
moved constructor
|
2013-05-20 12:16:55 -07:00 |
|
Jeffrey Ventrella
|
545b928971
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-20 12:16:40 -07:00 |
|
birarda
|
1e63bb8d20
|
Merge pull request #353 from ZappoMan/master
fixed Philip's no animation problem
|
2013-05-20 12:15:57 -07:00 |
|
ZappoMan
|
b06cc60665
|
moved constructor
|
2013-05-20 12:14:32 -07:00 |
|
Jeffrey Ventrella
|
a192a21ef0
|
added _lookatPosition to avatar Data
|
2013-05-20 12:08:58 -07:00 |
|
Jeffrey Ventrella
|
4e6b2f9c50
|
test
|
2013-05-20 11:55:55 -07:00 |
|