5551 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Philip Rosedale	d5a0b2ff93	Fixes per review	2013-08-08 16:10:07 -07:00
ZappoMan	2c96296936	fixed LOD disappear on backing up	2013-08-08 16:08:06 -07:00
ZappoMan	0e9e4c8c07	cr feedback	2013-08-08 16:05:30 -07:00
Philip Rosedale	43ad461275	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-08 16:01:02 -07:00
Philip Rosedale	45961b2b64	Collision and click sounds improved	2013-08-08 16:00:50 -07:00
atlante45	1117bb4305	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-08 15:51:07 -07:00
atlante45	f5fe965093	Position based follow mode whith head movement	2013-08-08 15:49:35 -07:00
atlante45	b1e975e96b	Don't show pie menu when on voxel	2013-08-08 15:48:33 -07:00
ZappoMan	a5459f8ab5	Merge pull request #840 from birarda/master ... repair header byte calculations in assignment server	2013-08-08 15:22:22 -07:00
Stephen Birarda	5cc59455f8	Merge pull request #841 from ZappoMan/master ... add parameter for Dump Voxels on Move	2013-08-08 15:20:48 -07:00
ZappoMan	299696e7a4	add parameter for Dump Voxels on Move	2013-08-08 15:20:08 -07:00
Stephen Birarda	a661d9f2f4	repair header byte calculations in assignment server	2013-08-08 15:19:48 -07:00
Stephen Birarda	a234deeb15	Merge pull request #839 from ZappoMan/dontdumpvoxels ... Don't Dump Voxel Node Bag on Move	2013-08-08 15:09:51 -07:00
ZappoMan	4fe8c2807e	Merge branch 'master' of https://github.com/worklist/hifi into dontdumpvoxels	2013-08-08 15:04:38 -07:00
ZappoMan	3a2b668424	make dontdumponmove default	2013-08-08 15:04:23 -07:00
ZappoMan	bac2362706	Merge branch 'master' of https://github.com/worklist/hifi into split_tool	2013-08-08 14:51:42 -07:00
ZappoMan	25350e99a3	fix whitespace	2013-08-08 14:49:16 -07:00
Stephen Birarda	bed398e0d7	Merge pull request #838 from birarda/master ... tone down VS sending	2013-08-08 14:47:19 -07:00
Stephen Birarda	1eff6e94ce	tone down voxel server sending	2013-08-08 14:46:56 -07:00
ZappoMan	205ba7c642	drop default Packets per second	2013-08-08 14:45:35 -07:00
ZappoMan	1bb7d75794	added tool for splitting SVOs on jurisdiction boundaries	2013-08-08 14:36:42 -07:00
Stephen Birarda	80cf39e437	Merge pull request #836 from ZappoMan/master ... Fixed voxel server "down" case for last voxel server	2013-08-08 14:33:33 -07:00
ZappoMan	6d4ebda1ff	fix delete local voxels in case of last voxel server going away	2013-08-08 14:30:46 -07:00
ZappoMan	48e35ec6cb	fix delete local voxels in case of last voxel server going away	2013-08-08 14:29:58 -07:00
Stephen Birarda	64dbefb730	Merge branch 'master' of github.com:worklist/hifi	2013-08-08 14:22:32 -07:00
Andrzej Kapolka	5bca763c14	Merge branch 'master' of https://github.com/worklist/hifi into glow	2013-08-08 13:58:53 -07:00
Andrzej Kapolka	65b2aebea9	Merge pull request #835 from ZappoMan/master ... add --domain and --MinimalEnvironment to voxel-server	2013-08-08 13:55:48 -07:00
ZappoMan	f7b773d6a6	Merge pull request #834 from ey6es/master ... Update the *other* avatar mixer bandwidth stats.	2013-08-08 13:36:58 -07:00
ZappoMan	8addfdc433	add --domain and --MinimalEnvironment to voxel-server	2013-08-08 12:54:34 -07:00
Andrzej Kapolka	c929f67cc4	Update the *other* avatar mixer bandwidth stats.	2013-08-08 12:33:31 -07:00
Stephen Birarda	8dead083e7	Merge branch 'master' of github.com:worklist/hifi	2013-08-08 12:27:45 -07:00
Stephen Birarda	61003335bb	Merge pull request #833 from birarda/assignee ... add assignment-server to jobs.groovy	2013-08-08 12:14:28 -07:00
Stephen Birarda	957549ddd6	add a job to build and deploy the assignment server	2013-08-08 12:14:03 -07:00
ZappoMan	7e5f03a36f	Merge pull request #832 from birarda/assignee ... tweaks to assignment server and AvatarData for assignment to iOS	2013-08-08 12:13:07 -07:00
Stephen Birarda	f60cbed709	fix packet size of assignment packet	2013-08-08 12:09:59 -07:00
Andrzej Kapolka	cb89f05a39	Merge branch 'master' of https://github.com/worklist/hifi into glow	2013-08-08 12:01:03 -07:00
Stephen Birarda	68478f0689	Merge branch 'master' of github.com:worklist/hifi	2013-08-08 11:22:22 -07:00
Stephen Birarda	287bead0b7	add extra debugging to assignment server	2013-08-08 11:22:02 -07:00
Stephen Birarda	94d270b3d5	remove equals at beginning of AvatarData	2013-08-08 11:21:39 -07:00
Andrzej Kapolka	4279d508b7	Merge pull request #831 from ey6es/master ... Disable specular highlights for ground and voxels.	2013-08-08 11:03:30 -07:00
Andrzej Kapolka	29912d053a	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-08 11:02:59 -07:00
Andrzej Kapolka	3855b7c0a1	Merge pull request #830 from ZappoMan/master ... make voxel server fades slightly smaller than bounds to prevent z-fighting	2013-08-08 11:02:17 -07:00
Andrzej Kapolka	aca15d4aef	Disable specular highlights for ground and voxels.	2013-08-08 10:59:01 -07:00
ZappoMan	647c176631	make voxel server fades slightly smaller than bounds to prevent z-fighting	2013-08-08 09:57:48 -07:00
ZappoMan	6e7dc65d5f	hacking on not dumping voxels	2013-08-07 22:38:01 -07:00
ZappoMan	f2a9d0563a	Merge pull request #827 from machinelevel/dev4 ... Rave tweak: noise reduction	2013-08-07 21:16:59 -07:00
Philip Rosedale	e0eced4603	Merge pull request #828 from ey6es/master ... Fix for gyros' freaking out when disconnected.	2013-08-07 19:37:23 -07:00
ZappoMan	de068f6e72	Merge pull request #829 from ZappoMan/master ... implement --domain in audio-mixer	2013-08-07 19:31:39 -07:00
ZappoMan	5c83942842	implement --domain in audio-mixer	2013-08-07 19:30:49 -07:00
Andrzej Kapolka	9d7b22e065	Recompiled OS X driver.	2013-08-07 18:40:52 -07:00