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
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
Jeffrey Ventrella
570d2e104a
test
2013-05-20 11:53:42 -07:00
Jeffrey Ventrella
ffbc70814a
preparing to add transmitted lookat position data
2013-05-20 11:41:21 -07:00
ZappoMan
06242a82c4
fixed Philip's no animation problem
2013-05-19 20:53:46 -07:00
Stephen Birarda
b7b39c2a6e
have addOrUpdateAgent return a pointer to the agent instead of a bool
2013-05-17 14:03:15 -07:00
Stephen Birarda
fb2f36519d
inline getters and setters in AvatarData
2013-05-17 12:19:19 -07:00
Stephen Birarda
199853711f
disallow copying of AvatarData objects
2013-05-17 12:15:10 -07:00
Jeffrey Ventrella
ade5b7bec3
formatting changes
2013-05-17 09:52:19 -07:00
Jeffrey Ventrella
1c126e2525
resolved conflicts
2013-05-16 17:32:54 -07:00
Philip Rosedale
9f57787ece
Fixed jerking on gravity, added mouse pitch, yaw behavior.
2013-05-16 17:05:45 -06:00
Philip Rosedale
84d18296d2
removed normalization of body yaw (need to fix springs before we do it)
2013-05-15 10:02:02 -07:00
Philip Rosedale
daaf86a634
restrict avatar body yaw to be between 0-360
2013-05-15 08:06:53 -07:00
Jeffrey Ventrella
a5e696b696
Merge remote-tracking branch 'upstream/master'
2013-05-14 17:31:03 -07:00
Jeffrey Ventrella
f53b49c496
working on lookat (eye contact)
2013-05-14 17:30:41 -07:00
ZappoMan
a1902e3dc9
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-14 12:14:53 -07:00
ZappoMan
4e92f5d3d8
tweaks to delta sending
2013-05-14 12:11:32 -07:00
ZappoMan
d59a8143d7
added wantDelta, made want bools a bit mask
2013-05-14 11:08:59 -07:00
Philip Rosedale
ba0263a436
Fixed uninitialized audio loudness value
2013-05-13 19:26:46 -07:00
ZappoMan
b196227385
Added wantResIn and wantColor feature between client and server
...
- Updated Voxel Server to support non-res-in version of voxel distribution
- Updated agent data to allow client to send desired res-in and color state
- added menu items to client debug menu to toggle wantResIn and wantColor
2013-05-13 15:02:46 -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
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
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
Jeffrey Ventrella
9d17df27bf
Merge remote-tracking branch 'upstream/master'
2013-05-07 18:33:21 -07:00
Jeffrey Ventrella
2d8c15e0cb
cleaned up some spacing issues in Orientarion class
2013-05-07 18:32:56 -07:00
Stephen Birarda
8daae1dd1d
bring eve closer to the ground after scale changes
2013-05-07 15:11:01 -07:00
Stephen Birarda
11b2271b91
size of agent ID must be included in bytes read per avatar
2013-05-07 15:05:31 -07:00
Stephen Birarda
0566330a8a
some magic number removals
2013-05-07 12:44:45 -07:00
Stephen Birarda
4eeb1ed5b1
have interface clients tell the avatar-mixer and voxel-server what their ID is
2013-05-07 12:05:19 -07:00
Jeffrey Ventrella
aeb545656e
(1) added a few methods to orientation; (2) fixed Eve's height; (3) added pitch and roll members to Avatar (not used yet); added avatar pull from handshake;
2013-05-01 15:38:55 -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
46041b2ed9
Style tweaks: preface privates with underscore, capitalize enum members.
2013-04-26 10:21:14 -07:00
Andrzej Kapolka
c6af08d883
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
avatar-mixer/src/main.cpp
2013-04-25 17:40:55 -07:00
Stephen Birarda
cdb8b1b144
Merge remote-tracking branch 'upstream/master' into agentlist-array
2013-04-25 16:40:20 -07:00
Stephen Birarda
215efe3b78
bunch of const changes for glm::vec3 in Avatar and Orientation
2013-04-25 16:10:55 -07:00
Andrzej Kapolka
d5da35e91a
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-25 15:41:57 -07:00
Andrzej Kapolka
d041072d40
Delete support (though the one on my numeric keypad doesn't work?),
...
sending key states.
2013-04-25 15:26:05 -07:00
Andrzej Kapolka
675d06e4b9
More chat bits; basic functionality now working.
2013-04-25 14:03:31 -07:00
Philip Rosedale
ba55175870
Gravity is ON near origin, off in space, and a gravity field can be created with getGravity()
2013-04-25 09:50:35 -07:00
Andrzej Kapolka
f538e2bdbc
Added key state to avatar data, started on chat entry field.
2013-04-24 17:06:55 -07:00
Stephen Birarda
87386cb05a
line the consts back up in AvatarData
2013-04-24 13:54:35 -07:00
Stephen Birarda
461ca6ecb4
revert some of the const changes that make sense
2013-04-24 13:51:27 -07:00
Stephen Birarda
a423d3c38f
more const repairs in AvatarData
2013-04-24 13:49:24 -07:00
Stephen Birarda
142a8a6f08
remove double const in AvatarData.h
2013-04-24 13:45:17 -07:00
Stephen Birarda
cfbe8a719c
fix getter for hand state in AvatarData
2013-04-24 12:39:25 -07:00
Jeffrey Ventrella
eb631e2ef6
renamed "bodyPosition" to "position". (This corresponds to the position of the avatar on the ground, where y=0). I will next add a new "getBodyPosition" which returns the avatar's center of gravity - is useful for certain purposes, such as setting collision volumes, etc.
2013-04-23 14:05:23 -07:00
Jeffrey Ventrella
a73ea8c255
some preparation for adding hand state to avatar interactions
2013-04-23 13:48:34 -07:00
Philip Rosedale
5556686875
Fixes from brad's review
2013-04-23 11:59:43 -07:00
