30404 commits

Author	SHA1	Message	Date
Antonina Savinova	2dcfea5f7c	Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak ... Fix minor avatar-mixer memory leaks	2018-12-05 10:29:29 -08:00
Brad Hefta-Gaub	77e1c98264	Merge pull request #14528 from sethalves/fix-delete-home ... work around menu-item name hash collision for Home	2018-12-04 15:04:25 -08:00
Adam Smith	763e6d1a95	Merge pull request #14444 from SamGondelman/actionData ... Case 19861: Fix: Shouldn't be able to write actionData from script	2018-12-04 11:25:00 -08:00
Adam Smith	864e9ca8ae	Merge pull request #14443 from SamGondelman/hud ... Case 19660: Fix HUD crash	2018-12-04 11:10:43 -08:00
Sam Gateau	d2ff4d4674	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-12-03 20:52:43 -08:00
Seth Alves	541d0ab4d6	work around menu-item name hash collision for Home	2018-12-03 17:33:04 -08:00
Clément Brisset	56ac34f9d1	Merge pull request #14506 from Atlante45/fix/misc-agent ... Fix various AC bugs	2018-12-03 14:18:12 -08:00
Clément Brisset	62f21822ce	Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash ... Fix Agent crash on shutdown	2018-12-03 14:17:35 -08:00
Jeff Clinton	0bca290de2	Merge pull request #14485 from sethalves/crash-on-exits ... suppress 'No instance available' messages during shutdown. try a dif…	2018-11-30 10:10:43 -08:00
Clement	c53c52c7a0	Fix various Agent bugs	2018-11-29 17:42:04 -08:00
Ken Cooke	88d935a28e	Fix the audio injector "pitch" property	2018-11-29 08:12:14 -08:00
Sam Gateau	9353745054	MErge with master	2018-11-28 21:40:24 -08:00
Clement	181f2b4263	Fix Agent crash on shutdown	2018-11-28 18:40:52 -08:00
Ken Cooke	11252a8f56	Fix UBSAN warning (left-shift of negative integer) when peak limiter is called with implausibly large (or NaN) audio values	2018-11-28 16:48:34 -08:00
Seth Alves	0de011dd71	Merge pull request #14478 from danteruiz/ScriptEngine-Crashes ... Fix script engine crashes when reloading scripts.	2018-11-28 12:04:52 -08:00
Shannon Romano	ff934a8f87	Merge pull request #14394 from sabrina-shanman/hfm_serializer ... (case 20005) Create HFMSerializer interface for model loaders	2018-11-28 11:10:27 -08:00
Seth Alves	fac27553d7	suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.	2018-11-27 17:02:48 -08:00
Seth Alves	8f21ade0c7	make cmake -DDISABLE_QML=1 work again	2018-11-27 12:41:40 -08:00
Sam Gateau	87730884ab	Merge pull request #14340 from Nex-Pro/patch-5 ... Change to English spelling of 'declination'	2018-11-27 10:53:28 -08:00
Dante Ruiz	c4a9ca3445	fix interface crashing when reloading scripts	2018-11-27 09:32:37 -08:00
Simon Walton	e10936ec34	Delete network query resources for failed queries	2018-11-26 18:26:25 -08:00
Sam Gateau	f9fb4b61c1	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-25 22:40:06 -08:00
sam gateau	48f32dc36b	Remove stuppid error	2018-11-21 13:35:36 -08:00
sam gateau	ad3d5f7efb	Merge branch 'one' of github.com:samcake/hifi into one	2018-11-21 13:32:54 -08:00
sam gateau	be03859ed6	Warnings from build	2018-11-21 13:31:54 -08:00
Sam Gateau	6b1c7bf96e	restoring the engine render views and cleaning up the task / config section of the pr	2018-11-20 23:15:09 -08:00
SamGondelman	c99a8101f7	trying to fix build errors	2018-11-21 01:56:46 -05:00
sam gateau	f3bbd412d1	Cleaning too many changes	2018-11-20 17:40:59 -08:00
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
SamGondelman	e8d45c46c1	shouldn't be able to write actionData	2018-11-19 23:31:20 -05:00
SamGondelman	58408497d1	hopefully fix hud crash	2018-11-19 21:27:23 -05:00
birarda	23857ea8c2	ensure packets are added to loss list after timeout	2018-11-19 17:40:55 -08:00
sam gateau	3412a4573b	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-19 17:40:15 -08:00
Jeff Clinton	30051f75da	Merge pull request #14434 from sethalves/fix-throw-from-worker ... catch QString exceptions that ModelCache can throw	2018-11-19 16:36:52 -08:00
Seth Alves	26a50e1820	don't log urls!	2018-11-19 15:38:12 -08:00
Seth Alves	cd177a4457	catch QString exceptions that ModelCache can throw	2018-11-19 15:25:14 -08:00
sam gateau	84cd2a8ef6	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-19 15:23:55 -08:00
Jeff Clinton	484de06cf4	Merge pull request #14422 from SimonWalton-HiFi/entities-json-less-strict ... Don't check for presence of particular keys in models json	2018-11-19 10:29:10 -08:00
Jeff Clinton	870619b19d	Merge pull request #14412 from amantley/avatarPipelineOffsets ... Avatar Pipeline Joint Rotation Offsets Handling	2018-11-19 08:54:29 -08:00
Sam Gateau	837b321004	merging with master	2018-11-17 10:35:05 -08:00
Seth Alves	b72f462028	Merge pull request #14406 from danteruiz/master-disable-interstitial ... disable interstitial for master	2018-11-16 20:13:50 -08:00
Sam Gateau	5f062bbcf5	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-16 20:05:08 -08:00
Simon Walton	3baebf55c5	Don't enforce key presence in models.json	2018-11-16 17:33:13 -08:00
Jason Najera	da3ea682ba	Merge pull request #14347 from r3tk0n/19550-oculus-store-v2 ... MS19550 - Don't show help for HMDs that aren't plugged in and active	2018-11-16 15:49:46 -08:00
sam gateau	9dd6c8d9d9	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-16 11:55:44 -08:00
Seth Alves	d19cdc62d7	Merge pull request #14135 from ElderOrb/FB18573 ... FB18573 - Other avatars' avatar entities may appear to be successfull…	2018-11-16 10:05:22 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
r3tk0n	34224c4f16	Fix XBox One controller detection.	2018-11-15 14:08:21 -08:00
John Conklin II	60c538309a	Merge pull request #14411 from SamGondelman/fading ... Fix for avatar flashing on fade out	2018-11-15 13:58:43 -08:00
John Conklin II	83660ab8e1	Merge pull request #14128 from Zvork/ao ... Improved Ambient Occlusion	2018-11-15 13:57:13 -08:00