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 |
|
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 |
|
Stephen Birarda
|
1f4e9f3051
|
update last heard from time for audio injectors
|
2013-05-29 18:37:03 -07:00 |
|
Stephen Birarda
|
c259b025db
|
fix a crash in audio injector when there is no audio mixer
|
2013-05-29 15:05:39 -07:00 |
|
Stephen Birarda
|
56e0e3882d
|
kill agents who send NaN bearings
|
2013-05-29 11:29:38 -07:00 |
|
Stephen Birarda
|
1fb61faded
|
fix the isnan check for agent bearing
|
2013-05-29 11:22:25 -07:00 |
|
Stephen Birarda
|
f45062a097
|
don't use audio when the bearing sent by the agent is garbage
|
2013-05-29 11:14:50 -07:00 |
|
Stephen Birarda
|
78df9fb2ed
|
last pieces of debugging for mixer crash
|
2013-05-29 11:04:46 -07:00 |
|
Jeffrey Ventrella
|
82683dbabc
|
merge
|
2013-05-28 17:58:02 -07:00 |
|
Stephen Birarda
|
65f10cb99a
|
fix the enum in AABox, fix a warning in Head
|
2013-05-28 16:26:18 -07:00 |
|
Stephen Birarda
|
9f2c0adec7
|
move audioLoudness to HeadData
|
2013-05-28 12:22:51 -07:00 |
|
Andrzej Kapolka
|
1df7806464
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-27 14:40:30 -07:00 |
|
Andrzej Kapolka
|
949befee09
|
Fix for NaN.
|
2013-05-27 14:37:07 -07:00 |
|
Andrzej Kapolka
|
cfb66bee95
|
Capsule/box collisions.
|
2013-05-27 14:05:44 -07:00 |
|
Philip Rosedale
|
7aebbe3047
|
Merge pull request #434 from ZappoMan/voxel_animation
Improve "Delta Sending" mode..
|
2013-05-26 09:45:54 -07:00 |
|
Andrzej Kapolka
|
70b25fd6c4
|
Sphere/box collisions for voxels, various utility functions.
|
2013-05-25 19:59:07 -07:00 |
|
ZappoMan
|
db97a96fdf
|
Merge pull request #428 from birarda/mixer-crash
don't copy the incorrect amount of audio data into a buffer to avoid a mixer crash
|
2013-05-25 15:38:58 -07:00 |
|
ZappoMan
|
1a2921e3e8
|
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
|
2013-05-25 15:32:12 -07:00 |
|
ZappoMan
|
48ca562b10
|
tweak ViewFrustum::matches() to use EPSILON compare
|
2013-05-25 15:28:56 -07:00 |
|
Stephen Birarda
|
c661796b81
|
don't copy audio data if the agent sent the wrong amount
|
2013-05-24 15:37:48 -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
|
6158410658
|
provide a getter for the owning agent in AgentData
|
2013-05-24 12:32:00 -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 |
|
Andrzej Kapolka
|
95f1a9adaa
|
Removed unused nearCenter/farCenter from ViewFrustum.
|
2013-05-23 16:34:11 -07:00 |
|
Stephen Birarda
|
842ef820ab
|
use a more consistent method to clock the injector thread
|
2013-05-23 13:56:16 -07:00 |
|
ZappoMan
|
473665fb4a
|
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
|
2013-05-23 12:16:29 -07:00 |
|
ZappoMan
|
25700ae490
|
fixes to coloring bugs, coding standard cleanup
|
2013-05-23 12:08:51 -07:00 |
|
ZappoMan
|
2130572034
|
fixed color initialization on VoxelNode construction
|
2013-05-23 12:07:56 -07:00 |
|
Andrzej Kapolka
|
34b526f15c
|
Restore the original floor behavior.
|
2013-05-23 10:32:12 -07:00 |
|
Andrzej Kapolka
|
bb412818aa
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 18:36:47 -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 |
|
Andrzej Kapolka
|
5f7db8caa6
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 17:41:47 -07:00 |
|
Stephen Birarda
|
21cdf4ada5
|
remove setter for isInjectingAudio - shouldn't be set externally
|
2013-05-22 17:23:46 -07:00 |
|
Andrzej Kapolka
|
a68c8c6389
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 17:11:03 -07:00 |
|
Andrzej Kapolka
|
629c7b0146
|
Send all environment data in the same packet and only send it about once a
second.
|
2013-05-22 17:09:35 -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 |
|
Jeffrey Ventrella
|
7cae808d29
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 14:42:25 -07:00 |
|
Andrzej Kapolka
|
dd101b393d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 14:33:31 -07:00 |
|
birarda
|
9ec04855f8
|
Merge pull request #386 from ZappoMan/voxel_animation
Fix some crashing issues on delete
|
2013-05-22 14:27:29 -07:00 |
|
ZappoMan
|
c2ebd6fc95
|
CR feedback
|
2013-05-22 14:23:27 -07:00 |
|
ZappoMan
|
47c4ff887e
|
CR feedback
|
2013-05-22 14:13:38 -07:00 |
|
Andrzej Kapolka
|
365bb10d6b
|
More work on righting based on gravity vector.
|
2013-05-22 13:30:30 -07:00 |
|
ZappoMan
|
06f2528d6a
|
fix crashing on deleting voxels in server and client
|
2013-05-22 13:23:01 -07:00 |
|