1625 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
samcake	5d17fa0b34	Merge pull request #6458 from ZappoMan/acPlayback ... allow playbackAgents to auto-register	2015-11-20 16:25: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
Clément Brisset	5d75fcbfce	Merge pull request #6430 from birarda/unique_linked_data ... use a unique_ptr for linkedData in Node	2015-11-20 15:01:41 -08:00
Brad Hefta-Gaub	b5d764814c	Merge pull request #6450 from birarda/agent-script-fail ... fix for agent script download fail	2015-11-20 13:29:10 -08:00
Stephen Birarda	b34934b849	resolve conflicts on merge with upstream/master	2015-11-20 11:52:53 -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
Brad Hefta-Gaub	7441e20f58	cleanup	2015-11-20 11:20:36 -08:00
Brad Hefta-Gaub	4bbfcb6092	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-20 10:30:38 -08:00
Brad Hefta-Gaub	e530aa6545	don't assert on sender mismatch	2015-11-20 09:58:28 -08:00
Brad Hefta-Gaub	abf169ebd9	fix senderID in messages, dry up code	2015-11-20 09:03:21 -08:00
Stephen Birarda	8f5212acac	use destroy instead of accidental set	2015-11-19 17:26:10 -08:00
Brad Hefta-Gaub	e318537af4	Merge pull request #6425 from birarda/handshake-ds-settings ... fix case where servers could run without settings	2015-11-19 10:10:28 -08:00
Seth Alves	98073de0b8	Merge pull request #6426 from ZappoMan/entitiesFileDownload ... implement support to download the persist file from entity server status page	2015-11-19 09:47:10 -08:00
Stephen Birarda	271387f96e	use a unique_ptr for linkedData in Node	2015-11-18 18:03:31 -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 Hefta-Gaub	456da661ff	implement support to download the persist file from entity server status page	2015-11-18 17:30:07 -08:00
Brad Davis	98cc7408b1	Fixing issues found in AC playback test	2015-11-18 17:17:20 -08:00
Stephen Birarda	3773995bb7	remove true return for readAdditionalConfiguration	2015-11-18 15:41:27 -08:00
Stephen Birarda	cb708859fb	resolve conflicts on merge with upstream master	2015-11-18 15:34:56 -08:00
Stephen Birarda	3ba0c9d042	resolve conflicts on merge with upstream master	2015-11-18 15:29:39 -08:00
Stephen Birarda	20485b817c	use safer domain-server settings request in entity-server	2015-11-18 15:27:57 -08:00
Stephen Birarda	eafc11e054	use safer domain settings request in AvatarMixer	2015-11-18 15:18:16 -08:00
Stephen Birarda	f2ecce6043	use safer domain settings request in audio-mixer	2015-11-18 15:13:29 -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
Brad Davis	2636e43fab	Merge pull request #6413 from samcake/controllers ... Recording: Moving the Recording js interface to the Script engine	2015-11-18 10:22:55 -08:00
samcake	368f19b4e2	Merging with todays upstream and checking	2015-11-17 18:58:10 -08:00
Stephen Birarda	2355ba70ca	just remove messages-mixer settings grabbing all together	2015-11-17 18:55:09 -08:00
Stephen Birarda	c21fbc9a46	fix for messages-mixer bail early on empty settings	2015-11-17 18:53:23 -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	6dfcc53c27	properly handle removing subscribers from channels when the subscriber node disconnects	2015-11-17 14:19:13 -08:00
Brad Hefta-Gaub	32bf81ef0d	move MessagesClient to agent	2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub	5b9791d800	add message received signal	2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub	e7a8df306c	fix warnings	2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub	1c2c37ff44	more cleanup work	2015-11-17 11:10:12 -08:00
Brad Hefta-Gaub	034debc483	cleanup	2015-11-17 10:59:53 -08:00
Brad Hefta-Gaub	1f7c70a0d1	implement proper sending	2015-11-17 10:28:50 -08:00