253 commits

Author	SHA1	Message	Date
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
Kees van Prooijen	f308d8e004	merge with upstream master	2013-03-21 10:10:33 -07:00
Stephen Birarda	f97932353b	fix conditional inclusion of voxel in vertices and color arrays	2013-03-20 16:28:28 -07:00
Stephen Birarda	abc0deaa78	increase the far clip	2013-03-20 16:22:24 -07:00
Stephen Birarda	1efbaef44b	only add voxel to be drawn if not transparent	2013-03-20 16:21:45 -07:00
Stephen Birarda	e8f84aee78	fix rendering bugs	2013-03-20 15:32:12 -07:00
Stephen Birarda	634e9c4bf7	parse the bitstream tree and create an in memory representation to render	2013-03-20 13:25:11 -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	92fc1ed1a6	receive bitstream from voxel server on client	2013-03-19 15:51:48 -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
Stephen Birarda	5b8541eaa4	fix conditional implementation of SerialInterface	2013-03-18 16:29:06 -07:00
Stephen Birarda	6a7b40629c	remove the unused outstring method	2013-03-18 16:20:39 -07:00
Stephen Birarda	158270f20d	only use SerialInterface if on UNIX machine	2013-03-18 15:36:26 -07:00
Stephen Birarda	42fe3ce077	remove unused methods from VoxelSystem	2013-03-15 12:27:00 -07:00
Stephen Birarda	99e21be12c	include cstring for memcpy	2013-03-13 13:29:39 -07:00
Stephen Birarda	012b4a92fd	add a missing glBindBuffer that caused client to crash on voxel drawing	2013-03-13 11:58:58 -07:00
Stephen Birarda	95eb241fdd	remove OS X specific menu, have voxel server point to correct DS	2013-03-13 11:07:46 -07:00
Stephen Birarda	d51f52c307	add back fred's flange, with some tuning	2013-03-12 13:59:19 -07:00
Philip Rosedale	ccd60fa07f	Merge remote-tracking branch 'origin'	2013-03-12 10:49:33 -07:00
Stephen Birarda	0739d39568	add missing copy constructors for Head and Hand	2013-03-12 10:42:41 -07:00
Stephen Birarda	f29510ceb0	remove setSourcePosition that re-appeared on merge	2013-03-12 10:24:02 -07:00
stojce	72bdf340e9	additional merge	2013-03-12 18:14:18 +01:00
stojce	8e6c98661b	merge conflicts	2013-03-12 18:12:58 +01:00
Stephen Birarda	e97aba03a3	move StdDev to shared library	2013-03-12 10:09:07 -07:00
Philip Rosedale	e3697f22f8	Merge remote-tracking branch 'origin'	2013-03-11 17:28:05 -07:00
Stephen Birarda	4be337d34b	only hold the threshold number of frames for audio output	2013-03-11 17:27:27 -07:00
Philip Rosedale	3e62aa5169	Fixed/improved Standard Deviation code used to get jitter	2013-03-11 17:13:18 -07:00
Philip Rosedale	74452b7cc5	manual merge removed ECHO_SERVER_TEST	2013-03-11 16:24:55 -07:00
Philip Rosedale	9f21c76380	Merge remote-tracking branch 'origin/master'	2013-03-11 16:22:16 -07:00
Philip Rosedale	674bd8d798	transmitter full movement, and audio jitter buffer tweaks/debugging data	2013-03-11 16:19:55 -07:00
Stephen Birarda	5d02d563b3	remove the flange until it's ready for primetime ... This reverts commit 5652d0dcd3.	2013-03-10 15:04:23 -07:00
Philip Rosedale	79f39483d0	Merge remote-tracking branch 'origin'	2013-03-08 18:17:10 -08:00
Stephen Birarda	5652d0dcd3	add a flange effect when turning head with gyros	2013-03-08 17:18:28 -08:00
Philip Rosedale	5c1bd68580	Merge remote-tracking branch 'origin/master'	2013-03-08 16:00:17 -08:00
Philip Rosedale	f014fcd0ac	transmitter tweaks	2013-03-08 15:58:49 -08:00
Stephen Birarda	5535b8a4f5	allow client to request loopback from mixer	2013-03-08 15:37:41 -08:00
Stephen Birarda	686404be2b	add a voxel server	2013-03-08 14:32:06 -08:00
Stephen Birarda	4a0aba9fb6	explicitly include GLUT framework for apple builds	2013-03-07 10:35:59 -08:00
Philip Rosedale	26fd44f030	100,000 voxel death star with concentric shells	2013-03-06 16:58:38 -08:00
Philip Rosedale	e7aa142082	Merge remote-tracking branch 'origin'	2013-03-06 15:23:40 -08:00
Philip Rosedale	89d205f304	turn cloud back off	2013-03-06 14:45:24 -08:00
Philip Rosedale	f98f64e8f7	Added red 'laser pointer' to hand	2013-03-06 14:40:24 -08:00
Stephen Birarda	f004479e39	bump up to 300000 voxels, with color	2013-03-06 14:34:14 -08:00
Stephen Birarda	e16cd4ffc3	use vertex buffer objects to speed up voxel rendering	2013-03-06 13:56:11 -08:00
Stephen Birarda	0fbb534566	randomly draw 50000 voxels for glDrawElements test	2013-03-06 12:04:27 -08:00