253 commits

Author	SHA1	Message	Date
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Brad Davis	fb995bebf1	Prevent crash on switching to 3D display twice	2017-05-04 12:04:21 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
Dante Ruiz	50ed4a61f7	Merge branch 'master' of github.com:highfidelity/hifi into tablet-crash	2017-04-21 18:26:37 +01:00
Dante Ruiz	8cfa03fa56	tablet cpp ownership	2017-04-21 18:26:26 +01:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
Zach Fox	50456f71ed	Merge pull request #10142 from Triplelexx/21258 ... 21258 - Don't render (or heavily use GPU) when window in minimized	2017-04-19 16:26:49 -07:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Triplelexx	27a404d0ea	remove extra lines	2017-04-07 07:09:18 +01:00
Triplelexx	279997d905	change display plugin to deactivate when window minimized	2017-04-07 06:49:28 +01:00
Vladyslav Stelmakhovskyi	aa487faad1	Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings	2017-04-04 16:59:09 +02:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
Andrew Meadows	f6d6c62fab	move variable closer to context where it is used	2017-03-27 14:40:31 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Brad Davis	e265a0a1f8	Fix possible crash in Menu::removeSeparator	2017-03-16 13:12:30 -07:00
Dante Ruiz	4bc050e583	added tablet notification	2017-03-15 19:26:50 +01:00
Dante Ruiz	4a5be4238e	messages and file dialogs in tablet	2017-02-24 00:19:32 +00:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
Anthony J. Thibault	ed11edad56	EventBridge support	2017-02-15 13:59:04 -08:00
Anthony J. Thibault	912e8aa04a	Tablet buttons now work in toolbar. ... Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.	2017-02-14 15:37:24 -08:00
Seth Alves	c317ba8054	merge from upstream	2017-01-25 15:57:53 -08:00
Anthony J. Thibault	432bb27119	The tablet Help button should be active if window is visible	2017-01-23 18:37:08 -08:00
Dante Ruiz	30b57b62da	toggle help	2017-01-19 08:12:49 -08:00
Atlante45	ff3f175fb7	Fix typos	2017-01-17 15:39:54 -08:00
Dante Ruiz	2fc76d64fd	clean up unused code and files	2017-01-10 09:13:46 -08:00
Dante Ruiz	6705846518	clean up round 1	2017-01-10 09:13:46 -08:00
Dante Ruiz	6c51edec77	added context menu to tablet	2017-01-10 09:13:45 -08:00
Brad Hefta-Gaub	c65471e880	Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam ... Conflicts: libraries/script-engine/src/FileScriptingInterface.cpp	2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub	dbbed462b4	cleanup naked qDebug() calls	2016-12-19 22:24:25 -08:00
David Rowe	9b270834dd	Merge branch 'master' into 21089	2016-11-16 08:51:48 +13:00
David Rowe	1eeec2a3a1	Fix up script injection methods	2016-11-15 10:24:38 +13:00
David Rowe	e7d9f98ca4	Get script injection working in new marketplaces window	2016-11-15 09:23:51 +13:00
howard-stearns	4d18a3cc3d	expose menu enablement to javascript	2016-11-10 15:01:06 -08:00
David Rowe	5eff7c9e15	Merge branch 'master' into 21089	2016-11-10 14:42:21 +13:00
Dante Ruiz	4b087a2718	fixed unable to remove menus from vrmenu context	2016-11-08 12:03:53 -08:00
Dante Ruiz	7f355c48b1	saving work progress	2016-11-08 12:03:53 -08:00
David Rowe	d33ac21aaa	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
Clément Brisset	00a94bdd6d	Merge pull request #8974 from huffman/feat/help-select-xbox-tab ... Update help window to auto select xbox or vive controller tab on availability of device	2016-11-03 14:42:23 -07:00
howard-stearns	3a072b5bf9	tell desktop about preference changes	2016-11-03 12:17:28 -07:00
David Rowe	8ccf645d1c	Make script event bridge available to OverlayWindow	2016-11-02 21:41:06 +13:00
Ryan Huffman	16d91833e8	Add optional url query to InfoView	2016-11-01 13:43:32 -07:00
Ryan Huffman	5b58e8ae97	Fix ConnectionHandler not handling connected-but-need-auth condition	2016-10-24 10:44:33 -07:00
Stephen Birarda	18523558f7	move HFWebEngineProfile back to interface/networking	2016-10-18 20:04:11 -07:00
Stephen Birarda	9f2627d31d	Merge pull request #8828 from birarda/web-engine-interceptor ... move HF access token to authorization header	2016-10-18 17:24:58 -07:00
Stephen Birarda	f8e0d7ad88	move QWebEngine classes to ui library	2016-10-18 12:53:32 -07:00
Stephen Birarda	b4b5c648c2	use a QWebEngineProfile request interceptor for auth in HTTP header	2016-10-17 11:34:37 -07:00