74093 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Anthony Thibault	7f2e427584	Added DropAfterDelay strategy to Vive Tracker Calibration Dialog ... This is a hybrid of None and Drop strategies. Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.	2018-12-03 18:56:45 -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
Zach Fox	2776839dff	Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval ... Fix MS20117: Prevent HTML link from appearing in Wallet notification	2018-12-03 10:27:32 -08:00
Shannon Romano	3c43f44119	Merge pull request #14462 from huffman/fix/key-light-angle ... Swap key light directions in Create	2018-11-30 19:28:53 -08:00
Shannon Romano	0d2b0903d8	Merge pull request #14469 from huffman/fix/draggable-input-tabbable ... Fix draggable inputs not being tabbable	2018-11-30 19:28:11 -08:00
Shannon Romano	5afff69b78	Merge pull request #14505 from huffman/fix/create-empty-rgb-field ... Fix empty rgb field in Create going black	2018-11-30 18:19:44 -08:00
Clément Brisset	0dac8580ee	Merge pull request #14492 from Atlante45/fix/audio-mixer-crash-master ... Fix audio mixer crash	2018-11-30 17:03:36 -08:00
Zach Fox	051b7cfbb8	Fix MS20117: Prevent HTML link from appearing in Wallet notification	2018-11-30 16:12:21 -08:00
Shannon Romano	f3c0118602	Merge pull request #14454 from NissimHadar/19991-MacAppData ... case 19991 - implement AppData for Mac	2018-11-30 11:38:21 -08:00
Shannon Romano	1f29423a58	Merge pull request #14423 from vladest/qml_warning_fix ... Fix QML achoring warnings on Layouts	2018-11-30 10:50:30 -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
Shannon Romano	0bf5be57f8	Merge pull request #14488 from danteruiz/limit-avatar-entity-data ... don't save joint information for avatar entities in avatarbookmarks.json	2018-11-30 09:49:01 -08:00
Shannon Romano	41ce976869	Merge pull request #14481 from danteruiz/master-mallets ... fixing keyboard mallets dimensions (Master)	2018-11-30 09:46:32 -08:00
Shannon Romano	dacf43d70c	Merge pull request #14483 from danteruiz/keyboard-toggle-option ... Keyboard menu option in general settings	2018-11-30 09:43:10 -08:00
Shannon Romano	1b24d051f7	Merge pull request #14432 from ctrlaltdavid/M17988 ... Fix memory accumulating while Interface is minimized	2018-11-30 09:39:14 -08:00
Shannon Romano	08bbe27522	Merge pull request #14489 from ctrlaltdavid/M17990-a ... Remove unused avatar attachment constant	2018-11-30 09:37:40 -08:00
Jeff Clinton	04f09d70e3	Merge pull request #14464 from ctrlaltdavid/M17406 ... Fix fax grab to near grab transition and haptic pulses	2018-11-30 09:18:51 -08:00
NissimHadar	8973b7caea	Merge branch 'master' into 19991-MacAppData	2018-11-29 17:45:58 -08:00
NissimHadar	87c863584d	Just to remove conflict.	2018-11-29 17:43:19 -08:00
Clement	c53c52c7a0	Fix various Agent bugs	2018-11-29 17:42:04 -08:00
Sam Gateau	1dcddb9541	Merge pull request #14440 from NissimHadar/19942-MacInstall ... 19942 Mac installation procedure	2018-11-29 14:38:07 -08:00
Ryan Huffman	59b7cdf318	Fix empty rgb field in Create going black	2018-11-29 14:10:22 -08:00
David Rowe	dc05cdee5a	Merge branch 'master' into M17406 ... # Conflicts: # scripts/system/controllers/controllerModules/nearParentGrabEntity.js	2018-11-30 09:44:09 +13:00
Jeff Clinton	be0a1ed2f8	Merge pull request #14498 from kencooke/audio-options-pitch-bugfix ... Fix the audio injector "pitch" property	2018-11-29 10:07:07 -08:00
Seth Alves	87e4c17194	Merge pull request #14429 from danteruiz/disable-highlighting ... Remove entity highlighting	2018-11-29 09:04:56 -08:00
Ken Cooke	88d935a28e	Fix the audio injector "pitch" property	2018-11-29 08:12:14 -08:00
Clement	181f2b4263	Fix Agent crash on shutdown	2018-11-28 18:40:52 -08:00
Shannon Romano	f4535e6784	Merge pull request #14493 from kencooke/audio-asan-warnings2 ... Fix UBSAN warning	2018-11-28 18:09:36 -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
Clement	c29f6346d8	Clear mixing structures when we stop mixing for node	2018-11-28 16:09:04 -08:00
Jeff Clinton	f98f070c8b	Merge pull request #14445 from danteruiz/fix-stylus-dimensions ... fixing keyboard mallets dimensions	2018-11-28 14:19:53 -08:00
David Rowe	1683179fe5	Remove unused constant	2018-11-29 09:14:10 +13: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
Dante Ruiz	8be775c2b7	don't save joint information for avatar entities	2018-11-28 10:54:39 -08:00
Zach Fox	022fea107f	Merge pull request #14476 from zfox23/payIn1 ... Pay-In API Frontend, Part One	2018-11-28 10:32:01 -08:00
NissimHadar	59a030a16f	Correct message to user.	2018-11-27 17:41:00 -08:00
NissimHadar	4effd365ed	Change "Autotester" to "nitpick".	2018-11-27 17:34:17 -08:00
NissimHadar	57ba50fa96	Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData	2018-11-27 17:17:50 -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
Zach Fox	a4175b0428	Error handling in checkout	2018-11-27 14:17:28 -08:00
Jeff Clinton	fd87aad3c2	Merge pull request #14465 from sethalves/fix-up-disable-qml ... make cmake -DDISABLE_QML=1 work again	2018-11-27 14:16:25 -08:00
Seth Alves	8f21ade0c7	make cmake -DDISABLE_QML=1 work again	2018-11-27 12:41:40 -08:00
Shannon Romano	d6c7027fea	Merge pull request #14437 from sethalves/fix-asan-shared-lib-problem ... fix linux + clang build when memory debugging is enabled	2018-11-27 12:25:13 -08:00
Dante Ruiz	29028386c8	Keyboard menu option in general settings	2018-11-27 11:56:07 -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	9cc896c4a8	fixing keyboard mallets dimensions	2018-11-27 10:34:34 -08:00
Zach Fox	67dfccafec	Show item name when sending item	2018-11-27 10:19:14 -08:00
Dante Ruiz	c4a9ca3445	fix interface crashing when reloading scripts	2018-11-27 09:32:37 -08:00