41 commits

Author	SHA1	Message	Date
Stephen Birarda	dae8032cd8	hook the avatar mixer up to the new domain server check in method	2013-06-07 15:35:33 -07:00
Andrzej Kapolka	a4aa8e7bde	Basic sharing of the avatar voxel URLs.	2013-06-05 14:55:49 -07:00
Andrzej Kapolka	86ae9dbe7c	Merged.	2013-05-30 15:51:31 -07:00
Philip Rosedale	82463260e4	Merge pull request #445 from ZappoMan/local_option ... add --local option to avatar-mixer	2013-05-30 14:51:18 -07:00
Andrzej Kapolka	28531fcae0	Added --local option to avatar-mixer for testing. Only update velocity, ... acceleration, angular velocity, etc., for local avatar.	2013-05-30 12:33:05 -07:00
Stephen Birarda	bb3feb13eb	correct the currentBufferPosition for injector packets as well	2013-05-29 16:57:13 -07:00
Stephen Birarda	eb5375869d	also return the list of avatars to audio injectors	2013-05-29 14:34:58 -07:00
ZappoMan	b4241da1f0	add --local option to avatar-mixer	2013-05-29 00:49:51 -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	b7b39c2a6e	have addOrUpdateAgent return a pointer to the agent instead of a bool	2013-05-17 14:03:15 -07:00
Stephen Birarda	fc5e42cf8b	add threaded injection of audio via audio injector class	2013-05-15 16:10:59 -07:00
Stephen Birarda	48b57c92bd	refactor Agent member variables	2013-05-15 14:12:21 -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	5c90b4575e	trivial deletions for cleanup	2013-05-07 12:05:25 -07:00
Stephen Birarda	4eeb1ed5b1	have interface clients tell the avatar-mixer and voxel-server what their ID is	2013-05-07 12:05:19 -07:00
Stephen Birarda	6ca21d96d1	don't add agents in DS packet to avatar mixer agent list	2013-04-29 15:06:46 -07:00
Stephen Birarda	d1a7a20e4c	agents added to avatar-mixer are of type avatar	2013-04-29 14:59:24 -07:00
Stephen Birarda	c3c9616afb	avatar mixer still needs to check in with DS	2013-04-29 12:53:05 -07:00
Stephen Birarda	be0bf37109	remove the unused avatarIndex variable	2013-04-29 12:48:19 -07:00
Stephen Birarda	7b8d377eb4	simplify the avatar mixer communication while publicly accessible	2013-04-29 12:47:03 -07:00
Stephen Birarda	1ceda66ab8	remove added debugging in avatar-mixer, light refactoring	2013-04-29 12:38:46 -07:00
Stephen Birarda	b7189ef263	add debug to avatar mixer to figure out invisible avatars	2013-04-29 12:04:53 -07:00
Andrzej Kapolka	c6af08d883	Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: avatar-mixer/src/main.cpp	2013-04-25 17:40:55 -07:00
Stephen Birarda	edc908b1cd	AgentList type squishes across project	2013-04-25 16:25:49 -07:00
Stephen Birarda	569fa76dde	prefer arrow notation in avatar-mixer iterator loop	2013-04-25 15:52:16 -07:00
Stephen Birarda	f86704fa94	update avatar-mixer to use new AgentList iterator	2013-04-25 15:21:44 -07:00
Andrzej Kapolka	675d06e4b9	More chat bits; basic functionality now working.	2013-04-25 14:03:31 -07:00
Stephen Birarda	8129c2477a	fix broken voxel server build, change some char* to unsigned char*	2013-04-16 12:35:49 -07:00
Stephen Birarda	e71f21b7bf	fix broken builds from last commit, pull new avatar data in VoxelAgentData	2013-04-16 11:59:03 -07:00
Stephen Birarda	5c091a51a6	change signature of parseData to use unsigned char*, include packet header always	2013-04-16 11:51:36 -07:00
Stephen Birarda	61cf17da73	update agent-mixer to use new AvatarData class	2013-04-15 18:19:01 -07:00
Stephen Birarda	a5a93443c6	re-work AvatarData to handle body position and rotation	2013-04-15 18:05:22 -07:00
Stephen Birarda	ed3f308a0e	pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM	2013-04-15 16:08:35 -07:00
Stephen Birarda	af1071b374	comments to AvatarData and avatar-mixer before pack/unpack refactor	2013-04-15 16:07:46 -07:00
Stephen Birarda	2dfe49a885	moved AvatarAgentData to AvatarData	2013-04-15 15:05:55 -07:00
Stephen Birarda	4702e6ade0	remove the unecessary trailing slash when setting root dir	2013-04-15 14:59:48 -07:00
Stephen Birarda	d0eed92699	add an avatars library and move AvatarAgentData there	2013-04-15 14:51:34 -07:00
Stephen Birarda	613d5ab5f6	pack agent ID, not socket, from avatar mixer	2013-04-15 11:27:27 -07:00
Stephen Birarda	cc2f35ca89	pass a ROOT_DIR to LinkHifiLibrary	2013-04-12 15:59:16 -07:00
Stephen Birarda	e434b06ed9	rename avatar target to avatar-mixer, add SetupHifiProject macro	2013-04-12 13:08:21 -07:00