83 commits

Author	SHA1	Message	Date
Stephen Birarda	2ec42a2a5d	revise linkage of civetweb for both DS and VS	2013-10-15 14:24:54 -07:00
Stephen Birarda	2bbaf7d31e	remove static instance set from Agent.cpp	2013-10-11 17:40:28 -07:00
Stephen Birarda	cdfb232078	remove the Agent static instance	2013-10-11 17:40:02 -07:00
Stephen Birarda	0eae0f129c	allow audio injection from javascript	2013-10-11 17:37:48 -07:00
Stephen Birarda	515e2d5a23	handle conflicts on merge with upstream master	2013-10-11 14:24:05 -07:00
Philip Rosedale	3a92856386	Merge pull request #1029 from birarda/nameserver ... initial revision of storing user data in data-server	2013-10-09 11:36:36 -07:00
Stephen Birarda	6fe0b0b124	don’t have AvatarMixer ask DS for agents	2013-10-09 10:40:19 -07:00
Stephen Birarda	40dd698293	don’t have AvatarMixer ask DS for agents	2013-10-08 11:07:46 -07:00
Stephen Birarda	5a7d21f529	add UUID helper class to get UUID string without braces	2013-10-07 10:56:23 -07:00
Stephen Birarda	b3171679b2	less aggressive debugging of waiting for assignment	2013-10-04 13:25:51 -07:00
Stephen Birarda	a07b673f69	beginning of hook of AudioInjector into JS	2013-10-03 11:41:45 -07:00
ZappoMan	5a356340e0	call setProcessCallIntervalHint() in JS Agent, so the non-threaded voxel sender knows how often we plan to call it	2013-10-02 20:55:38 -07:00
ZappoMan	9d231a50b6	implement support for process interval hints and handling sending only some packets per call to process in non-threaded mode	2013-10-02 20:39:58 -07:00
ZappoMan	4e66e4ed7c	new releaseQueuedMessages() api	2013-10-02 15:03:58 -07:00
Stephen Birarda	e8b0790b3e	updates to VoxelScriptingInterface for smarter packet sending	2013-10-02 11:42:27 -07:00
Philip Rosedale	cebd8e5f4b	Merge pull request #997 from birarda/assignment ... file of static assignments for DS	2013-10-01 13:47:10 -07:00
Philip Rosedale	7772b91aa8	Merge pull request #1001 from birarda/forked-js-ac ... use libcurl to download JS in forked ACs	2013-10-01 13:10:56 -07:00
Stephen Birarda	d401cf39ce	expose Agent.stop() to JS to complete execution	2013-10-01 11:44:07 -07:00
Stephen Birarda	bb0d28141a	use libcurl to download JS in forked ACs	2013-10-01 11:41:01 -07:00
Stephen Birarda	29ae5beb54	add a voxel delete to VoxelScriptingInterface	2013-09-30 15:11:02 -07:00
Stephen Birarda	32314ad540	have VS send UUID with check in for static assignment behavior	2013-09-30 13:34:22 -07:00
Stephen Birarda	ad8c676fea	sensibly initialize _shouldStop to false	2013-09-27 16:23:07 -07:00
Stephen Birarda	313410ae0d	updates to Agent class needed for game of life	2013-09-23 09:57:05 -07:00
Stephen Birarda	dd4215d0fd	add a destructive voxel add command to VoxelScriptingInterface	2013-09-23 09:55:31 -07:00
Stephen Birarda	e774419f8d	Merge branch 'master' of github.com:worklist/hifi into assignment	2013-09-20 17:39:03 -07:00
Stephen Birarda	3d1c77d047	expose the TREE_SCALE to JS	2013-09-20 14:47:36 -07:00
Stephen Birarda	6533d7fcde	add method to packet sender to flush queue without sleep	2013-09-20 14:40:09 -07:00
Stephen Birarda	04c4dabd3d	unblock socket receive in Agent, add destructive voxel add to VS scripting	2013-09-20 14:35:25 -07:00
Andrzej Kapolka	5c841616dc	Merge branch 'master' of https://github.com/worklist/hifi into blendface	2013-09-19 16:37:26 -07:00
Andrzej Kapolka	a04ced633e	Include the face model URL in the same packet as the avatar voxel URL.	2013-09-19 16:35:25 -07:00
Andrzej Kapolka	09fa782c61	More work on FBX reading.	2013-09-19 15:05:17 -07:00
Stephen Birarda	23e7278be5	re-use the check in packet sent to the domain-server, allow reset	2013-09-19 12:58:48 -07:00
Stephen Birarda	7b498edcbc	remove attached public and local sockets, fully allow custom port	2013-09-18 17:03:14 -07:00
Stephen Birarda	5479c5b40f	use qDebug for too much time message in AudioMixer	2013-09-18 15:20:55 -07:00
Stephen Birarda	ab85c4109d	use QHostInfo and QHostAddress for DS changes in NodeList	2013-09-18 13:29:53 -07:00
Stephen Birarda	7220643fe9	default AC to point to DS on localhost and default port	2013-09-18 12:04:09 -07:00
Stephen Birarda	f0b834881b	de-refs assignments for proper logging	2013-09-18 10:59:52 -07:00
ZappoMan	4a821d0874	Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments	2013-09-17 17:35:13 -07:00
Stephen Birarda	001432ec55	have domain-server reject audio and avatar mixers with bad UUID	2013-09-17 16:40:30 -07:00
ZappoMan	49c4075277	Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments	2013-09-17 16:00:32 -07:00
Stephen Birarda	8bb77ecc9e	type squish for deployed assignment	2013-09-17 15:23:49 -07:00
Stephen Birarda	17a210813b	repairs to subclasses of assignment	2013-09-17 15:20:34 -07:00
Stephen Birarda	d830351ed6	make the assignment targets subclasses of Assignment for access to UUID	2013-09-17 14:54:58 -07:00
ZappoMan	2388cfc8e0	first cut at making VoxelServer class run with configuration or standalone	2013-09-17 14:33:31 -07:00
Stephen Birarda	2cfa45e4f8	allow the assignment-client to specify the type of assignment it desires	2013-09-17 12:09:10 -07:00
Stephen Birarda	74a0b8a7b5	resolve conflicts on merge with upstream master	2013-09-17 11:50:30 -07:00
Stephen Birarda	17fda717fe	move audio and avatar classes into assignment-client target	2013-09-17 11:04:46 -07:00
Stephen Birarda	75c59c4863	add doxygen comments to VoxelScriptingInterface	2013-09-17 10:54:44 -07:00
Stephen Birarda	a45d64a214	add ability to send a voxel in JS via VoxelScriptingInterface	2013-09-17 10:49:51 -07:00
Stephen Birarda	df862c152b	add a VoxelScriptingInterface to accept voxel addition in JS	2013-09-17 10:24:15 -07:00