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
Stephen Birarda
ca39593f05
move typedef for FreeVerbAgentMap to AudioRingBuffer header
2013-06-03 12:02:41 -07:00
Stephen Birarda
104fcd1289
revert hardcode of birarda test machine IP to AgentList
2013-06-03 12:00:34 -07:00
Stephen Birarda
4348702dd2
Merge remote-tracking branch 'upstream/master' into synthesis
2013-06-03 11:53:13 -07:00
ZappoMan
7dd217b318
more work on copy and paste
2013-06-03 10:57:18 -07:00
Andrzej Kapolka
a6daa296ff
Slight fix to capsule/box penetration test: we should use the smaller distance
...
to the diagonal, not the first one we find.
2013-06-03 10:08:42 -07:00
Stephen Birarda
2d7c397138
create a FreeVerb object for each other agent per agent
2013-05-31 15:47:57 -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
ZappoMan
b3045ea681
working on handPosition optimizations
2013-05-28 16:11:07 -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
ZappoMan
04f4e499e1
Optimize wire-format for AvatarData
...
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
2013-05-27 14:18:10 -07:00
ZappoMan
ddf4d7c748
removed extra comment
2013-05-27 14:17:55 -07:00
ZappoMan
5d1ba857c5
Optimize View Frustum wire format.
...
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -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
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
Andrzej Kapolka
f70b2ceb76
Reverted change that would have added glm to shared library.
2013-05-22 11:23:55 -07:00
Andrzej Kapolka
8b1362636e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-21 22:29:46 -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
Andrzej Kapolka
a864a6f8c6
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6
Support for multiple environments, collisions with notional planet surfaces.
2013-05-21 21:33:08 -07:00
ZappoMan
09711d86ed
fix compiler warning
2013-05-21 18:03:14 -07:00
Jeffrey Ventrella
e219cd8223
Merge remote-tracking branch 'upstream/master'
2013-05-21 17:44:45 -07:00
birarda
63fcb2eeef
Merge pull request #367 from ZappoMan/voxel_animation
...
Fixes "Delete" voxel behavior
2013-05-21 17:43:36 -07:00
ZappoMan
c316899f27
CR feedback
2013-05-21 17:42:55 -07:00
Jeffrey Ventrella
c32d621d5f
improving lookat behavior
2013-05-21 17:38:17 -07:00
ZappoMan
166ad4f73d
CR feedback
2013-05-21 17:37:21 -07:00
Stephen Birarda
944e7a32e9
trivial fix for the continously dying animation server
2013-05-21 15:53:58 -07:00
tosh
0261f50298
merge up
2013-05-21 23:13:03 +02:00
tosh
ba4f4b9809
Merge branch 'master' of git://github.com/worklist/hifi
2013-05-21 22:49:39 +02:00
ZappoMan
0bcd629c8a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-21 13:46:04 -07:00
ZappoMan
6f0035b297
Merge pull request #365 from PhilipRosedale/master
...
Made Transmitter it's own class, removed V1 Transmitter code (Glass and Android)
2013-05-21 13:45:15 -07:00
ZappoMan
869a100486
cleanup
2013-05-21 13:37:58 -07:00
Andrzej Kapolka
0377ca1adb
Compute nodes' enclosing radius in the same place.
2013-05-21 13:32:41 -07:00
Andrzej Kapolka
597769a861
Added basic capsule/sphere collisions between avatar and voxels.
2013-05-21 12:58:02 -07:00
ZappoMan
9f23f846a9
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-21 12:47:46 -07:00
ZappoMan
d6d9b053f5
removed extra color exists bitmask since we weren't using it and it was redundant
2013-05-21 12:45:40 -07:00
ZappoMan
edcc92cfb6
cleanup code
2013-05-21 11:58:48 -07:00
ZappoMan
e8fd96018b
cleanup code
2013-05-21 11:52:57 -07:00
ZappoMan
b61d6cf4e8
cleanup code
2013-05-21 11:48:30 -07:00
ZappoMan
e47d9ea21f
cleanup code
2013-05-21 11:44:48 -07:00
ZappoMan
7c9be4b9f5
cleanup code
2013-05-21 11:42:13 -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
a7f0a66aee
code cleanup
2013-05-21 11:31:47 -07:00
ZappoMan
4f9c7fed59
removed UI for want exists bits, defaults to true
2013-05-21 11:25:50 -07:00
ZappoMan
ef2d27aba6
getting closer to working delete
2013-05-21 10:43:31 -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
Philip Rosedale
0d7644d1fc
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-20 19:01:01 -07:00
Philip Rosedale
7728a54d26
Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter
2013-05-20 19:00:49 -07: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
tosh
06288e8366
Merge branch 'master' of git://github.com/worklist/hifi
...
Conflicts:
interface/src/Oscilloscope.cpp
2013-05-20 23:15:06 +02: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
Stephen Birarda
7b21b8520e
Merge branch 'master' of github.com:worklist/hifi
2013-05-20 12:16:10 -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
Jeffrey Ventrella
570d2e104a
test
2013-05-20 11:53:42 -07:00
Stephen Birarda
dae7bf8674
use AgentList defaults when AIM has no socket or address set
2013-05-20 11:48:50 -07:00
Jeffrey Ventrella
aa9783a88d
Merge remote-tracking branch 'upstream/master'
2013-05-20 11:41:45 -07:00
Jeffrey Ventrella
ffbc70814a
preparing to add transmitted lookat position data
2013-05-20 11:41:21 -07:00
Andrzej Kapolka
85bca558f5
Tabs -> spaces, spacing fix.
2013-05-20 09:38:01 -07:00
Andrzej Kapolka
0c03f66948
Fixed the frustum computation, fixed a bug in Plane.
2013-05-19 22:32:55 -07:00
ZappoMan
06242a82c4
fixed Philip's no animation problem
2013-05-19 20:53:46 -07:00
Andrzej Kapolka
0539739720
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-19 18:38:09 -07:00
Andrzej Kapolka
dd3e8d524a
Support for eye offset position/orientation in camera/frustum.
2013-05-19 18:37:21 -07:00
tosh
b3085debb8
further adjusts naming
2013-05-19 13:22:37 +02:00
tosh
fc2de0685b
adjusts naming and formatting of class definition
2013-05-19 12:48:17 +02:00
tosh
864d4e6734
Merge branch '19188' of git://github.com/tschw/hifi
2013-05-18 11:02:52 +02:00
birarda
1b29c6a6d3
Merge pull request #347 from birarda/voxel-noise
...
new audio injector setup fixes
2013-05-17 15:43:32 -07:00
Stephen Birarda
00998ba75e
some fixes for new audio injector setup
2013-05-17 15:42:37 -07:00
birarda
efec33c6a2
Merge pull request #344 from birarda/voxel-noise
...
include time for srand on UNIX
2013-05-17 15:09:30 -07:00
Stephen Birarda
82c373242f
include time for srand on UNIX
2013-05-17 15:09:11 -07:00
birarda
67bab7e73d
Merge pull request #342 from birarda/voxel-noise
...
use stream identifier to match injected audio across packets
2013-05-17 15:07:29 -07:00
Stephen Birarda
85c0c1fa98
fix the mod so we get values up to 255
2013-05-17 15:07:12 -07:00
Stephen Birarda
d72b931ebe
attach stream identifier to AudioRingBuffer to match incoming data in audio mixer
2013-05-17 14:57:10 -07:00
Philip Rosedale
bb86d7a141
Merge pull request #341 from ZappoMan/voxel_animation
...
fixed memory leak
2013-05-17 14:40:09 -07:00
ZappoMan
0db62b58f5
fixed memory leak
2013-05-17 14:35:50 -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
Philip Rosedale
a08745a9e8
Merge pull request #340 from ZappoMan/voxel_animation
...
New Animation Server
2013-05-17 13:57:11 -07:00
ZappoMan
316da59da3
first cut at animation server
2013-05-17 12:44:39 -07:00
Stephen Birarda
fcfe5c9e25
disallow copying for AudioRingBuffer objects
2013-05-17 12:27:05 -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
Stephen Birarda
12bf23e4c8
disallow Agent copying
2013-05-17 12:14:44 -07:00
Andrzej Kapolka
58a9a05ef7
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-17 10:17:37 -07:00
Andrzej Kapolka
3ed99f40a6
Working on support for off-axis projection.
2013-05-17 10:17:21 -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
9011484590
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-16 17:06:40 -06:00
Philip Rosedale
9f57787ece
Fixed jerking on gravity, added mouse pitch, yaw behavior.
2013-05-16 17:05:45 -06:00
Stephen Birarda
442d658835
switch from 255 to 0xFF for max volume constant
2013-05-16 14:10:48 -07:00
Stephen Birarda
a37b451993
add constants for volume byte values
2013-05-16 14:09:50 -07:00
Stephen Birarda
f6cc40362c
hook the injector up to the change AudioInjector setup
2013-05-16 13:10:48 -07:00
Stephen Birarda
a2f8d8ae25
break audio out of shared into its own library
2013-05-16 13:00:40 -07:00
Stephen Birarda
5514966d9c
add an AudioInjectionManager to handle multiple injections, link eve to it
2013-05-16 12:40:23 -07:00
Jeffrey Ventrella
be7be4ad99
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-16 11:18:32 -07:00
Stephen Birarda
9b72762eb8
fix missing bytes on read for audio injector
2013-05-15 16:31:43 -07:00
Stephen Birarda
af934e2104
type squishes in UDPSocket implementation
2013-05-15 16:19:45 -07:00
Stephen Birarda
13c10c95e8
type squishes in UDPSocket header
2013-05-15 16:17:38 -07:00
Stephen Birarda
fc5e42cf8b
add threaded injection of audio via audio injector class
2013-05-15 16:10:59 -07:00
Stephen Birarda
47766d6c6b
add methods to AudioInjector to prepare for procedural injection
2013-05-15 15:20:11 -07:00
Stephen Birarda
db0c1bdba1
another type squish in Agent header
2013-05-15 14:28:43 -07:00
Stephen Birarda
9b8fd55bb7
type squishes in Agent header
2013-05-15 14:28:20 -07:00
Stephen Birarda
80284470ed
type squishes in Agent class
2013-05-15 14:20:15 -07:00
Stephen Birarda
12b4b485f0
refactor the Agent copy constructor
2013-05-15 14:19:14 -07:00
Stephen Birarda
f333aaf809
refactor Agent constructor to call member variable constructors
2013-05-15 14:16:15 -07:00
Stephen Birarda
48b57c92bd
refactor Agent member variables
2013-05-15 14:12:21 -07:00
Stephen Birarda
2c242a7704
add AGENT_TYPE_AUDIO_INJECTOR to getTypeName, refactor
2013-05-15 14:02:09 -07:00
Stephen Birarda
e4a734fc78
refactor constructor in AudioInjector
2013-05-15 12:01:32 -07:00
Stephen Birarda
e83710e45e
prepend audio packets from the mixer with a packet header
2013-05-15 12:00:04 -07:00
Stephen Birarda
ce34a8f3e0
add packet headers and agent types for audio clarity
2013-05-15 11:43:49 -07:00
Stephen Birarda
4693082db0
refactor Audio to remove requirement of AudioData
2013-05-15 10:54:36 -07:00
tosh
168bd24342
comments out logging, after testing all is fine
2013-05-15 16:16:53 +02:00
tosh
6a47db91da
tidies up UrlReader component
2013-05-15 15:29:02 +02: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
birarda
6f7d2a6922
Merge pull request #314 from birarda/transmitter
...
add new packet header for V2 transmitter data
2013-05-14 16:30:55 -07:00
Stephen Birarda
aca2ce47b6
add a V2 transmitter data packet for new iOS transmitter
2013-05-14 16:29:39 -07:00
Andrzej Kapolka
8e04c17cc2
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-05-14 14:44:22 -07:00