22628 commits

Author	SHA1	Message	Date
Zach Fox	7dcf5da954	Merge pull request #14503 from zfox23/payOut1 ... Pay-Out API Frontend, Part One	2018-12-06 15:25:54 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Zach Fox	a2af50a9d0	Show pre-auth'd transactions in Recent Activity before redemption	2018-12-06 11:07:26 -08:00
Jeff Clinton	b9156d68e5	Merge pull request #14508 from amantley/restingHandsBug ... removed the code that turns off inactive hands in MyAvatar.cpp	2018-12-06 09:42:34 -08:00
Jeff Clinton	e8c1c4a27b	Merge pull request #14536 from danteruiz/fix-audio-switching ... Respect changed audio settings when switch displays (Master)	2018-12-06 09:13:47 -08:00
Zach Fox	235b27a198	Merge branch 'master' of github.com:highfidelity/hifi into payOut1	2018-12-05 16:35:07 -08:00
Zach Fox	02307d2308	Secret to Coupon ID	2018-12-05 16:34:53 -08:00
Dante Ruiz	3123bb37e4	fix audio switching issue	2018-12-05 10:34:47 -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
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	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	0d66d230c5	Merge branch 'master' of github.com:highfidelity/hifi into payOut1	2018-11-30 16:45:03 -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
amantley	88a9a96346	removed the code that turns off inactive hands in MyAvatar.cpp	2018-11-30 10:08:05 -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	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
Zach Fox	bc39dbba8b	Finish out the feature	2018-11-29 12:44:30 -08:00
Sam Gateau	54fa4365b8	FIxing build issue doh...	2018-11-28 22:21:58 -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
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
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
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
Dante Ruiz	29028386c8	Keyboard menu option in general settings	2018-11-27 11:56:07 -08:00
SamGondelman	e282d51883	CR	2018-11-26 01:15:07 -05:00
sam gateau	9ee35def3d	trying to fix the include issue	2018-11-21 15:42:35 -08:00
sam gateau	be03859ed6	Warnings from build	2018-11-21 13:31:54 -08:00
sam gateau	44b9b92450	Getting ready for merge	2018-11-20 17:32:04 -08:00
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
Dante Ruiz	db607e564f	fixing keyboard mallets dimensions	2018-11-20 09:13:07 -08:00
sam gateau	84cd2a8ef6	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-19 15:23:55 -08:00
David Rowe	7ffa70d0ac	Fix memory accumulating while Interface is minimized	2018-11-20 09:36:58 +13:00
John Conklin II	d63a850ec0	Merge pull request #14409 from danteruiz/keyboard-touchups ... keyboard address some feedback	2018-11-19 09:48:00 -08:00
Sam Gateau	837b321004	merging with master	2018-11-17 10:35:05 -08:00
Sam Gateau	5f062bbcf5	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-16 20:05:08 -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
Shannon Romano	6425a474ac	Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading ... Fixing case of interstitial not finishing loading	2018-11-16 14:53:01 -08:00
Dante Ruiz	a77121a588	keyboard touch ups	2018-11-16 14:20:17 -08:00
Shannon Romano	ba699e3e9b	Merge pull request #14273 from NissimHadar/MAC ... Case 19722 - Auto-Tester on Mac.	2018-11-16 12:49:58 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
Jamil Akram	35ec0b60ab	Merge pull request #14251 from humbletim/fb18302-deprecated-package-model ... FB18302 Remove deprecated Package Model functionality	2018-11-15 15:52:04 -08:00
r3tk0n	60832b071c	Fix logic for cases with rift headset but no touch controllers.	2018-11-15 14:08:38 -08:00
John Conklin II	8177d5bbcd	Merge pull request #14275 from Atlante45/fix/injector-crash ... Rework audio data memory ownership model to fix injector crashes	2018-11-15 13:25:42 -08:00
Dante Ruiz	20ad05726e	entity server timout	2018-11-15 10:52:40 -08:00