62717 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
H Q	72ed3b077d	Addressed PR change requests	2017-12-07 11:28:40 -08:00
Andrew Meadows	813c4fa38a	Merge pull request #11915 from druiz17/fix-collision-mask-for-children ... If hold actions are added to entity update the collision mask for the children aswell	2017-12-07 11:16:50 -08:00
Nissim Hadar	8c1a4e058e	Changed format (to 5 digits). ... Changed threshold.	2017-12-07 10:58:28 -08:00
Ryan Huffman	4dd08d93f4	Cleanup dead code and unused var in BakerCLI	2017-12-07 10:54:39 -08:00
Ryan Huffman	94a58a2471	Remove baking dependency from assignment-client	2017-12-07 10:53:23 -08:00
Anthony J. Thibault	47b52238d9	code review feedback	2017-12-07 10:49:23 -08:00
Anthony J. Thibault	68ad27a38d	Merge branch 'master' into bug-fix/flying	2017-12-07 10:28:13 -08:00
Anthony J. Thibault	b5ffda6911	const fix	2017-12-07 10:09:09 -08:00
Anthony J. Thibault	095bedcd3f	code review feedback	2017-12-07 10:08:18 -08:00
Anthony J. Thibault	fbcecbfc89	Merge branch 'master' into feature/domain-limited-height	2017-12-07 10:01:33 -08:00
Zach Fox	21077da41a	Don't send requests to backend if cached public keys is empty	2017-12-07 09:48:06 -08:00
Sam Gondelman	99c52f8602	coding standards	2017-12-07 09:38:14 -08:00
Brad Hefta-Gaub	4f8a2ea4be	Merge pull request #11934 from ctrlaltdavid/21630 ... Fix cloned 3D overlays' dimensions	2017-12-07 09:24:01 -08:00
samcake	e0110ff7e6	Merging with upstream	2017-12-07 09:23:38 -08:00
Brad Hefta-Gaub	a0457d2b5e	Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars ... Use PrioritySortUtil for avatar updates from avatar-mixer	2017-12-07 09:22:52 -08:00
Brad Hefta-Gaub	88ed15aaaa	Merge pull request #11942 from ctrlaltdavid/21633 ... Fix image overlay's subImage property's width and height support	2017-12-07 09:19:43 -08:00
Brad Hefta-Gaub	b91909011a	Merge pull request #11914 from 1P-Cusack/FogBugz/Case_7049 ... [Case 7049]: Remove unused fields and checkboxes from Edit.js	2017-12-07 09:18:26 -08:00
Brad Hefta-Gaub	ac3bd5042f	Merge pull request #11890 from dback2/mirrorissues3 ... Secondary camera frame buffer / texture fixes	2017-12-07 09:17:27 -08:00
samcake	5f85e8e2cb	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-07 08:48:12 -08:00
Sam Gateau	0245a7005d	Adding the query of a particular selection content	2017-12-06 22:44:58 -08:00
samcake	5500a6d11c	More to come	2017-12-06 18:02:30 -08:00
Bradley Austin Davis	2bd24ee7a2	Merge pull request #11940 from birarda/bug/grab-latest-vcredist ... grab latest VC redistributables from MS during INSTALL	2017-12-06 17:32:10 -08:00
Bradley Austin Davis	3e6bea14e6	Merge pull request #11922 from jherico/opt/scene ... Scene threading optimizations	2017-12-06 17:23:58 -08:00
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
David Rowe	0146eca315	JSDoc review	2017-12-07 10:09:05 +13: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
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