718 commits

Author	SHA1	Message	Date
Kasen IO	08ec9ef3b7	Various URL updates + window title update.	2020-02-05 15:25:51 -05:00
Marcus Llewellyn	e5dd23b922	Merge pull request #33 from kasenvr/feature/metaverse-url-switching ... Ability to change Metaverse API from setting	2020-01-14 18:40:04 -06:00
Dale Glass	dabda684b8	Don't bind action if QML menu can't be added. ... Otherwise eventually methods will be called on a NULL pointer. Fixes crash related to QMetaObject::invokeMethod.	2019-12-26 01:04:53 +01:00
Thijs Wenker	0ac8c178db	fix spacing	2019-12-20 12:43:43 +01:00
Kasen IO	c34cd996df	change Metaverse API from setting	2019-12-20 11:39:05 +01:00
Rebecca Stankus	3f19bbfcac	Changed variable to not be magic number	2019-11-01 11:46:01 -07:00
Rebecca Stankus	e5fcc577f0	Changed default interface window size on mac	2019-11-01 10:47:12 -07:00
David Rowe	116510225a	Typo	2019-10-24 09:10:26 +13:00
David Rowe	9d905dbec4	Merge branch 'master' into DOC-126	2019-10-24 09:05:41 +13:00
Zach Fox	341abb8185	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-14 12:36:35 -07:00
Zach Fox	a1b6b0af35	Merge pull request #16336 from ctrlaltdavid/DEV-1867 ... DEV-1867: Fix toolbarTest.js	2019-10-14 11:50:59 -07:00
David Rowe	d4c5a20c4f	Tablet JSDoc fixes	2019-10-12 11:42:49 +13:00
David Rowe	94f9e35704	Toolbars JSDoc	2019-10-12 11:41:53 +13:00
David Rowe	f944604120	Deprecate Toolbar API's addButton() and removeButton() methods	2019-10-12 10:10:27 +13:00
Zach Fox	19acd76854	Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup	2019-10-10 15:48:40 -07:00
Brad Davis	960cab9994	Qt 5.13 warnings & fixes	2019-10-08 15:40:13 -07:00
Shannon Romano	7aa28f29d2	Merge pull request #16224 from ctrlaltdavid/DOC-111 ... DOC-110, DOC-111, DOC-167: JSDoc fixes and tidying	2019-10-08 10:01:21 -07:00
Shannon Romano	e1de615cbe	Merge pull request #16261 from ctrlaltdavid/BUGZ-491 ... BUGZ-491: Fix tablet.loadWebScreenOnTop()	2019-10-08 09:05:33 -07:00
David Rowe	f224832d27	Merge branch 'master' into DOC-111	2019-10-08 20:44:13 +13:00
David Rowe	3b9884c76f	Fix build warning	2019-09-28 11:42:25 +12:00
David Rowe	3d667b4a21	Deprecate tablet.gotoWebScreen()'s loadOtherBase parameter	2019-09-28 11:30:57 +12:00
David Rowe	c79581e93f	Update JSDoc	2019-09-28 10:19:29 +12:00
David Rowe	bbf6d3f595	Remove unused code	2019-09-28 10:19:00 +12:00
David Rowe	2e2d3df26f	Fix loadWebScreenOnTop()	2019-09-28 09:38:19 +12:00
David Rowe	e9d138a961	Rename internal function to distinguish signatures and reflect function	2019-09-28 09:29:27 +12:00
David Rowe	57649811d7	Update JSDoc of TabletProxy internal functions	2019-09-27 09:17:48 +12:00
amer cerkic	9daf670678	Merge branch 'master' into dev469	2019-09-24 15:38:07 -07:00
dante ruiz	fe2a4c3600	fix fix-snap-html-issue	2019-09-19 18:20:08 -07:00
David Rowe	605d272392	Merge branch 'master' into DOC-111	2019-09-20 10:25:21 +12:00
David Rowe	d5e08d19e3	Fix JSDoc for miscellaneous white space issues	2019-09-20 08:17:24 +12:00
amerhifi	cc11bd9552	created new AudioWrapper	2019-09-13 11:24:41 -07:00
danteruiz	8491a37923	fixing WebEntities html	2019-09-13 09:57:51 -07:00
dante ruiz	b969a9b1e0	fix tablet html loading errors	2019-09-10 16:50:50 -07:00
Brad Davis	0511f87bad	BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U	2019-09-05 11:43:43 -07:00
Brad Davis	428a58710d	BUGZ-1365: Ensure that by default web views can't access local content	2019-08-29 13:44:49 -07:00
Brad Davis	36be00bf97	Fix android build again	2019-08-29 10:25:57 -07:00
Brad Davis	af22ab55bb	PR feedback	2019-08-29 08:46:46 -07:00
Brad Davis	5a6e2e5daf	Add caching to the restricted value	2019-08-28 10:13:32 -07:00
Brad Davis	954773124a	BUGZ-1363: crash when checking for web content restrictions	2019-08-28 09:56:45 -07:00
Zach Fox	083470e4fe	Ensure that geometryChanged is emitted after docked widget is resized	2019-08-19 16:48:40 -07:00
Brad Davis	06ad461c32	PR feedback	2019-08-01 16:57:54 -07:00
Brad Davis	abb71ba604	Don't request an OpenGL 2.0 context via the dock widget	2019-06-19 14:10:53 -07:00
Shannon Romano	d6859a42d9	Merge pull request #15762 from annabrewer/quest-login-keybrd ... BUGZ-531: Quest tablet login missing keyboard	2019-06-13 16:44:49 -07:00
Anna	7099b04911	appeasing jenkins	2019-06-13 12:21:41 -07:00
Preston Bezos	8dcf6e6a03	removed a dead line of code, made a couple formating changes	2019-06-12 15:47:19 -07:00
Preston Bezos	29d795af5b	hopefully good now	2019-06-12 15:36:20 -07:00
Anna	4b30065ad1	fixed keyboard on quest login and cleaned up qml files	2019-06-12 15:17:37 -07:00
Preston Bezos	34e9acc0b5	better fix for the toolbar remnant	2019-06-12 14:31:43 -07:00
Zach Fox	fade8f9c04	It works!	2019-06-12 12:47:48 -07:00
Zach Fox	51c2cc793a	Tinkering with toolbar visibility signal - not quite working	2019-06-12 10:26:32 -07:00