27446 commits

Author	SHA1	Message	Date
Dante Ruiz	20ad05726e	entity server timout	2018-11-15 10:52:40 -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	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
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
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
Jeff Clinton	ab8ba2daad	Merge pull request #14230 from amantley/shoulderSpaceFix ... Hand Azimuth improvement	2018-11-12 16:00:26 -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
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
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
Zach Fox	1ce6079c5a	Remove extra as	2018-11-09 11:26:18 -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
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
John Conklin II	ab9c494fef	Merge pull request #14367 from SamGondelman/tablet ... Case 17284: Fix tablet culling	2018-11-08 11:14:12 -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
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	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
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
Zach Fox	8776028259	Prepend "root" to "currentUpdatesPage"	2018-11-06 16:10:49 -08:00
Zach Fox	f22bbff505	Fix MS19743: Fix case where user couldn't update certain items	2018-11-06 15:47:47 -08:00
Clement	0ca0a6f3be	Fix JSDoc arrays	2018-11-06 12:57:17 -08:00
Zach Fox	378bf911d4	Fix another build error	2018-11-06 12:48:17 -08:00
Clement	4e802b0f3f	Add JSDoc comments	2018-11-06 11:59:15 -08:00
Zach Fox	c33f9b6ea3	Fix build error	2018-11-06 11:26:09 -08:00
Zach Fox	58dd690c0a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
Alexander Ivash	a3dfc873b7	rsolve rebase conflict	2018-11-06 14:21:14 +05:30
Alexander Ivash	4c6700b497	remove deprecations warnings	2018-11-06 14:21:14 +05:30
Alexander Ivash	9623753416	change imports (how could I miss this place?)	2018-11-06 14:21:14 +05:30
Alexander Ivash	fe4e4cfbd4	return controls-uit & styles-uit folders to preserve backward-compatibility	2018-11-06 14:21:14 +05:30
Alexander Ivash	f7d9bafc7d	add FilterBar & ScrollBar to qmldir	2018-11-06 14:21:14 +05:30
Alexander Ivash	82313f9464	update imports for utilities / all other qml files found	2018-11-06 14:21:14 +05:30
Alexander Ivash	c6764c6244	cherry-picking	2018-11-06 14:21:14 +05:30