1015 commits

Author	SHA1	Message	Date
Philip Rosedale	688bd0f34f	first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body'	2014-11-05 16:58:58 -08:00
Philip Rosedale	558aa52d30	Merge branch 'master' of https://github.com/worklist/hifi	2014-11-04 12:14:08 -08:00
Stephen Birarda	74753e5b8b	allow a blocking lookup of IP address in HifiSockAddr	2014-11-03 15:13:41 -08:00
Philip Rosedale	cf121a9fe5	Merge branch 'master' of https://github.com/worklist/hifi	2014-10-28 20:22:40 -07:00
Philip Rosedale	f10aeaffab	working on audio mixer muting	2014-10-28 20:22:33 -07:00
Philip Rosedale	e5c9ad4525	Merge pull request #3661 from Atlante45/reverb_fixed ... Audio Environment packets	2014-10-28 18:11:14 -07:00
Brad Hefta-Gaub	be65a798db	Merge pull request #3681 from birarda/verbose-log-silencer ... logging tweaks to reduce spam from repeated log messages	2014-10-28 17:58:17 -07:00
Stephen Birarda	d3bbd251db	move Logging to LogHandler	2014-10-28 13:59:23 -07:00
Andrew Meadows	4c3cdf5b7a	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
Atlante45	12f0237dc7	Cleanup	2014-10-24 15:02:09 -07:00
Atlante45	847ef64b66	move audio env data over to new packet	2014-10-24 14:27:55 -07:00
Atlante45	529a7e0369	CR	2014-10-23 22:55:40 -07:00
Atlante45	d4ec337cae	Don't send reverb data as often	2014-10-23 13:39:56 -07:00
Atlante45	9c45055aeb	Fixed for no/multiple reverb zones	2014-10-22 23:32:07 -07:00
Philip Rosedale	3ba3354e11	Merge pull request #3636 from Atlante45/reverb ... Reverb	2014-10-22 21:51:57 -07:00
Atlante45	8ccbfcf695	code cleanup	2014-10-22 16:41:41 -07:00
Andrzej Kapolka	345a9f02f7	Upload fix.	2014-10-22 14:30:20 -07:00
Atlante45	86c965a922	Merge branch 'master' of https://github.com/highfidelity/hifi into reverb	2014-10-22 14:20:22 -07:00
Andrzej Kapolka	bd4738d2c2	Reliable delta fix.	2014-10-21 15:48:53 -07:00
Andrzej Kapolka	d64b43693d	Networking fix.	2014-10-20 15:33:46 -07:00
Atlante45	6f9557fe67	Do not destroy script reverb settings	2014-10-20 15:06:02 -07:00
Atlante45	37b47b52d3	Stream reverb settings from mixer to interface	2014-10-20 11:49:57 -07:00
Atlante45	86b87770c2	Merge branch 'master' of https://github.com/highfidelity/hifi into reverb	2014-10-17 16:50:19 -07:00
Atlante45	26b1e8fc29	grab reverb settings on mixer side	2014-10-16 22:46:40 -07:00
ZappoMan	fc507850be	Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles	2014-10-16 20:36:28 -07:00
Atlante45	9019ae4f89	Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones ... Conflicts: domain-server/resources/web/js/settings.js	2014-10-16 10:55:46 -07:00
AndrewMeadows	4fbc589606	Merge pull request #3598 from birarda/domain-tunnel ... initial pass at using keypairs for username verification for basic domain-server ACL	2014-10-16 10:49:03 -07:00
Stephen Birarda	72f0bc61a2	remove some extra spaces	2014-10-15 14:54:28 -07:00
Stephen Birarda	56ad97db17	remove mmintrin include that isn't needed anymore	2014-10-15 14:26:03 -07:00
Stephen Birarda	e9bcc90166	handle remaining conversions for AccountManager passing QNetworkReply	2014-10-14 16:16:54 -07:00
Atlante45	b227014510	Stupid mistake	2014-10-14 14:14:59 -07:00
ZappoMan	4c85e9f581	removing particles	2014-10-13 14:10:57 -07:00
Atlante45	bbd1afc55c	Switch hash to an array	2014-10-13 13:50:06 -07:00
Atlante45	6bde4b8324	Move break	2014-10-13 10:24:01 -07:00
Atlante45	d8c60a78bb	Fix stupid variable swap	2014-10-10 15:32:29 -07:00
Atlante45	7e8915fed8	Break out of double loop	2014-10-10 10:08:22 -07:00
Atlante45	0aafd23c7f	CR	2014-10-10 10:00:35 -07:00
Atlante45	03555174ef	Remove TREE_SCALE factor _ update attenuation	2014-10-09 18:54:21 -07:00
Atlante45	90c5c7f43c	Attenuation coefficients parsing	2014-10-09 16:41:48 -07:00
Atlante45	0fa95ba61d	Removed Unattenuated zones from mixer	2014-10-09 14:46:32 -07:00
Atlante45	06bd9ba16e	Split settings parsing according to new structure	2014-10-09 14:39:31 -07:00
Atlante45	981666cb38	Moved audioMixer setting parsing to its own function	2014-10-09 11:49:55 -07:00
Stephen Birarda	7773a94df7	resolve conflicts on merge with upstream master	2014-10-08 09:27:16 -07:00
Stephen Birarda	f19c5c9850	repair NetworkAccessManager returns, handle custom AS port in assignment-client	2014-10-06 14:57:38 -07:00
Stephen Birarda	0fd7ec34fc	remove an unused const	2014-10-06 12:34:12 -07:00
Stephen Birarda	f89b225da2	handle local socket changes by monitoring every so often	2014-10-06 09:17:25 -07:00
Stephen Birarda	60e3f3edfa	add skipSubHandler to OctreeServer HTTPRequestHandler calls	2014-10-02 11:20:56 -07:00
Stephen Birarda	909a6e89a8	resolve conflicts on merge with upstream master	2014-09-30 13:50:04 -07:00
Atlante45	4c34571570	Removed debug	2014-09-30 12:54:58 -07:00
Atlante45	4e7bf0487b	Add attenuation setting on DS page	2014-09-30 12:50:50 -07:00