21637 commits

Author	SHA1	Message	Date
samcake	7d8356686c	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-28 09:28:00 -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	4035478b9a	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-25 18:18:35 -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
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
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 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
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
David Kelly	a299aa7e24	initialize ptr!	2017-08-24 11:37:44 -07:00
samcake	b6a4ec910c	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-24 11:05:28 -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
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
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
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
druiz17	80eac56c4d	Merge pull request #11233 from jherico/threaded_overlay_edits ... Allow asynchronous editing of non-QML overlays	2017-08-23 09:45:01 -07:00
SamGondelman	d7b3686364	include noncollidable entities	2017-08-22 17:37:51 -07:00
Brad Davis	0a5bef22fc	Allow asynchronous editing of non-QML overlays	2017-08-22 17:12:18 -07:00
Anthony Thibault	bb49bcdcfd	Merge pull request #11223 from ElderOrb/bigobj ... fix for 'C1128: number of sections exceeded object file format limit'	2017-08-22 16:36:49 -07:00
David Kelly	591c031e7b	first pass still broken...	2017-08-22 16:24:25 -07:00
David Kelly	8bb7ea900a	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-22 16:23:23 -07:00
David Kelly	0bd3f1728d	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile	2017-08-22 14:40:10 -07:00
beholder	a1e0f31cd8	fix for 'C1128: number of sections exceeded object file format limit'	2017-08-23 00:24:09 +03:00
Zach Fox	763ce73306	Taking a break now	2017-08-22 12:26:46 -07:00
Zach Fox	a31088b60f	More progress	2017-08-22 12:16:17 -07:00
SamGondelman	b8a7fce201	boop	2017-08-22 11:54:55 -07:00