58452 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
vladest	78aa5820d0	Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings	2017-08-27 11:56:28 +02:00
vladest	d4332e7776	Adopting according comments from designers	2017-08-26 20:55:16 +02:00
vladest	7796946343	Merge branch 'master' into audio_devices_split	2017-08-26 20:00:00 +02:00
druiz17	06ab8ddbb2	Merge pull request #11251 from elisa-lj11/blocks ... Blocks app accommodates updated Blocks website	2017-08-25 16:32:14 -07:00
David Kelly	5bbe3c5a94	Merge pull request #11246 from davidkelly/dk/encryptionBug ... security image bug	2017-08-25 14:14:22 -07:00
Zach Fox	3fdfe3fe68	Merge pull request #11249 from zfox23/commerce_walletStatus ... Huge cleanup of Wallet logic	2017-08-25 13:53:17 -07:00
David Kelly	0f722992a5	add delete to client of decryptFile	2017-08-25 11:24:37 -07:00
Elisa Lupin-Jimenez	4c40e3bdf4	fixed weird info box display of filenames	2017-08-25 11:21:07 -07:00
Elisa Lupin-Jimenez	7cee80f0cf	my own objects (or rather objects with low poly count) download now	2017-08-25 11:09:11 -07:00
Zach Fox	453897b9e2	Huge cleanup!	2017-08-25 10:56:53 -07:00
David Kelly	c316e50f0f	security image bug	2017-08-25 10:29:40 -07:00
Elisa Lupin-Jimenez	ee36fd579c	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-25 09:55:48 -07:00
Andrew Meadows	f82fa2f981	Merge pull request #11229 from ElderOrb/optional_build_tests ... make building tests optional	2017-08-25 09:10:56 -07:00
Andrew Meadows	4d7700b774	Merge pull request #11243 from SamGondelman/sharks ... Fix ray pick crash on shutdown	2017-08-25 09:01:14 -07:00
Sam Gateau	c5fbd5a2a5	Merge pull request #11131 from jherico/threaded_render_entities ... Threaded rendering of Entities	2017-08-24 17:34:49 -07:00
Elisa Lupin-Jimenez	3a512e3072	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-24 16:50:58 -07:00
Chris Collins	43b1e67e4a	Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter ... Create home bookmark for new content sets loaded in	2017-08-24 16:25:04 -07:00
SamGondelman	abaccf9edd	crash on shutdown	2017-08-24 16:00:36 -07:00
Elisa Lupin-Jimenez	e71823a8b5	forgot to track a file	2017-08-24 15:46:22 -07:00
Elisa Lupin-Jimenez	77f93ae84b	user agent switch allows downloads	2017-08-24 15:44:22 -07:00
Chris Collins	c0afda859f	Merge pull request #11240 from kencooke/audio-gate-threshold ... More aggressive noise gate threshold	2017-08-24 14:49:18 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
David Kelly	eb9436ba96	Merge pull request #11235 from davidkelly/dk/encryptFile ... Initial wallet app plus some encryption of security image	2017-08-24 13:17:14 -07:00
Elisa Lupin-Jimenez	5c027705ba	removed extraneous line from active tablet button code	2017-08-24 12:01:08 -07:00
Elisa Lupin-Jimenez	3444b0e84c	blocks icon button now has active state	2017-08-24 11:38:01 -07:00
David Kelly	a299aa7e24	initialize ptr!	2017-08-24 11:37:44 -07:00
Ken Cooke	684b7fee5a	DC filter cutoff at 0.5Hz	2017-08-24 11:20:22 -07:00
Elisa Lupin-Jimenez	d81c16ddb1	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-24 11:01:11 -07:00
David Kelly	698644c3b4	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-24 10:37:58 -07:00
Zach Fox	3d0fd76997	Temp fix for inventory and buy	2017-08-24 10:24:06 -07:00
Ken Cooke	4a253023ee	float constants	2017-08-24 10:15:54 -07:00
Ken Cooke	c3ff505b73	More aggressive noise gate threshold	2017-08-24 10:06:41 -07:00
Sam Gateau	4a18c5c80e	Merge pull request #11214 from SamGondelman/image3DFix ... Fix Image3DOverlays with fractional alpha	2017-08-24 09:04:02 -07:00
David Kelly	d398adc195	warnings	2017-08-24 08:48:26 -07:00
Brad Hefta-Gaub	5c832eae9c	Merge pull request #11226 from SamGondelman/miceWithLasers ... EntityTreeRender uses RayPick API with precision picking	2017-08-24 08:10:21 -07:00
Chris Collins	93457c0e42	Merge pull request #11237 from birarda/feat/ip-check ... add sender sock addr check to DS packet filter operator	2017-08-24 07:51:23 -07:00
Chris Collins	751440388a	Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix ... Bug fix for deadlock between EntitySimulation and EntityItem locks.	2017-08-23 20:50:41 -07:00
David Kelly	c77dafdf12	fix warnings, prepare a bit for hooking up the passphrase	2017-08-23 17:43:37 -07:00
Liv	1050141b11	Create home path for new content sets loaded in	2017-08-23 17:38:24 -07:00
Stephen Birarda	133b7e66b7	adjust a comment and remove some debug	2017-08-23 16:38:23 -07:00
Elisa Lupin-Jimenez	20b6cddc56	attempt to add active tablet button	2017-08-23 15:38:11 -07:00
Stephen Birarda	c122b22dfc	add additional IP check to DS packet filter operator	2017-08-23 15:32:25 -07:00
David Kelly	57d973851e	accidentally left in I guess	2017-08-23 15:11:17 -07:00
Brad Hefta-Gaub	afce8b547a	Merge pull request #11197 from hyperlogic/bug-fix/prevent-rig-crash-in-lambda ... Rig: Use a registry to prevent use after free crashes/corruption	2017-08-23 15:09:28 -07:00
David Kelly	138534c3ff	encrypt security image	2017-08-23 15:01:09 -07:00
David Kelly	f655bf2713	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-23 14:53:05 -07:00
Zach Fox	e815946744	Merge pull request #11231 from ElderOrb/Case5830 ... 5830: Go-To menu shows up blank except for address bar	2017-08-23 14:33:04 -07:00
beholder	9cd784990c	5830: Go-To menu shows up blank except for address bar	2017-08-23 23:27:02 +03:00
SamGondelman	206862a90f	fix flag bits	2017-08-23 12:20:30 -07:00
Zach Fox	a489267cec	Hide behind switch and remove dead code	2017-08-23 10:48:47 -07:00