Stephen Birarda
|
d02fb65a13
|
Merge remote-tracking branch 'upstream/master' into cube-injector
|
2013-06-04 11:25:39 -07:00 |
|
Stephen Birarda
|
3f7fbb5c1e
|
change injector from cube to sphere
|
2013-06-04 10:57:53 -07:00 |
|
ZappoMan
|
4f3872c18f
|
CR feedback
|
2013-06-04 01:13:58 -07:00 |
|
ZappoMan
|
37cc436b2b
|
CR feedback
|
2013-06-04 01:08:18 -07:00 |
|
ZappoMan
|
1f3de3e12b
|
CR feedback
|
2013-06-04 01:03:26 -07:00 |
|
ZappoMan
|
03f79f5cab
|
fixed delete voxel
|
2013-06-03 21:04:42 -07:00 |
|
ZappoMan
|
cf3ff53e2c
|
copy and paste working
|
2013-06-03 18:08:11 -07:00 |
|
ZappoMan
|
0b7f4b21f4
|
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
|
2013-06-03 16:42:27 -07:00 |
|
Stephen Birarda
|
c55b6a20d7
|
parse the desired cube side length for injected audio source
|
2013-06-03 15:38:12 -07:00 |
|
ZappoMan
|
ea965f2290
|
fixed issue with sendVoxelsOperataion, some other cleanup
|
2013-06-03 13:46:21 -07:00 |
|
ZappoMan
|
78fe89172a
|
eyedropper mode, and import work
|
2013-06-03 12:23:16 -07:00 |
|
Stephen Birarda
|
f3ce68e5e4
|
remove space at the top of PacketHeaders
|
2013-06-03 12:21:44 -07:00 |
|
ZappoMan
|
7dd217b318
|
more work on copy and paste
|
2013-06-03 10:57:18 -07:00 |
|
ZappoMan
|
e5e200345b
|
more work on copy and paste
|
2013-05-31 11:52:18 -07:00 |
|
Andrzej Kapolka
|
98759c3ba1
|
Include <unistd.h> to address a build error experienced by Clement.
|
2013-05-31 10:27:25 -07:00 |
|
ZappoMan
|
b0397e8eb9
|
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
|
2013-05-30 21:41:55 -07:00 |
|
Andrzej Kapolka
|
3f6cf08b97
|
Removed remaining Orientation bits (and class itself), enforce limits on
head yaw/pitch/roll.
|
2013-05-30 15:15:12 -07:00 |
|
Andrzej Kapolka
|
100d10dc9e
|
Offset camera fix, cleaner frustum transformation.
|
2013-05-30 11:08:33 -07:00 |
|
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 |
|
ZappoMan
|
46c6f2f9b5
|
latest copy paste
|
2013-05-29 15:02:28 -07:00 |
|
ZappoMan
|
377fb1e936
|
latest copy and paste
|
2013-05-29 12:06:58 -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 |
|
ZappoMan
|
eb675c8dd7
|
fix crash when no audio mixer available
|
2013-05-29 08:25:30 -07:00 |
|
ZappoMan
|
6b1d37599c
|
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
|
2013-05-29 08:12:07 -07:00 |
|
ZappoMan
|
d1d2e75143
|
first cut at export and import of voxels
|
2013-05-28 19:00:02 -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 |
|