58497 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sam Gateau	16fbe00ef5	FIxing the jittering projection modification	2017-08-30 22:42:55 -07:00
samcake	37f440031f	Expose Hlaton 16 sequence	2017-08-30 17:59:06 -07:00
samcake	af09ae0686	Some more refinment, no clear changes though	2017-08-29 18:12:05 -07:00
samcake	66d35118cb	Refining the debugging to better understand the issues	2017-08-28 18:14:46 -07:00
samcake	7d8356686c	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-28 09:28:00 -07:00
Chris Collins	d675ee9427	Merge pull request #11250 from jherico/thread_safety ... Additional locking in model entities	2017-08-28 09:22:30 -07:00
Sam Gateau	a98d861600	Merge pull request #11242 from SamGondelman/tabletLayer2 ... Web overlays and entities are always non anti-aliased	2017-08-28 09:10:14 -07:00
Sam Gateau	0f67f9bc52	Eposing the jitter sequence and debugging it	2017-08-27 22:08:33 -07:00
Sam Gateau	4035478b9a	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-25 18:18:35 -07:00
samcake	878ac64721	adding the qml styles	2017-08-25 17:00:27 -07:00
samcake	21987c4c5d	Adding the code for the color clamping	2017-08-25 16:58:05 -07: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
Brad Davis	3ad32af975	Additional locking in model entities	2017-08-25 11:49:45 -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
samcake	025f7fa0d0	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-25 10:19:05 -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
samcake	ce37e88987	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-25 09:03:18 -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
samcake	46c6d52036	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-25 08:51:06 -07:00
Sam Gateau	bf982c3a85	using the linear depth buffer and voila	2017-08-25 00:25:13 -07:00
samcake	914db1d5a6	adding the tablet apps	2017-08-24 18:06:07 -07:00
samcake	9335acc887	Merge and a lot of rewriting the color conversion	2017-08-24 18:02:11 -07:00
Sam Gondelman	4e7818180b	Merge branch 'master' into tabletLayer2	2017-08-24 17:56:44 -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
SamGondelman	4a49801217	web overlays and entities are always nonAA	2017-08-24 14:23:21 -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
samcake	b6a4ec910c	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-24 11:05:28 -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