27611 commits

Author	SHA1	Message	Date
Sam Gateau	9353745054	MErge with master	2018-11-28 21:40:24 -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
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
Zach Fox	022fea107f	Merge pull request #14476 from zfox23/payIn1 ... Pay-In API Frontend, Part One	2018-11-28 10:32:01 -08:00
Zach Fox	a4175b0428	Error handling in checkout	2018-11-27 14:17:28 -08:00
Seth Alves	8f21ade0c7	make cmake -DDISABLE_QML=1 work again	2018-11-27 12:41:40 -08:00
Zach Fox	67dfccafec	Show item name when sending item	2018-11-27 10:19:14 -08:00
Zach Fox	a9fd443f28	'improve' UI slightly	2018-11-26 16:03:07 -08:00
Zach Fox	31f7d747c8	Bugfixes; enable purchase asset from marketplace screen raise	2018-11-26 15:48:49 -08:00
Zach Fox	8df5db4239	Allow scripts to open SendAsset screen with pre-filled info	2018-11-26 13:26:17 -08: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
Ryan Huffman	c87748830f	Merge pull request #14430 from thoys/fix/create/propertiesAutoScrollOnNewEntity ... MS19903: don't trigger virtual keyboard scroll on non input focus.	2018-11-19 13:52:22 -08:00
Thijs Wenker	84e8e21d85	don't trigger virtual keyboard scroll on non input focus.	2018-11-19 21:08:21 +01:00
John Conklin II	6b25179aa9	Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue ... Dismiss keyboard when backout of the login screen	2018-11-19 09:58:54 -08: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
Dante Ruiz	4388763c34	fixing keyboard not being dismissing when backout of the login screen	2018-11-16 16:04:40 -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	9dd6c8d9d9	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-16 11:55:44 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
Howard Stearns	8e1785bd90	security settings post-oculus-store wording	2018-11-15 15:59:52 -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
John Conklin II	1ea2ab338e	Merge pull request #13975 from ElderOrb/FB16697 ... Fix multiple issues on 'Calibration' tab of 'Controls' dialog	2018-11-15 14:54:26 -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
NissimHadar	e6190eb429	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-15 10:45:05 -08:00
Jeff Clinton	c72dd3d690	Merge pull request #14395 from ctrlaltdavid/M19859 ... Fix Goto app clicks not working	2018-11-15 09:56:56 -08:00
Jamil Akram	60b58977cd	Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease ... FB17479 - Fix scripted key release events for handshakes.	2018-11-15 09:21:32 -08:00
humbletim	d0e4c62978	fix merge conflict	2018-11-14 23:50:02 -05:00
humbletim	21030fbe5b	Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model	2018-11-14 23:40:04 -05:00
NissimHadar	a74e123229	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-14 20:20:41 -08:00
Atlante45	31033ad685	Update TTS audio API use	2018-11-14 15:42:39 -08:00
Clement	7f910a38e3	Update keyboard injector to new interface	2018-11-14 14:46:08 -08:00
Clement	7192aed131	Rework audio data memory ownership model	2018-11-14 14:45:18 -08:00
John Conklin II	b08283d9e9	Merge pull request #14401 from sethalves/rc76-revert-pr-14238 ... revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.	2018-11-14 14:38:34 -08:00
David Rowe	9c5d318341	Fix highlighting	2018-11-15 10:15:30 +13:00
Seth Alves	1593c1185a	revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.	2018-11-14 12:29:09 -08:00
David Rowe	010f7121a3	Fix Goto app clicks not working ... Includes better card highlighting fix.	2018-11-14 15:27:18 +13:00
Thijs Wenker	0248323bee	fix test path	2018-11-14 01:05:38 +01:00
Thijs Wenker	cc207537a3	Fix for unintended snapshots while parenting/un-parenting	2018-11-14 01:05:38 +01:00