62519 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	de7e3e60cd	Add temp dir removal to asset server	2017-12-06 11:49:34 -08:00
Ryan Huffman	7eb93f4777	Add oven as dep to assignment-client	2017-12-06 11:49:34 -08:00
Ryan Huffman	f3fc5769e8	Move asset baking on asset server to separate process	2017-12-06 11:49:19 -08:00
Stephen Birarda	008b4285f5	don't use cmake sys library install, grab vcredist as external	2017-12-06 11:35:14 -08:00
Stephen Birarda	c329a58c14	ignore vcredist when performing fixup_bundle	2017-12-06 11:26:34 -08:00
Dante Ruiz	0f3a70553c	fix dynamic entities that are parented to your avatar	2017-12-06 11:18:15 -08:00
samcake	1efddb8260	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-06 10:21:45 -08:00
Olivier Prat	dc55a16834	Fixed warnings on Mac and Ubuntu	2017-12-06 18:37:27 +01:00
Olivier Prat	8d710c8f73	Factorised out some computation needed for all cascades	2017-12-06 18:08:27 +01:00
Olivier Prat	014e81b2f4	Added normal based adaptive depth bias	2017-12-06 17:06:48 +01:00
Olivier Prat	c9c93370da	Fixed weird bug with objects suddenly poping out of the shadow map. Was due to objects with own pipeline corrupting the render state. Don't know why though	2017-12-06 15:26:44 +01:00
Olivier Prat	89b1ef2e19	Tweaked bias once more	2017-12-06 12:07:30 +01:00
Olivier Prat	ff39558d27	Automatic shadow bias computation from cascade texel density	2017-12-06 11:22:15 +01:00
Olivier Prat	f9641afcd0	Modified cascade distance distribution to blend between a desired resolution and an automatic logarithm distribution	2017-12-06 10:48:04 +01:00
Olivier Prat	1d8d8335c5	Moved shadow cascade distances computation to shadow, not shadow task	2017-12-06 10:05:39 +01:00
samcake	1483195285	almost complete setup working, yeah	2017-12-05 18:27:53 -08:00
luiscuenca	8abe8b9879	move save logic to audioclient	2017-12-05 18:22:14 -08:00
Zach Fox	3183a1a8b9	Add setupAttemptID to every step (thanks Dave)	2017-12-05 16:48:30 -08:00
David Rowe	cafebf6a7e	Fix Unix build warnings and tidy initializers	2017-12-06 13:38:42 +13:00
luiscuenca	20d6615417	emit only when recording	2017-12-05 16:13:44 -08:00
Dante Ruiz	36aa0ae476	Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children	2017-12-05 15:48:45 -08:00
Dante Ruiz	8af1d8d8d0	dont run code if not nesscassry	2017-12-05 15:48:09 -08:00
Alexander Ivash	c007c6d00f	10108 marketplace category cannot scroll	2017-12-06 02:47:19 +03:00
David Rowe	e074bd85f9	Fix shape of cloned shape overlay	2017-12-06 12:29:09 +13:00
David Rowe	2752dc7cac	Fix dimensions of cloned cube, sphere, shape, and model overlays	2017-12-06 12:28:55 +13:00
Zach Fox	902064ed37	Cleanup debug stuff	2017-12-05 15:26:55 -08:00
Zach Fox	c807fc80e3	Add marketplace cta referrer	2017-12-05 15:25:05 -08:00
Zach Fox	7521e4870e	Bugfixes	2017-12-05 14:56:47 -08:00
Zach Fox	668f6d50b5	Add data tracking for wallet setup	2017-12-05 14:13:48 -08:00
Dante Ruiz	bbc022da2d	fix-far-to-equip	2017-12-05 14:09:46 -08:00
Zach Fox	4334bf8222	Add data tracking for purchase and rez	2017-12-05 13:09:09 -08:00
Clément Brisset	a5e671e0fd	Merge pull request #11931 from highfidelity/stable ... stable -> master	2017-12-05 11:58:23 -08:00
Zach Fox	c80039ea87	Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1 ... Fix gray/incorrect security image after relog	2017-12-05 11:21:06 -08:00
Zach Fox	1507620fd5	Merge pull request #11921 from ElderOrb/FB10024 ... 10024 Wallet: TextField Focus Problems	2017-12-05 10:52:08 -08:00
Zach Fox	d59c9bd73a	Fix gray/incorrect security image after relog	2017-12-05 10:27:40 -08:00
Olivier Prat	e16b427ab6	Switched to 4 cascades for key light and working on a better distribution	2017-12-05 18:57:04 +01:00
Dante Ruiz	c58286d371	dont do work if not needed	2017-12-05 09:31:35 -08:00
Nissim Hadar	3de34834e1	Changed autoTester threshold to 0.9995 ... Added a readme explaining how to deploy autoTester.	2017-12-05 11:19:00 -06:00
Ryan Downe Karpf	f2c49b3231	Merge pull request #11887 from highfidelity/RC60 ... Beta Release 60 - Includes up to Developer Release 7493	2017-12-05 11:37:52 -05:00
Olivier Prat	c0ca7a129d	Fixed issue with far distance of cascades being underestimated, especially first cascade	2017-12-05 17:33:11 +01:00
Sam Gateau	1c5548b77b	Color picker in qml	2017-12-05 01:25:30 -08:00
Olivier Prat	0b6dcb2717	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-05 09:18:26 +01:00
Sam Gateau	987246afb8	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-04 19:11:42 -08:00
samcake	de410b6833	I need a color editor	2017-12-04 17:29:01 -08:00
Dante Ruiz	486cdf14d2	make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed	2017-12-04 15:34:53 -08:00
luiscuenca	d70a3685b8	Clean up	2017-12-04 15:29:13 -08:00
luiscuenca	390c59b45c	Change menu and minor fixes	2017-12-04 15:29:01 -08:00
LaShonda Hopper	eb8438a9e8	[Case 7049] Addresses code review feedback. ... Changes Committed: modified: scripts/system/html/js/entityProperties.js	2017-12-04 18:25:51 -05:00
NissimHadar	ec1c4c37fa	Merge pull request #11912 from ElderOrb/FB9461 ... 9461 Keyboard for create appear then disappears immediately (HMD)	2017-12-04 16:49:25 -06:00
samcake	9fceaad38b	Merging with master	2017-12-04 14:20:10 -08:00