247 commits

Author	SHA1	Message	Date
Clément Brisset	e168966b87	Merge pull request #6409 from birarda/injector-hybrid ... more efficient threading of networked AudioInjector objects	2015-11-30 15:36:41 -08:00
Andrew Meadows	49a6f63663	remove whitespace and fix warning (unused var)	2015-11-30 10:00:05 -08:00
Stephen Birarda	7f7d05fc42	fix double initialization of AssetClient in Agent	2015-11-24 10:46:35 -06:00
Stephen Birarda	0997d3dcae	resolve conflicts on merge with upstream/master	2015-11-23 16:15:15 -06:00
samcake	25654824a2	Copy pasting the code that Stephen did and also adding the AssetServer to the list of dependent nodes for the agent	2015-11-23 12:32:27 -08:00
samcake	301f0ba145	Trying to instenciate the AssetCLient in the Agent	2015-11-23 11:48:02 -08:00
Stephen Birarda	b24b095c90	add a missing space in Agent	2015-11-20 16:09:41 -08:00
Brad Hefta-Gaub	f56d2fba7f	allow playbackAgents to auto-register	2015-11-20 16:00:43 -08:00
Stephen Birarda	9ddebc8d13	resolve conflicts on merge with upstream/master	2015-11-20 15:29:44 -08:00
Stephen Birarda	cf204ad5b0	cleanup executeScript comment in Agent	2015-11-20 11:44:58 -08:00
Stephen Birarda	aa836aa4b5	add a script request timeout	2015-11-20 11:44:04 -08:00
Stephen Birarda	3b40119992	use Agent session UUID to request script	2015-11-20 11:35:24 -08:00
Stephen Birarda	8f5212acac	use destroy instead of accidental set	2015-11-19 17:26:10 -08:00
samcake	74beeefe06	Merge pull request #6420 from jherico/dargo ... Make recording and playback work in interface, playback in agent	2015-11-18 17:52:09 -08:00
Brad Davis	98cc7408b1	Fixing issues found in AC playback test	2015-11-18 17:17:20 -08:00
Stephen Birarda	cb708859fb	resolve conflicts on merge with upstream master	2015-11-18 15:34:56 -08:00
Brad Davis	5b8047ded4	Make recording and playback work in interface, playback in agent	2015-11-18 14:04:45 -08:00
Brad Hefta-Gaub	35677d3a48	Merge pull request #6418 from birarda/test-ds-settings-fail ... move keepalive pings transparently to NL	2015-11-18 11:12:16 -08:00
Stephen Birarda	d90c073102	leverage NL keep alive pings in Agent	2015-11-18 10:25:18 -08:00
samcake	368f19b4e2	Merging with todays upstream and checking	2015-11-17 18:58:10 -08:00
samcake	d2f3b48637	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-17 17:36:38 -08:00
Stephen Birarda	5dc48dc9dc	resolve conflicts on merge with upstream/master	2015-11-17 17:04:12 -08:00
Stephen Birarda	8e4d7c69ce	handle AudioInjectorManager for scripted ACs	2015-11-17 17:01:11 -08:00
Brad Hefta-Gaub	32bf81ef0d	move MessagesClient to agent	2015-11-17 12:59:12 -08:00
Sam Gateau	5b92929833	Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client	2015-11-17 09:32:22 -08:00
samcake	8553033d59	Refactoring the mess for the Agent	2015-11-16 19:27:28 -08:00
Stephen Birarda	aa77c4894c	add an AudioInjectorManager for more efficient threading	2015-11-16 16:04:10 -08:00
Brad Hefta-Gaub	d42a1a721f	first cut at messages-mixer	2015-11-16 15:26:17 -08:00
Stephen Birarda	3fa0bcbcd9	ping the AssetClient from the agent	2015-11-16 10:38:59 -08:00
Stephen Birarda	5908f2d398	put Agent AssetClient on sep thread, cleanup	2015-11-16 10:38:45 -08:00
Stephen Birarda	d941be8d0b	allow assignment client to use AssetClient for ATP downloads	2015-11-16 10:38:33 -08:00
Howard Stearns	aa1289bd7c	Update agent's outgoing avatar data packet with sequenceNumber as is now used in interface's MyAvatar.	2015-11-05 15:53:46 -08:00
Brad Hefta-Gaub	c01077a0d7	real fix	2015-09-30 17:30:34 -07:00
Brad Hefta-Gaub	42d9045770	possible fix for crashing agents acting like avatars	2015-09-30 16:02:33 -07:00
Brad Hefta-Gaub	34dc8bdbcb	fix possible crash in agent	2015-09-30 15:34:35 -07:00
Stephen Birarda	229e73f88c	protect the agent from null timers in avatar stop	2015-09-16 11:52:05 -07:00
Stephen Birarda	bca00db4a8	use unique_ptr for Agent ScriptEngine	2015-09-16 11:48:15 -07:00
Stephen Birarda	5df7ce7424	fix for missing jurisdiction listener in Agent	2015-09-16 11:43:54 -07:00
Brad Hefta-Gaub	bdae3e420b	fix crash in AC	2015-09-15 11:24:04 -07:00
Brad Hefta-Gaub	56118e4204	migrate Agent to use standard APIs of ScriptEngine	2015-09-11 22:12:42 -07:00
Brad Hefta-Gaub	54c56a92f1	move agent specific code out of ScriptEngine	2015-09-11 21:56:00 -07:00
Brad Hefta-Gaub	f85cb2c888	first cut at cleaning up ScriptEngine class	2015-09-11 19:12:09 -07:00
Thijs Wenker	f512205f6f	add ability to include scripts from a relative path in assignment-client (for persistent scripts only)	2015-08-22 01:30:07 +02:00
Thijs Wenker	d89ecc1e42	Move WebSocketServer to be accessable from Assignment-Client:Agent only.	2015-08-21 22:43:49 +02:00
Seth Alves	bbee001366	Merge pull request #5470 from birarda/master ... fix for unique_ptr<char> allocations	2015-07-31 15:09:18 -07:00
Stephen Birarda	b0afdb21ad	correct the unique_ptr char allocations	2015-07-31 14:29:05 -07:00
Thijs Wenker	7325e6a7b7	Send ping requests to the nodes (AvatarMixer, AudioMixer, EntityServer) that the Assignment agent connected with to keep the connections alive.	2015-07-29 14:57:06 +02:00
Stephen Birarda	1c98c5e02c	remove unregisterListener that isn't needed anymore	2015-07-17 11:20:05 -07:00
Stephen Birarda	e7249594e1	unregister the AvatarHashMap packet registrations	2015-07-16 17:55:29 -07:00
Stephen Birarda	040c7557da	fix double register for Agent avatar packets	2015-07-16 17:51:06 -07:00