Jeffrey Ventrella
ffbc70814a
preparing to add transmitted lookat position data
2013-05-20 11:41:21 -07: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
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
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
Andrzej Kapolka
ebc612f87a
Start out with gray, fix coloring smaller portions by (similar to deleting)
...
breaking up leaf nodes into their components.
2013-05-14 14:23:08 -07:00
ZappoMan
8dc61d89fc
Added support for "destructive" vs "non-destructive" voxel create
...
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
2013-05-14 14:19:31 -07:00