62428 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nissim Hadar	ebad5cf503	Reduced threshold from 0.9995 to 0.995	2017-12-06 16:55:32 -08:00
John Conklin II	fffcf56904	Merge pull request #11892 from SamGondelman/snapshot ... Expose Window.getDeviceSize()	2017-12-06 16:44:08 -08:00
H Q	ed76ca8018	return to main mktplace page from rez page	2017-12-06 15:37:19 -08:00
David Rowe	d61f0584c3	Fix diectory.js script's icon URL	2017-12-07 12:26:29 +13:00
David Rowe	efd72be96f	Fix image overlay's subImage property's width and height support	2017-12-07 12:05:46 +13:00
Bradley Austin Davis	2a91e98813	Fix iterator names	2017-12-06 14:26:07 -08:00
Brad Davis	e626ca3ccd	Working on scene threading optimizations	2017-12-06 14:26:07 -08:00
Dante Ruiz	32fca16c85	fix radius equiping	2017-12-06 14:16:32 -08:00
Zach Fox	f88a72894d	Merge pull request #11937 from zfox23/commerce_dataTracking1 ... Commerce Data Tracking: Iteration One	2017-12-06 14:07:04 -08:00
Ryan Huffman	2eecb41337	Update metatype registration in assetBakeTask	2017-12-06 13:59:46 -08:00
Ryan Huffman	6b098bfc6a	Fix aborted baking in oven cli	2017-12-06 13:51:31 -08:00
Zach Fox	5f3b148baa	Fix marketplace icon incorrectly appearing active	2017-12-06 13:01:23 -08:00
Ryan Huffman	cb9a30413d	Rename removeTemporaryDis to removeTemporaryApplicationDirs	2017-12-06 12:50:20 -08:00
Stephen Birarda	99b5b8942a	add file download command to install step	2017-12-06 12:15:42 -08:00
Ryan Huffman	f20aa2e680	Fix asset server baking not working on *nix	2017-12-06 11:49:34 -08:00
Ryan Huffman	bee666b522	Add error text reading to asset server baking	2017-12-06 11:49:34 -08:00
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
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
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
Sam Gateau	1c5548b77b	Color picker in qml	2017-12-05 01:25:30 -08: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