1220 commits

Author	SHA1	Message	Date
Wayne Chen	1419ec907b	adding wip	2018-11-19 13:57:55 -08:00
Wayne Chen	b8d8710604	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-19 09:02:16 -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
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
Wayne Chen	c85b840db0	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
Wayne Chen	7375840eda	adding 3d keyboard/get anchor id wip for reposition	2018-11-13 17:09:47 -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	41d8220cbd	Merge pull request #14362 from ctrlaltdavid/M19768 ... Add option to enable/disable the mini tablet	2018-11-13 11:59:24 -08:00
NissimHadar	ef34ff622a	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-13 11:11:53 -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
Howard Stearns	545b85bc9d	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-13 09:55:54 -08:00
NissimHadar	fc832bff58	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-13 08:27:23 -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
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -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
David Rowe	5c97954e66	Merge branch 'master' into M19404 ... # Conflicts: # scripts/system/interstitialPage.js	2018-11-09 13:35:11 +13:00
Wayne Chen	f66326fc4d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-08 15:51:24 -08:00
Wayne Chen	e266532888	Merge branch 'master' into loginInitiative2	2018-11-08 11:17:24 -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
Zach Fox	cee1454f6e	CR feedback - thanks Ken!	2018-11-07 15:09:53 -08:00
Wayne Chen	8e075c2a7c	fixing login qml/using HMD position for overlay	2018-11-07 14:05:06 -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
Howard Stearns	05becb870f	remove urls from logs in Interface	2018-11-06 13:47:07 -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	58dd690c0a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
NissimHadar	91fb592d3f	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-06 10:19:52 -05:00
NissimHadar	c0e7a4348b	Reverted changes to Interface.	2018-11-05 22:10:20 -05:00
Zach Fox	d0854ca2ab	Use AccountManager instead of settings	2018-11-02 16:42:18 -07:00
Zach Fox	402c23e359	Use useragent instead of queryparam to determine limitedCommerce	2018-11-02 16:07:29 -07:00
NissimHadar	51272d8fec	Added setGeometry script command.	2018-11-02 13:09:07 -07:00
NissimHadar	70c0addc3f	Removed setWindowSize - crashes on both Windows and Mac. ... Fixed typo.	2018-11-02 10:47:17 -07:00
NissimHadar	c7353e6c59	Added setWindowSize - FOR TESTING ON MAC	2018-11-02 09:57:58 -07:00
NissimHadar	470a490494	Typo.	2018-11-01 17:31:10 -07:00
NissimHadar	d851720cb0	Added method to detect OS type. Needed for testing.	2018-11-01 16:57:28 -07:00
Zach Fox	20cd1df22c	Lotsa changes	2018-11-01 16:48:08 -07:00
Zach Fox	b6344acc1d	Big checkpoint. be aware - things may be broken	2018-10-30 15:08:13 -07:00
David Rowe	e2ae50362e	Add missing JSDoc of Window.interstitialModeEnabled property	2018-10-26 19:21:58 +13:00
Howard Stearns	c85dbb8233	limitedCommerce switch	2018-10-25 11:25:56 -07:00
Zach Fox	d1556ae4e8	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-23 15:51:34 -07:00
Zach Fox	947391e49e	Fix build errors	2018-10-23 12:45:16 -07:00
Zach Fox	1d8994993c	Whitelist TTS scripting interface to TTS app, which is now a default script	2018-10-22 17:05:31 -07:00
Zach Fox	1023e6d2b9	Fix ClipboardScriptingInterface:	2018-10-22 14:00:04 -07:00
Zach Fox	d44f9e2ccc	Tons of improvements	2018-10-22 13:59:57 -07:00
Zach Fox	493262052c	Remove extraneous code changes; remove QUrlAncestry code; remove extra logging	2018-10-22 13:59:52 -07:00
Zach Fox	7be5d5674d	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-22 13:59:35 -07:00
Zach Fox	1eca1bfd55	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-22 11:18:10 -07:00
Brad Hefta-Gaub	1ff69844f2	Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75 ... hide progress overlays if interstitial mode	2018-10-19 16:35:42 -07:00
Zach Fox	2f37a2b1a1	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-18 11:12:26 -07:00
Zach Fox	2a9e0041b2	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-18 10:16:07 -07:00
Kerry Ivan Kurian	3b15548ea3	Display resource-access events in marketplace item tester ... Includes refactoring marketplace item tester into a single-page app.	2018-10-18 01:04:47 -07:00
Wayne Chen	fd3c0d2f76	pushing with new fix	2018-10-17 15:03:09 -07:00
Zach Fox	26e388b139	Some experimentation yields promising results...	2018-10-16 17:34:48 -07:00
SamGondelman	ded8d4b547	variant conversions	2018-10-16 11:55:28 -07:00
Zach Fox	53226e7924	Prevent overflows; still not working	2018-10-12 11:19:52 -07:00
Zach Fox	daeedc6ef1	Lots of progress today	2018-10-11 17:10:14 -07:00
Zach Fox	5d4de3d3b0	I love it.	2018-10-10 17:36:38 -07:00
Zach Fox	d8c9712dd2	It's working!	2018-10-10 16:19:11 -07:00
Zach Fox	f1446532d0	Almost working	2018-10-10 16:13:23 -07:00
Zach Fox	7de784ce27	First steps (definitely not working)	2018-10-10 12:32:55 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
Dante Ruiz	36c2cceb57	fix for failing to enter domain	2018-10-05 15:39:51 -07:00
Wayne Chen	0a7102b4d3	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
Sam Gondelman	4e96c3297b	Merge branch 'master' into scriptvec3	2018-10-03 17:14:15 -07:00
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
John Conklin II	9cbd819a39	Merge pull request #13965 from ctrlaltdavid/M17428-f ... Mini tablet in palm	2018-10-01 16:56:36 -07:00
John Conklin II	dd5cd5de82	Merge pull request #14091 from gcalero/fix-case-18465 ... Fix case 18465: redirect to domain after login	2018-10-01 16:48:27 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
David Rowe	45993ba475	Provide mini tablet details via API instead of messages	2018-09-28 14:23:08 +12:00
Wayne Chen	813defebfc	Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged	2018-09-26 16:45:22 -07:00
Gabriel Calero	3163ae5997	Fix case 18465: redirect to domain after login	2018-09-26 19:41:43 -03:00
Wayne Chen	db41a1c16b	error state signal for 404/interstitial	2018-09-26 13:48:15 -07:00
Dante Ruiz	fa5dfb6e28	Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial	2018-09-26 09:18:12 -07:00
Dante Ruiz	57ae8ff8a1	update interstitial page stability count and loading bar	2018-09-24 16:09:53 -07:00
Wayne Chen	69d5299362	patching fix for previous commits	2018-09-24 15:22:46 -07:00
David Rowe	e29b403abc	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js	2018-09-24 11:44:28 +12:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00
Wayne Chen	20cab87a17	Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged	2018-09-11 18:53:06 -07:00
Wayne Chen	30e9d57026	adding pattern for during timeout to put into error state	2018-09-11 18:52:28 -07:00
Wayne Chen	a7321f950a	pushing requested changes - adding timeout refusal	2018-09-11 18:32:17 -07:00
Wayne Chen	84f95dd4b8	updating typo	2018-09-11 17:03:06 -07:00
Wayne Chen	d4dfaec8ea	updating typo	2018-09-11 17:02:38 -07:00
Wayne Chen	d478fcf027	remove unused signal from domain handler	2018-09-11 17:01:14 -07:00
Wayne Chen	0f25756908	expose domain connection error to Window	2018-09-11 16:29:39 -07:00
SamGondelman	589e88af4a	Merge remote-tracking branch 'upstream/master' into scriptvec3	2018-09-04 17:54:45 -07:00
SamGondelman	9b75c7e07f	trying to separate colors and vectors	2018-09-04 17:20:05 -07:00
David Rowe	c41d74621e	Merge branch 'master' into M17217-b ... # Conflicts: # interface/src/raypick/PathPointer.cpp	2018-08-31 14:26:24 +12:00
Dante Ruiz	03ede9371e	cleaning code	2018-08-30 14:26:39 -07:00
Dante Ruiz	8c77820e30	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-30 09:45:41 -07:00
danteruiz	e2cd695dfb	PR code clean up	2018-08-27 11:01:29 -07:00
luiscuenca	ddbadf5a69	change to Test API	2018-08-24 11:59:46 -07:00