Commit graph

67 commits

Author SHA1 Message Date
Stephen Birarda
8f876b91ae changes for stub pull request of assignee work 2013-08-05 10:06:50 -07:00
Stephen Birarda
be32ffff77 merge branch assignee with upstream/master 2013-07-16 14:41:08 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
Stephen Birarda
c01ff868de comment audio library linkage to eve and injector 2013-07-12 10:49:28 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
Stephen Birarda
b482f479b6 more packet version changes to various server targets 2013-07-08 15:09:14 -07:00
Stephen Birarda
8a684244cc packet versioning for HEAD_DATA packets 2013-07-08 12:53:07 -07:00
Stephen Birarda
5faad80e12 remove ping unknown thread, version for ping reply 2013-07-08 11:58:19 -07:00
Stephen Birarda
5062ae8965 rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning 2013-07-08 11:37:39 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Andrzej Kapolka
db729a04aa Converted double timestamps to long long (64 bit integers), fixed bug with
updating agent timestamps.
2013-06-13 11:11:59 -07:00
Stephen Birarda
5efff3857a hook eve up to new domain server check in method 2013-06-07 15:39:46 -07:00
Stephen Birarda
19e29585fc remove some spacing at the bottom of eve main 2013-05-29 15:04:22 -07:00
Stephen Birarda
59a6016f4b use a NULL default for owningAvatar to simplify constructors 2013-05-24 12:18:38 -07:00
Stephen Birarda
36892da488 keep a pointer to owning agent in AgentData 2013-05-24 12:17:34 -07:00
Stephen Birarda
0d769329bf fix broken eve due to extra quote 2013-05-17 15:22:21 -07:00
Stephen Birarda
cfe4783fff correct the memcmp for audio stream identifier 2013-05-17 15:19:15 -07:00
Stephen Birarda
7e766eb351 fix eve's use of the now disallowed copy constructor 2013-05-17 12:31:16 -07:00
Stephen Birarda
a37b451993 add constants for volume byte values 2013-05-16 14:09:50 -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
Andrzej Kapolka
2885c14480 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 17:31:11 -07:00
Stephen Birarda
d78daf53e9 fix copy of Avatar object for use in Audio class 2013-05-15 17:28:27 -07:00
Stephen Birarda
ddff60f236 remove the unused temporary UDP Socket 2013-05-15 16:40:39 -07:00
Andrzej Kapolka
8a03e75906 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 16:26:26 -07:00
Stephen Birarda
e6cba99c0e include cstring for memcpy in eve main 2013-05-15 16:25:27 -07:00
Andrzej Kapolka
a571caac8f Build fix. 2013-05-15 16:24:22 -07:00
Stephen Birarda
fc5e42cf8b add threaded injection of audio via audio injector class 2013-05-15 16:10:59 -07:00
Stephen Birarda
e7fb7d05f0 remove an extra g 2013-05-10 17:39:38 -07:00
Stephen Birarda
d511ad4a07 more type squishes in eve main 2013-05-10 17:39:17 -07:00
Stephen Birarda
02caba909a type squish in eve main 2013-05-10 17:38:50 -07:00
Stephen Birarda
626ae1c779 lower Eve's volume to about 75% 2013-05-10 16:55:18 -07:00
Stephen Birarda
f8fcbca488 have eve only inject audio when another avatar gets close to her 2013-05-10 16:49:05 -07:00
Jeffrey Ventrella
470349d662 made avatars taller an fixed proportions a bit 2013-05-09 23:31:45 -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
e8fbfcab05 fix unpacking of other avatars in avatar mixer bulk packet 2013-05-07 14:57:24 -07:00
Stephen Birarda
3719454abd use constants for eve's hand grabbing behavior 2013-05-07 13:47:12 -07:00
Stephen Birarda
9be92cebdd revert type squish, spacing, code review comment 2013-05-07 13:41:48 -07:00
Stephen Birarda
d5d9479b65 make eve send her ID to identify with the avatar mixer 2013-05-07 13:38:56 -07:00
Stephen Birarda
ab6a9285ad have eve reference new Agent timestamp variables 2013-05-06 13:33:15 -07:00
Jeffrey Ventrella
673936e141 adjusted proportions of avatar skeleton to make it closer to average human 2013-05-02 14:05:51 -07:00
Jeffrey Ventrella
1e6ba9cc34 (1) raised Eve's hand; (2) renamed some member variables; (3) added more functionality to hand-holding 2013-05-01 20:35:21 -07:00
Jeffrey Ventrella
63cee4b284 fixed comment on Eve position 2013-05-01 15:43:15 -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
Stephen Birarda
47f61a2fc2 have eve reference the newly deployed audio file 2013-05-01 10:18:50 -07:00
Stephen Birarda
5380c68390 add eve's audio file 2013-04-29 15:46:01 -07:00
Jeffrey Ventrella
5c3bd5fe87 improved collisions between avatars 2013-04-27 09:33:58 -07:00
Jeffrey Ventrella
5a0a1c1cec increased YAW_MAG (faster turning), redesigned the concept of avatar position, and reset Eve's position accordingly. Also added _frustumNeedsReshape in camera in anticipation of fixing problem where setting fov doesn't reshape the frustum. 2013-04-25 13:51:20 -07:00