27590 commits

Author	SHA1	Message	Date
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
Thijs Wenker	afd69d04dd	Make ctrl+shift shortcuts work for create app	2018-11-14 01:05:37 +01:00
sabrina-shanman	e08bc7296f	Merge branch 'master' into hfm_serializer	2018-11-13 15:41:49 -08:00
r3tk0n	dd8bbeb0e5	Clean up code and remove comments.	2018-11-13 15:36:25 -08:00
r3tk0n	ecee319602	Get logic working correctly.	2018-11-13 15:20:46 -08:00
John Conklin II	79e67ad45f	Merge pull request #14238 from ElderOrb/FB19400 ... FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …	2018-11-13 15:07:21 -08:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
Jeff Clinton	2afc8c505d	Merge pull request #14344 from ElderOrb/FB19348 ... FB19348 - Interface doesn't save changes to avatar animation text field	2018-11-13 14:29:25 -08:00
Jamil Akram	822e4bfe48	Merge pull request #14386 from ctrlaltdavid/M19820 ... Fix entities not loading when Interface doesn't have focus	2018-11-13 13:45:42 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub	4cab805392	Merge pull request #12718 from gcalero/tester_flag ... Detect if Interface is running on an android testing device	2018-11-13 13:13:52 -08:00
Brad Hefta-Gaub	153b8920be	Merge pull request #14348 from sabrina-shanman/hfm_library ... (case 19302) Create the HFM library and namespace	2018-11-13 12:03:53 -08:00
Brad Hefta-Gaub	b5e432bcb1	Merge pull request #14265 from amantley/needToSquat ... Bug fix for Users unable to Squat	2018-11-13 12:01:06 -08:00
Brad Hefta-Gaub	41d8220cbd	Merge pull request #14362 from ctrlaltdavid/M19768 ... Add option to enable/disable the mini tablet	2018-11-13 11:59:24 -08:00
Brad Hefta-Gaub	47cd6b332c	Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode ... Bug fix for head trackers in desktop mode	2018-11-13 11:49:24 -08:00
NissimHadar	ef34ff622a	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-13 11:11:53 -08:00
Dante Ruiz	1a95ee2b31	making requested changes	2018-11-13 11:11:18 -08:00
Dante Ruiz	10d045b11b	fix infinate loading if entity server is not running	2018-11-13 11:07:26 -08:00
Brad Hefta-Gaub	4bafcd2cfa	Merge pull request #14271 from SamGondelman/oculus ... Case 19475: Fix various Oculus Store test failures	2018-11-13 11:06:39 -08:00
Brad Hefta-Gaub	63e52ba8bd	Merge pull request #14284 from ctrlaltdavid/M19404 ... Fix interstitial page not displaying at Interface start-up	2018-11-13 10:38:38 -08:00
NissimHadar	2011e7b94c	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-13 10:12:52 -08:00
Howard Stearns	545b85bc9d	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-13 09:55:54 -08:00
Seth Alves	1611525220	Merge pull request #14028 from ElderOrb/FB12459 ... Improve keyboard raising logic for web views	2018-11-13 09:41:04 -08:00
Seth Alves	e5114c9b43	Merge pull request #14283 from ctrlaltdavid/M14836 ... Make tablet page indicators clickable to scroll tablet	2018-11-13 09:38:43 -08:00
Seth Alves	4ac719a87f	Merge pull request #14298 from ctrlaltdavid/M17640 ... Fix Goto app cards staying highlighted if move off dialog while dragging	2018-11-13 09:32:24 -08:00
Seth Alves	969776e476	Merge pull request #14312 from ctrlaltdavid/M18577 ... Add option to start up at home location	2018-11-13 09:29:37 -08:00
NissimHadar	fc832bff58	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-13 08:27:23 -08:00
Alexander Ivash	b16efb2afb	set minimum shoulder width to 25 cm (based on discussion with Tony)	2018-11-13 19:06:10 +05:30
Alexander Ivash	3a62184afd	specify min/max/stepsize	2018-11-13 19:06:09 +05:30
Alexander Ivash	95c51c2ffa	unfocus spinboxes on finishing editing	2018-11-13 19:05:20 +05:30
Alexander Ivash	37bb3586ea	show spinbox suffix in separate control to: disallow editing it & allow to pass validator	2018-11-13 19:05:16 +05:30
Alexander Ivash	a9ff1f4ecd	add onscreen keyboard into 'Calibration' tab of Settings=>Controls dialog	2018-11-13 19:03:50 +05:30
David Rowe	e12833da23	Fix entities not loading when Interface doesn't have focus ... Reverts https://github.com/highfidelity/hifi/pull/14286	2018-11-13 14:50:02 +13:00
Howard Stearns	7da440a886	Merge pull request #14385 from howard-stearns/inventory-icons-again ... new inventory icons, and align message waiting light in items tab	2018-11-12 17:05:06 -08:00
Sam Gondelman	f68706e72f	Merge pull request #14252 from gcalero/enable_aec_by_default ... Enabled AEC by default (bug 19210)	2018-11-12 16:15:33 -08:00
sabrina-shanman	5b6e2aae5a	Remove/move some unused serializer imports	2018-11-12 16:12:21 -08:00
sabrina-shanman	f971294d6d	Make HFMSerializer return a smart pointer to an HFMModel	2018-11-12 16:12:21 -08:00
sabrina-shanman	00f2b4eeb9	Make the existing model serializers based on HFMSerializer	2018-11-12 16:12:20 -08:00
sabrina-shanman	83cc90ace0	Re-name GLTFReader to GLTFSerializer and do the same for other model readers	2018-11-12 16:12:20 -08:00
Jeff Clinton	ab8ba2daad	Merge pull request #14230 from amantley/shoulderSpaceFix ... Hand Azimuth improvement	2018-11-12 16:00:26 -08:00
amantley	f2f4a55c19	removed cruft	2018-11-12 15:07:14 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
Howard Stearns	3431bdbb0e	new inventory icons, and align message waiting light in items tab	2018-11-12 14:51:32 -08:00
John Conklin II	ec4f2f781d	Merge pull request #14352 from Atlante45/feat/solo-source ... [master] Add audio soloing feature	2018-11-12 14:07:30 -08:00
NissimHadar	07515eab68	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-12 14:00:46 -08:00
r3tk0n	597f83e6d5	HoMerge branch 'master' of https://github.com/highfidelity/hifi into 19550-oculus-store-v2	2018-11-12 13:58:37 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Jamil Akram	6511b60aa4	Merge pull request #14264 from ctrlaltdavid/M19085 ... Fix AvatarManager.getPalData() returning data for just a single avatar	2018-11-12 12:27:58 -08:00
John Conklin II	cd3dc04dc5	Merge pull request #14159 from alexiamandeville/WoodyUpdate ... Updating Woody avatar for new UV seams	2018-11-12 12:12:49 -08:00
John Conklin II	9d404a6cf3	Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo ... case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)	2018-11-12 10:45:52 -08:00
John Conklin II	33da88f174	Merge pull request #14351 from luiscuenca/tweakTransitAnimations ... Tweak transit animations	2018-11-12 10:39:56 -08:00
Brad Hefta-Gaub	22dd958582	Merge pull request #14297 from jherico/feature/vcpkg ... Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms	2018-11-12 09:52:02 -08:00
NissimHadar	ae28de119f	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-12 08:27:17 -08:00
Seth Alves	500b2b7adf	Merge pull request #14381 from zfox23/MS19803_retry ... Actually fix MS19803: Replace missing imports	2018-11-09 16:38:26 -08:00
Jeff Clinton	12b833d121	Merge pull request #14167 from ElderOrb/FB18859 ... Make material entities to be presented in avatarapp	2018-11-09 15:32:27 -08:00
Zach Fox	8d325d8dd9	Actually fix MS19803: Replace missing imports	2018-11-09 15:02:57 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
Zach Fox	1ce6079c5a	Remove extra as	2018-11-09 11:26:18 -08:00
NissimHadar	8d4d0beebd	Cleanup	2018-11-08 17:52:07 -08:00
NissimHadar	dddb08b7fb	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-08 17:50:14 -08:00
David Rowe	de61f0f010	Add missing JSDoc noticed in passing	2018-11-09 14:00:47 +13:00
David Rowe	c9b3fda724	Merge branch 'master' into M19768 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-11-09 13:56:44 +13:00
r3tk0n	d2a1b35f96	Fix desktop case showing Vive controls.	2018-11-08 16:50:11 -08:00
David Rowe	5c97954e66	Merge branch 'master' into M19404 ... # Conflicts: # scripts/system/interstitialPage.js	2018-11-09 13:35:11 +13:00
John Conklin II	3fabe557c2	Merge pull request #13948 from danteruiz/3d-keyboard ... 3D Keyboard.	2018-11-08 13:35:13 -08:00
r3tk0n	84209c0e53	Finally fix all indentation.	2018-11-08 13:18:25 -08:00
Jason Najera	59bba5b6e6	More attempt to fix indentation. ... Still looked fine in github's editor and N++.	2018-11-08 13:16:24 -08:00
Jason Najera	b4be7544b9	Attempt to fix spacing ... Weird thing is it still looked fine in GitHub's editor...	2018-11-08 13:15:19 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
Jeff Clinton	ea8dc8ae68	Merge pull request #14334 from danteruiz/interstitial-bug-fixes ... Interstitial bug fixes	2018-11-08 11:43:38 -08:00
r3tk0n	a6494bf379	Fix edge case with Oculus.	2018-11-08 11:25:55 -08:00
r3tk0n	1bd978e4c3	Clean up code in tabletHelp.html	2018-11-08 11:22:43 -08:00
John Conklin II	ab9c494fef	Merge pull request #14367 from SamGondelman/tablet ... Case 17284: Fix tablet culling	2018-11-08 11:14:12 -08:00
r3tk0n	05939f8a7c	Fix settings to only show relevant HMD controls.	2018-11-08 11:09:19 -08:00
Jamil Akram	7c22a1954c	Merge pull request #14237 from NissimHadar/addNoLogin ... case 18450: Do not show login dialog if requested not to on the command line.	2018-11-08 10:43:21 -08:00
Zach Fox	811b01816b	CR round 3	2018-11-08 10:41:31 -08:00
Zach Fox	142dfab9ac	CR round 1	2018-11-08 10:05:57 -08:00
Dante Ruiz	358aa547b1	feedback changes	2018-11-08 09:58:53 -08:00
Dante Ruiz	f664421fe0	addressing code review feedback	2018-11-08 09:58:53 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
David Rowe	e5fe2622ae	Merge branch 'master' into M19768	2018-11-08 17:13:02 +13:00
NissimHadar	f0dd07294e	Added the no-login option.	2018-11-07 15:10:01 -08:00
Zach Fox	cee1454f6e	CR feedback - thanks Ken!	2018-11-07 15:09:53 -08:00
SamGondelman	d316fe15ce	fix tablet culling	2018-11-07 15:02:32 -08:00
Zach Fox	48d3450c5a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-07 14:59:23 -08:00
Zach Fox	3cbaec818d	Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug ... Fix MS19743: Fix case where user couldn't update certain items	2018-11-07 14:57:35 -08:00
NissimHadar	e00c9333c6	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-07 14:54:18 -08:00
Jeff Clinton	e507e91bfd	Merge pull request #14227 from ElderOrb/FB19396 ... FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…	2018-11-07 13:36:41 -08:00
NissimHadar	189a799a3a	Added method to detect OS type. Needed for running automated tests.	2018-11-07 08:58:38 -08:00
David Rowe	28097933ed	Add setting to enable/disable the mini tablet	2018-11-07 14:39:06 +13:00
SamGondelman	887c4f108f	high detail not low	2018-11-06 16:34:16 -08:00
Zach Fox	8776028259	Prepend "root" to "currentUpdatesPage"	2018-11-06 16:10:49 -08:00
SamGondelman	e20aeb28eb	force low detail on oculus first run	2018-11-06 15:58:35 -08:00
Zach Fox	f22bbff505	Fix MS19743: Fix case where user couldn't update certain items	2018-11-06 15:47:47 -08:00
Zach Fox	e80468e423	Remove URL logging from JS and QML	2018-11-06 15:09:24 -08:00