1179 commits

Author	SHA1	Message	Date
Wayne Chen	1ce7d8a31c	dev feedback	2018-12-13 13:47:07 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Wayne Chen	4e6f162e01	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 10:12:46 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Wayne Chen	09bc886c20	Merge branch 'master' into loginInitiative2	2018-11-30 13:05:17 -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
Wayne Chen	d55c9467e7	fixing keyboard offset	2018-11-20 10:37:30 -08:00
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