106 commits

Author	SHA1	Message	Date
Leonardo Murillo	e5b0843212	Resolving conflicts	2013-03-22 13:40:16 -06:00
Leonardo Murillo	dc92f0be42	More agent IDing around the code	2013-03-22 13:34:35 -06:00
Stephen Birarda	3518ee15a8	add readCodeColorBufferToTree method to VoxelTree for point cloud render	2013-03-22 12:32:57 -07:00
Stephen Birarda	8ec5298c4a	add groundwork for LOD specific transmissions from VS	2013-03-22 12:01:30 -07:00
Stephen Birarda	bb47967126	send head data to VS for level differentiation, remove the VS add callback	2013-03-22 10:46:37 -07:00
Leonardo Murillo	f604b574c5	Merge branch 'master' of github.com:/worklist/hifi into 19179	2013-03-22 11:46:36 -06:00
Leonardo Murillo	a4f6d85676	Fixing definitions	2013-03-22 11:45:19 -06:00
Leonardo Murillo	e3d842dff7	Packing agent ID on domain broadcast packet	2013-03-22 11:43:16 -06:00
Stephen Birarda	3fa0439f29	add method to SharedUtil to chdir to OS X bundle resources	2013-03-22 10:35:55 -07:00
Leonardo Murillo	a1691f54a1	Starting agent count at 1 to allow for 0 to be non-id specifier and packing the id into boadcast packet	2013-03-22 11:30:17 -06:00
Leonardo Murillo	a76f8a46cd	Handle new and existing agent Ids	2013-03-22 11:20:45 -06:00
Stephen Birarda	95926cb7fc	conditional chdir for OS X resources, revert windows Head changes	2013-03-21 17:02:41 -07:00
Stephen Birarda	9c73bf286e	remove cast to int * in socket recvfrom	2013-03-21 16:13:52 -07:00
Stephen Birarda	0b48eab1fb	Merge branch 'master' of github.com:worklist/hifi	2013-03-21 16:12:09 -07:00
Stephen Birarda	4552140f61	add a sound when moving so we aren't ninjas	2013-03-21 16:11:17 -07:00
Leonardo Murillo	d8b80006b8	Merge branch 'master' of github.com:/worklist/hifi into 19179	2013-03-21 14:25:35 -06:00
Kees van Prooijen	f308d8e004	merge with upstream master	2013-03-21 10:10:33 -07:00
Leonardo Murillo	203bf333c4	Merge branch 'master' of github.com:/worklist/hifi into 19179	2013-03-20 20:53:16 -06:00
Stephen Birarda	f4e9594f72	dumb way to keep voxel server alive for testing	2013-03-20 16:22:38 -07:00
Stephen Birarda	e7254ff216	fix shift in return of octal code section value	2013-03-20 16:22:01 -07:00
Stephen Birarda	d2da9000f4	return correct nodeForOctalCode	2013-03-20 16:21:22 -07:00
Stephen Birarda	e8f84aee78	fix rendering bugs	2013-03-20 15:32:12 -07:00
Stephen Birarda	fc3a499cb3	include cstring for use of memset	2013-03-20 13:48:59 -07:00
Stephen Birarda	c28a3e1bd4	add cstring for use of memcpy	2013-03-20 13:47:13 -07:00
Stephen Birarda	6ce4ed2d40	add cstring for use of memcpy	2013-03-20 13:45:48 -07:00
Stephen Birarda	1abce28310	use int instead of forced 8-bit types where appropriate	2013-03-20 13:44:09 -07:00
Stephen Birarda	9ac664dbab	include cstdio for uint8_t	2013-03-20 13:34:53 -07:00
Stephen Birarda	b24353957c	include cstdio for printf in SharedUtil	2013-03-20 13:29:10 -07:00
Stephen Birarda	65e9626e72	remove superfluous debugging	2013-03-20 13:24:43 -07:00
Stephen Birarda	adb45c825b	add method to return the start vertex for an octal code	2013-03-20 13:24:18 -07:00
Kees van Prooijen	9ae11ffe77	more windows port	2013-03-20 12:13:14 -07:00
Stephen Birarda	f8f098cf2c	Merge branch 'master' of github.com:worklist/hifi	2013-03-19 15:58:19 -07:00
Stephen Birarda	76f7f68526	fix voxel system to send new bistream format, add helpers to VoxelNode class	2013-03-19 15:52:51 -07:00
Stephen Birarda	482e65c296	move randomBoolean and randomColorValue methods to SharedUtil	2013-03-19 15:49:12 -07:00
Kees van Prooijen	d70da7f215	some more warning removal, temporarily excluding portaudio for windows	2013-03-19 11:49:36 -07:00
Stephen Birarda	c7213d6593	conditionally include winsock2.h instead of UNIX socket stuff	2013-03-19 11:46:53 -07:00
Stephen Birarda	8ef885aaaf	remove extra tokens after endif for WIN32 conditionals	2013-03-19 11:10:42 -07:00
Kees van Prooijen	cd27c74a2d	prelimanary changes for windows port	2013-03-19 11:01:08 -07:00
Leonardo Murillo	e396269d78	Switching to unsigned	2013-03-19 11:02:47 -06:00
Leonardo Murillo	9e0df2dbd1	Add unique id to agents and broadcast back	2013-03-18 17:10:05 -06:00
Stephen Birarda	807377ef97	change bitstream load function to return stateless MTU sized packets	2013-03-18 13:16:14 -07:00
Stephen Birarda	ec5e4095c9	delete spaces at end of VoxelNode	2013-03-18 13:14:41 -07:00
Stephen Birarda	e012f826e5	some spacing for clarity in SharedUtil	2013-03-18 13:14:22 -07:00
Stephen Birarda	32b52f474f	fix wraparound bitshifting in OctalCode class	2013-03-18 13:14:06 -07:00
Stephen Birarda	2c0565e358	prepend bitstream packets with a V	2013-03-15 14:33:45 -07:00
Stephen Birarda	970daa511d	make bytesRequiredForCodeLength method visible in header	2013-03-15 14:33:21 -07:00
Stephen Birarda	e8ebaeb497	add OctalCode shared library for octal code operations	2013-03-15 12:27:22 -07:00
Stephen Birarda	3e36ba9265	use char when unsigned char is not explicitly required	2013-03-15 12:26:34 -07:00
Stephen Birarda	14b23fc053	store octal code with VoxelNode	2013-03-15 12:25:48 -07:00
Stephen Birarda	2f7767bc9b	add helper method to SharedUtil to print bits in char	2013-03-15 12:25:13 -07:00