4308 commits

Author	SHA1	Message	Date
Philip Rosedale	b3bb33e48c	Merge remote-tracking branch 'upstream/master'	2013-12-17 20:12:31 -08:00
Philip Rosedale	e6847961f5	reduced damping for thrown balls, turned off screen flash	2013-12-17 20:11:53 -08:00
Andrzej Kapolka	45c31cece3	Removed insertion test code.	2013-12-17 18:23:12 -08:00
Andrzej Kapolka	a90dbe314b	Merge branch 'master' of https://github.com/worklist/hifi into metavoxels	2013-12-17 18:10:39 -08:00
ZappoMan	a443570106	Merge pull request #1397 from birarda/master ... fix for 8 channel audio output	2013-12-17 18:04:12 -08:00
Andrzej Kapolka	f7aa464bf2	Somehow, I overwrote this value in Camera.	2013-12-17 17:21:56 -08:00
Andrzej Kapolka	ff2b77d311	Back to a more modest depth.	2013-12-17 17:16:09 -08:00
Andrzej Kapolka	8ddf6297a5	Fixed Xcode warnings.	2013-12-17 17:13:41 -08:00
Andrzej Kapolka	6cffce5b31	Merge branch 'master' of https://github.com/worklist/hifi into metavoxels	2013-12-17 16:57:25 -08:00
Andrzej Kapolka	e6a41b2003	Proof of concept sphere thing for metavoxels.	2013-12-17 16:56:52 -08:00
Stephen Birarda	c6dc93c28e	fix for 8 channel output devices (HDMI capture)	2013-12-17 16:08:38 -08:00
Philip Rosedale	f08354c853	higher speed collisions to trigger a bounce sound	2013-12-17 15:36:26 -08:00
ZappoMan	f469553b8c	CR feedback	2013-12-17 14:27:54 -08:00
ZappoMan	ccd6058412	get abstract menu class to work	2013-12-17 13:55:17 -08:00
Andrzej Kapolka	a5c8531aa1	Merge branch 'master' of https://github.com/worklist/hifi into metavoxels ... Conflicts: interface/src/Application.cpp	2013-12-17 13:46:44 -08:00
Andrzej Kapolka	d535d3b115	More progress on getting values in and out of scripts.	2013-12-17 13:44:56 -08:00
ZappoMan	77d29153b6	Merge pull request #1390 from PhilipRosedale/slaps ... throwing from fingertips, less gravity, lighter target rendering	2013-12-17 13:02:05 -08:00
Philip Rosedale	ae1cc99f3d	throwing from fingertips, less gravity, lighter target rendering	2013-12-17 12:48:59 -08:00
ZappoMan	a2f1b3e325	Merge branch 'master' of https://github.com/worklist/hifi into particle_blinky_bug	2013-12-17 11:35:49 -08:00
ZappoMan	4852aca86c	Merge pull request #1386 from PhilipRosedale/slaps ... Hand games are now menu options, hydra hands in fixed L/R orientation, added slaps game	2013-12-17 11:34:43 -08:00
ZappoMan	74d9c05c44	added particle server details to voxel stats dialog	2013-12-17 11:32:20 -08:00
Philip Rosedale	35e7cfddba	Made drumming and slaps into menu choices from ‘Hand Options’	2013-12-17 11:20:26 -08:00
Stephen Birarda	8ece758107	spacing fix in Audio.cpp	2013-12-17 11:13:45 -08:00
Philip Rosedale	d6efcce28e	Debugging render call for head/hand positions, debugging for ball injection	2013-12-17 11:08:38 -08:00
Stephen Birarda	cc5c04c82f	remove doubling of right channel for injected audio	2013-12-17 10:31:32 -08:00
Stephen Birarda	a634881477	have linearResampling handle mono to stereo 48KHz conversion	2013-12-17 09:52:42 -08:00
Stephen Birarda	964558d514	add a QAudioOutput object for local loopback	2013-12-17 09:41:28 -08:00
Philip Rosedale	fc28034f37	hydra hands hard coded to LH and RH controllers, ball debugging	2013-12-17 09:41:13 -08:00
Philip Rosedale	d4bad3421f	fix: get velocity from either hand or fingertip according to where ball is thrown from	2013-12-16 21:49:15 -08:00
Philip Rosedale	14d198f930	Merge remote-tracking branch 'upstream/master' into slaps	2013-12-16 21:20:05 -08:00
ZappoMan	e969331f5c	implement catching of particles	2013-12-16 20:29:28 -08:00
ZappoMan	8f1fbec057	added versioning to SVO files and Particle inHand support	2013-12-16 19:49:22 -08:00
ZappoMan	d9f412406f	better implementation of particle palm collisions	2013-12-16 18:12:47 -08:00
Philip Rosedale	4bf4ba22bd	Merge remote-tracking branch 'upstream/master' into slaps	2013-12-16 18:00:02 -08:00
Philip Rosedale	03869e81fd	Merge pull request #1380 from birarda/qt-for-portaudio ... move from 44.1 to 48 on audio	2013-12-16 17:58:41 -08:00
Andrzej Kapolka	6385a73379	Working on scripty bits.	2013-12-16 17:53:53 -08:00
Philip Rosedale	be27f36a7e	Merge remote-tracking branch 'upstream/master' into slaps	2013-12-16 17:37:22 -08:00
Philip Rosedale	6ab4839c3b	it’s the other guys palms you want	2013-12-16 17:14:19 -08:00
Philip Rosedale	0d76b370df	only check palms if active	2013-12-16 17:01:46 -08:00
Stephen Birarda	a31f15ee79	don't blow away a channel on local injection loopback	2013-12-16 16:57:30 -08:00
Stephen Birarda	efe05adcae	fix audio graphs for new audio infrastructure	2013-12-16 16:52:04 -08:00
Stephen Birarda	30b22a13ad	remove an unecessary condition in Audio.cpp	2013-12-16 16:30:04 -08:00
Stephen Birarda	bb93c64d8d	some initial audio stat render fixes	2013-12-16 16:21:50 -08:00
Stephen Birarda	90ea978278	fix some clipping in procedural audio	2013-12-16 16:03:46 -08:00
Stephen Birarda	e5d2647e70	fix last input loudness for mouth movement with no depth camera	2013-12-16 16:01:03 -08:00
Stephen Birarda	89beff4253	fix the scope and last input loudness	2013-12-16 15:41:58 -08:00
Stephen Birarda	f7ed8cef8f	fixes for all current headsets work	2013-12-16 15:31:05 -08:00
Stephen Birarda	6b644eb130	repair upsampling and local loopback by correcting for limits	2013-12-16 15:15:25 -08:00
Andrzej Kapolka	6888dc4eeb	Merge branch 'master' of https://github.com/worklist/hifi into metavoxels	2013-12-16 13:44:44 -08:00
Andrzej Kapolka	0ca2320711	Working on guide/script support.	2013-12-16 13:44:24 -08:00