1342 commits

Author	SHA1	Message	Date
Andrzej Kapolka	318b8c38bc	Merge branch 'master' of https://github.com/worklist/hifi into blendface	2013-09-20 09:58:54 -07:00
Stephen Birarda	962dc0616d	Merge pull request #966 from ZappoMan/multi_VS_assigments ... remove standalone voxel server	2013-09-20 09:57:38 -07:00
ZappoMan	b682d3612b	remove standalone voxel server	2013-09-19 22:09:03 -05: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	92c106a6bb	refresh the UUID when sending out new AM assignments	2013-09-19 12:30:40 -07:00
Stephen Birarda	de276eff00	temporary removal of DS packet optimization for NodeList dynamism	2013-09-18 17:56:45 -07:00
Stephen Birarda	3b976500ce	stylistic and memory management fixes	2013-09-18 17:55:13 -07:00
Andrzej Kapolka	1bd8ea947a	Merge branch 'master' of https://github.com/worklist/hifi into blendface	2013-09-18 17:14:58 -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	b4f9e393a4	prefer IPv4 address when looking up for domain IP	2013-09-18 15:05:23 -07:00
Stephen Birarda	a9efa169be	fix ordering of QHostAdress to s_addr	2013-09-18 14:58:44 -07:00
Stephen Birarda	b0421cb9d3	Merge pull request #953 from ZappoMan/multi_VS_assigments ... Handle --voxelServerConfig properly	2013-09-18 14:20:12 -07:00
ZappoMan	80b1b810ce	spacing fix	2013-09-18 16:13:13 -05:00
ZappoMan	a81d5cd9a7	Merge pull request #954 from birarda/ds-port ... allow setting of custom DS port from DS and clients	2013-09-18 14:07:11 -07:00
Stephen Birarda	9fa695b71c	allow setting of custom port via domainHostname setting	2013-09-18 13:50:14 -07:00
Stephen Birarda	ab85c4109d	use QHostInfo and QHostAddress for DS changes in NodeList	2013-09-18 13:29:53 -07:00
ZappoMan	ded7a9504b	moved printf to qDebug	2013-09-18 13:28:50 -07:00
ZappoMan	b3bcda2227	Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments	2013-09-18 13:20:17 -07:00
ZappoMan	6355f677f7	have voxel server create assignments for child voxel servers	2013-09-18 13:19:19 -07:00
Stephen Birarda	8c9a14cdbe	CR fix to change back to setPayload with const param	2013-09-18 13:09:07 -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	3fde2887a3	fixes to payload in Assignment	2013-09-18 10:19:45 -07:00
ZappoMan	642b446d6f	tweak to payload parsing	2013-09-18 07:30:04 -07:00
ZappoMan	06f739a623	pass voxelServerConfig from domain-server through Assignment _payload to VoxelServer	2013-09-18 07:23:37 -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
ZappoMan	3145a543d9	fixed CR feedback	2013-09-17 17:34:47 -07:00
ZappoMan	5f9ac5c280	second constructor	2013-09-17 17:19:39 -07:00
ZappoMan	f75b480b0e	correctly hook up VoxelSendThread in VoxelNodeData	2013-09-17 16:40:39 -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
ZappoMan	2b9290a9e3	moving VoxelServer globals to member variables	2013-09-17 15:47:39 -07:00
ZappoMan	e86b4f2d8d	moving VoxelServer globals to member variables	2013-09-17 15:47:29 -07:00
Stephen Birarda	89546f7140	repairs to temporary standalone voxel-server for assignment subclass	2013-09-17 15:38:54 -07:00
Andrzej Kapolka	558d3d41a6	First attempt at blending.	2013-09-17 15:22:06 -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
ZappoMan	25d9281496	Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments	2013-09-17 13:41:44 -07:00
ZappoMan	386250cff8	remove hacked payloads	2013-09-17 13:41:04 -07:00
Stephen Birarda	fb7927d326	cleanup check for attached socket	2013-09-17 13:28:19 -07:00
Stephen Birarda	3f2dc7a28d	add a getter for the number of bytes in the payload	2013-09-17 13:27:17 -07:00
Stephen Birarda	94f04a9806	add API to attach payloads to assignments	2013-09-17 13:24:25 -07:00
ZappoMan	4932c3266f	moving to Assignment payload style implementation	2013-09-17 13:22:09 -07:00
Stephen Birarda	74a0b8a7b5	resolve conflicts on merge with upstream master	2013-09-17 11:50:30 -07:00
Stephen Birarda	76df707e31	add the ability to ask for multiple instances from JS page	2013-09-17 11:48:08 -07:00
Stephen Birarda	0e19d9a53a	add handling for number of instances to domain-server	2013-09-17 11:19:13 -07:00
Andrzej Kapolka	b4ca66eb68	Merge branch 'master' of https://github.com/worklist/hifi into blendface ... Conflicts: interface/src/devices/Faceshift.cpp	2013-09-17 11:05:11 -07:00