19746 commits

Author	SHA1	Message	Date
David Rowe	d33ac21aaa	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
humbletim	144983a943	Merge remote-tracking branch 'upstream/master' into script-retry-improvements	2016-11-06 11:36:50 -05:00
humbletim	61452c21a2	bail early from irrecoverable retry situations	2016-11-06 10:31:28 -05:00
humbletim	2139e979da	map specific HTTP errors to corresponding ResourceRequest enums	2016-11-06 10:31:02 -05:00
Ryan Huffman	1a704f8d0a	Fix ScriptCacheSignalProxy not being properly cleaned up	2016-11-05 10:16:35 -07:00
Ryan Huffman	5287ec1eee	Fix includes hitting max retries locking the script up	2016-11-05 10:15:56 -07:00
Brad Hefta-Gaub	2684aed523	Merge pull request #8995 from AndrewMeadows/avoid-zero-quaternion ... normalize quaternions submitted to C++ from JS	2016-11-04 14:34:42 -07:00
Brad Hefta-Gaub	9a774553ae	Merge pull request #8998 from AndrewMeadows/ellipsoids-sorta ... use ConvexHull shape for irregular "spheres"	2016-11-04 11:39:32 -07:00
Andrew Meadows	4b623f72c3	compute correct volume for ellipsoid	2016-11-03 18:05:50 -07:00
Andrew Meadows	0d2cec290d	use convexHull for ellipsoidal "spheres"	2016-11-03 17:56:38 -07:00
Andrew Meadows	3ed3a74b7d	oops, don't forget to remove the sqrt	2016-11-03 17:08:42 -07:00
Andrew Meadows	c9c0b9ebc4	tighten rejection of zero-length quaternions	2016-11-03 17:01:09 -07:00
Brad Hefta-Gaub	7cca8f0a66	Merge pull request #8993 from samcake/blue ... Prevent sparse texture on AMD gpus for now	2016-11-03 16:48:52 -07:00
Brad Hefta-Gaub	4b1034a5e6	Merge pull request #8994 from ZappoMan/reduceTextureMax ... more conservative texture memory budget	2016-11-03 16:30:04 -07:00
Andrew Meadows	757ec5fff4	normalize quaternions submitted from scriptland	2016-11-03 16:02:39 -07:00
samcake	1086585559	fixing the test to actually capture ati correctly and add the report to the ui	2016-11-03 15:15:05 -07:00
Clément Brisset	00a94bdd6d	Merge pull request #8974 from huffman/feat/help-select-xbox-tab ... Update help window to auto select xbox or vive controller tab on availability of device	2016-11-03 14:42:23 -07:00
samcake	ce89f811f3	better loggin of the sparse switch	2016-11-03 14:35:44 -07:00
samcake	4104aa6286	avoid warning?	2016-11-03 14:31:28 -07:00
Brad Hefta-Gaub	206f1ead1a	Merge pull request #8990 from howard-stearns/centered-toolbar ... centered toolbar	2016-11-03 14:18:32 -07:00
Brad Hefta-Gaub	c1841f9add	more conservative texture memory budget	2016-11-03 14:10:07 -07:00
Ryan Huffman	413199459b	Fix the name searched for in isViveControllerAvailable	2016-11-03 14:02:18 -07:00
Ryan Huffman	625c98820d	Fix isSubdeviceContainingNameAvailable	2016-11-03 14:01:52 -07:00
Brad Hefta-Gaub	961e17bc48	Merge pull request #8989 from sethalves/fix-polyvox-bitrot ... fix a couple of minor polyvox problems	2016-11-03 13:43:52 -07:00
Brad Hefta-Gaub	f10e43d148	Merge pull request #8992 from AndrewMeadows/fix-autoresize ... fix autoresize of Entities.addEntity() and fix Quat.lookAtSimple()	2016-11-03 13:41:47 -07:00
samcake	6a39ad3b5a	Prevent sparse texture on AMD gpus for now	2016-11-03 13:01:41 -07:00
howard-stearns	3a072b5bf9	tell desktop about preference changes	2016-11-03 12:17:28 -07:00
Brad Hefta-Gaub	e1837c90e2	Merge pull request #8991 from sethalves/fix-8981 ... fix QVector<bool> packing when number of joints isn't a multiple of 8	2016-11-03 10:59:06 -07:00
Seth Alves	1d0c3d7168	fix checker for unreasonable size of vector of bools	2016-11-03 09:47:24 -07:00
Andrew Meadows	b7c6922545	proper corner case check for Quat::lookAtSimple()	2016-11-03 09:17:22 -07:00
Andrew Meadows	cd5826e2ce	load model of new entity with unknown dimensions	2016-11-03 09:03:04 -07:00
Seth Alves	cfea3cba9b	guard against heap-overflow in the event of bogus entity network data	2016-11-03 06:54:11 -07:00
Seth Alves	64cb5d1b1a	fix QVector<bool> packing when number of joints isn't a multiple of 8	2016-11-02 20:02:07 -07:00
Seth Alves	d0c0cdd82f	polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again	2016-11-02 16:31:34 -07:00
David Rowe	427c8008c6	Merge branch 'master' into 21089	2016-11-03 09:18:25 +13:00
samcake	96bdeebc37	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-11-02 12:30:45 -07:00
samcake	3c777bb079	Clenaing up the detection phase to get all the iformation from DXGI	2016-11-02 12:29:51 -07:00
David Rowe	8ccf645d1c	Make script event bridge available to OverlayWindow	2016-11-02 21:41:06 +13:00
Brad Hefta-Gaub	56b3ac8c89	Merge pull request #8972 from sethalves/fix-for-2159 ... lock around audio-client quit flag to avoid shutdown race	2016-11-02 00:14:33 -07:00
samcake	49f1590e01	Start detecting all the gpus	2016-11-01 16:51:57 -07:00
Anthony Thibault	a9c88f2383	Merge pull request #8957 from AndrewMeadows/dont-mirror-eyes ... fix broken eyes in mirrored animations	2016-11-01 15:28:48 -07:00
Ryan Huffman	16d91833e8	Add optional url query to InfoView	2016-11-01 13:43:32 -07:00
Ryan Huffman	e4341d7a02	Add vive and xbox controller checking to PluginUtils	2016-11-01 13:42:37 -07:00
Ryan Huffman	ba0dbeac80	Add InputManager::getSubdeviceNames	2016-11-01 13:36:20 -07:00
Seth Alves	137730dc50	coding standard	2016-11-01 11:59:28 -07:00
Seth Alves	ae17135a07	lock around quit flag to avoid shutdown race	2016-11-01 11:14:16 -07:00
samcake	861944ba71	Try uing DXGI on windows instead of com	2016-11-01 11:12:47 -07:00
Anthony J. Thibault	09511111cf	Load plugins in alphabetical order.	2016-11-01 10:23:54 -07:00
samcake	a23bbd1e4e	Trying to extend the memory counter	2016-10-31 16:40:15 -07:00
David Rowe	3ca2c19075	Delete temporary directory after content has been used	2016-11-01 12:31:35 +13:00