579 commits

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	119c662899	fixed null file path in file dialog call	2017-11-09 11:46:19 -08:00
Brad Davis	1a58aee385	Fix scripting URL injection, I hope	2017-11-08 12:00:29 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
luiscuenca	c834cf1cf3	Comments and corrections	2017-11-01 21:55:31 -07:00
SamGondelman	657a0fb036	Merge remote-tracking branch 'upstream/pointers' into ui	2017-10-31 17:41:14 -07:00
SamGondelman	64665c87b2	replace ids with unsigned ints	2017-10-31 17:07:48 -07:00
SamGondelman	3c779f1528	HUD events WIP, fix entity/overlay hover, no hover for empty renderState	2017-10-31 14:42:31 -07:00
luiscuenca	8d5c95b1d6	Various corrections	2017-10-30 16:47:59 -07:00
luiscuenca	f32282afdd	Clean update bug 8027	2017-10-27 11:03:02 -07:00
Zach Fox	002141724b	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Dante Ruiz	92f765fe52	property set echomode for keyboard for wallet and webviews	2017-10-24 13:53:50 -07:00
Zach Fox	c64c2e17c8	First pass at consolidation	2017-10-24 12:01:05 -07:00
Dante Ruiz	0242e8e4ba	fixed crash and login password	2017-10-23 16:33:49 -07:00
vladest	fa349a694c	Code style fixes	2017-10-20 15:12:09 +02:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
beholder	e8589d53dd	updated code based on code review	2017-10-18 03:45:50 +03:00
Andrew Meadows	25818fc5e9	Merge pull request #11613 from jherico/feature/qml_whitelist ... Support for custom functionality for specific QML URLs	2017-10-17 17:34:22 -07:00
Bradley Austin Davis	f53a74b515	Support for custom functionality for specific QML URLs	2017-10-17 11:53:30 -07:00
beholder	fa7892e5c6	8217 Search in tablet doesn't update	2017-10-17 02:02:21 +03:00
beholder	f83040c572	updating code accordingly to the comments	2017-10-14 12:29:06 +03:00
beholder	c31aa6bcdb	8213 Keyboard Input Field: Reveals Passwords	2017-10-12 22:08:46 +03:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 ... Commerce: One step closer!	2017-10-03 11:56:00 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Zach Fox	b5dc6b791b	Fix commerce setting handle	2017-09-28 10:42:45 -07:00
Andrew Meadows	dafadf82bb	Merge pull request #11458 from jherico/fix/tablet_latency ... Fix long tablet lag on first load	2017-09-26 16:18:31 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -07:00
vladest	074362b228	Remove logging	2017-09-25 23:10:26 +02:00
vladest	1a2d38e31f	Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds	2017-09-25 17:11:44 +02:00
vladest	5a452fa981	Merge branch 'master' into tablet_extended_sounds	2017-09-25 15:40:40 +02:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
Brad Davis	549cb77902	Fix dimensions of rendered web entities	2017-09-21 20:59:01 -07:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Andrew Meadows	6b3b3a7448	Merge pull request #11382 from ElderOrb/case6618 ... 6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-21 08:54:11 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
vladest	50ee41e095	Fix file loading dialogs	2017-09-19 22:42:15 +02:00
beholder	8b39c56aa1	rename 'target' to 'targetOverride' to indicate that parameter overrides default target	2017-09-18 20:40:22 +03:00
vladest	e26118254f	Implemented Audio injector in Tablet scripting interface. Added missed sound events	2017-09-18 19:40:06 +02:00
vladest	bb214d7bf3	Merge branch 'master' into tablet_extended_sounds	2017-09-17 16:16:03 +02:00
vladest	1cde504c74	Memleak fix. Cleanup	2017-09-16 22:57:26 +02:00
vladest	5585265349	Merge branch 'master' into modal_dialogs_async	2017-09-16 22:06:49 +02:00
vladest	3ceeb0d83e	Rework all c++ calls	2017-09-16 22:04:53 +02:00
beholder	871b169128	6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-16 16:17:36 +03:00
vladest	de4f34aacb	Add resizable flag. Use the flag for Create only	2017-09-15 21:49:38 +02:00
vladest	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
vladest	7c1827d672	use AduioEvent instead of string	2017-09-14 20:21:11 +02:00
vladest	61b283743e	Merge branch 'master' into tablet_extended_sounds	2017-09-14 19:52:35 +02:00
David Kelly	7550374f8f	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet	2017-09-13 04:49:13 -07:00
David Kelly	187ed71a8a	more cleanup, plus now keyfile associated with user directly	2017-09-12 10:55:27 -07:00
anshuman64	996277b34c	Merge pull request #11335 from vladest/menu_fix ... Make sure root item is created before lambda gets called for desktop …	2017-09-11 12:47:40 -07:00
vladest	34c1cb6579	Typos and naming fixes	2017-09-11 19:42:05 +02:00
Chris Collins	47a9337aa7	Merge pull request #11323 from jherico/mac_fixes ... Mac fixes	2017-09-11 09:10:50 -07:00
vladest	dfaa8761e5	Make sure root item is created before lambda gets called for desktop loader	2017-09-10 20:08:40 +02:00
vladest	832e4aa5eb	Introducong tablet audio events	2017-09-08 09:51:10 +02:00
Bradley Austin Davis	eb8b892571	Various Mac fixes	2017-09-07 14:45:35 -07:00
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00
beholder	c62f9007e9	7196 Mouse pointer no longer visible in HMD mode ... The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins. The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins	2017-09-03 15:20:59 +03:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
vladest	1b5e6fd5f8	Merge branch 'master' into modal_dialogs_async	2017-08-31 20:39:48 +02:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
Zach Fox	271fcbf8b4	Merge pull request #11271 from davidkelly/dk/securityImageIssue ... security image shows up in every qml engine now	2017-08-30 10:52:48 -07:00
David Kelly	72b15b4223	fix comment	2017-08-29 20:28:57 -07:00
druiz17	2a97257698	Merge pull request #11140 from ElderOrb/case6788 ... 6788: You can deselect your current view mode	2017-08-29 17:15:51 -07:00
David Kelly	a2b1cfc7ac	security image shows up in every qml engine now	2017-08-29 17:06:57 -07:00
beholder	a0a43ebf26	show checkbox or radiobutton dependently on exclusiveGroup presence	2017-08-29 23:23:16 +03:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
beholder	cbbe03cee7	6788: You can deselect your current view mode	2017-08-25 02:33:11 +03:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
howard-stearns	bd37679b65	working	2017-08-18 14:03:40 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
vladest	a87a93d991	Implemented input dialog async functions	2017-08-16 15:35:51 +02:00
vladest	757af1e2e5	Added Save, Directory and Assets async methods	2017-08-15 14:44:01 +02:00
vladest	ac7aa609f2	Open file async implemented	2017-08-14 16:23:53 +02:00
vladest	b604b1bbac	Async file dialogs #1	2017-08-13 11:02:29 +02:00
Elisa Lupin-Jimenez	6c2bf63392	Back button works	2017-08-10 17:51:19 -07:00
Elisa Lupin-Jimenez	da5bb03187	Trying to add in a back button	2017-08-10 16:34:37 -07:00
vladest	68e9d335cd	Added async information and critical dialogs	2017-08-10 10:46:06 +02:00
vladest	556569819d	1st stage of moving to async dialogs	2017-08-09 14:00:19 +02:00
Seth Alves	186035dc5d	adjust various things that cause a crash-on-exit on Linux	2017-08-06 11:57:55 -07:00
vladest	a439cc1837	Make connection to tablet shown signal more consistent, eliminates missed signals	2017-08-03 20:58:44 +02:00
vladest	b049b0f415	Merge conflicts	2017-08-03 19:43:42 +02:00
vladest	638eeede43	Merge conflict	2017-08-02 20:07:06 +02:00
Dante Ruiz	05f1caab01	better solution to help and blank tablet issues	2017-08-02 16:35:58 +01:00
vladest	2d4396ac8e	Merge branch 'master' into fix_toolbar_apps_switch	2017-08-02 16:34:49 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
Dante Ruiz	cca29e849b	fix issue of tablet begin blank when switching between HMD and Desktop mode	2017-08-01 23:18:42 +01:00
vladest	e30e0b1a5f	Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption	2017-07-31 16:45:21 +02:00
vladest	bb7110d81b	Desktop Running scripts window now closed and as soon as Tablet opened, it will show Running Script. TODO: make Tablet opens automatically	2017-07-30 19:22:54 +02:00
vladest	0333849aa8	Merge branch 'master' into fix_menu_landscape	2017-07-29 11:44:58 +02:00
Stephen Birarda	17dd028ec7	make Paths available to desktop and tablet QML context	2017-07-28 14:23:18 -07:00
Brad Davis	3d0c13915a	Fix tablet button crash	2017-07-28 11:20:57 -07:00
vladest	45934cb53e	Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode	2017-07-28 18:04:29 +02:00
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 ... WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
Dante Ruiz	fdfeab77eb	made requested changes	2017-07-19 16:28:16 +01:00
Dante Ruiz	06a69c8bd7	fixed another tablet stuck on help screen	2017-07-18 20:27:55 +01:00
Andrew Meadows	99aad77e53	Merge pull request #10954 from jherico/qml_crashes_again ... Still trying to address QML crashes	2017-07-17 10:21:23 -07:00
druiz17	3b112450f0	Merge pull request #10959 from druiz17/bug/wrong-tablet-state ... Fix tablet scripting interface setting its internal state to home when switching between toolbar and tablet mode	2017-07-14 14:31:04 -07:00
Dante Ruiz	e07b067d7b	fixed tablet getting in the wrong state	2017-07-12 21:09:54 +01:00
Brad Davis	0e9f8cc103	Still trying to address QML crashes	2017-07-12 11:04:33 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
Dante Ruiz	75e1b265d5	comment out code that causes a crash on launch from fresh install	2017-07-10 17:48:53 +01:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	9c37b28ba0	Remove tool window logic	2017-06-30 10:58:19 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Seth Alves	2f3109e4be	move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it	2017-06-28 11:00:05 -07:00
Brad Davis	08784ff30c	Fix toolbar button mouse click when they were added via the tablet scripting interface	2017-06-25 02:34:58 -07:00
humbletim	c10475186c	add support for switching cursor from arrow to reticle	2017-06-23 18:48:29 -04:00
Brad Davis	341646c780	Fix bad invocation, cleanup signatures	2017-06-23 09:58:27 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
NeetBhagat	ead0d42cf3	Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h	2017-06-07 15:47:19 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
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
Howard Stearns	baea0f5cb0	create a directory chooser that works in hmd, and use it	2016-10-16 17:27:51 -07:00
Howard Stearns	3a294e77d4	Merge pull request #8745 from huffman/feat/new-help-window ... Update the help window	2016-10-07 10:01:47 -07:00
David Rowe	1a745094e2	Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp libraries/gl/src/gl/OffscreenQmlSurface.h	2016-10-06 09:29:09 +13:00
David Kelly	621e3fc000	Expose triggerOption to scripts, plus _physicsEnabled ... Now any menu item can be triggered. Plus you can do a Window.isPhysicsEnabled to detect when we are done loading assets and such. Whee!	2016-09-30 09:06:17 -07:00
David Rowe	5e842843c6	Set alphabetic/numeric keyboard per field entered	2016-09-30 11:54:32 +13:00
David Rowe	2344d15dbc	Raise and lower keyboard for HTML fields in Marketplace window	2016-09-28 16:41:01 +13:00
Brad Davis	20deae3242	Working on Qt 5.6 compatibility	2016-09-06 17:35:04 -07:00
Brad Davis	617633b85c	Moving to custom context creation	2016-08-29 11:21:54 -07:00
Anthony J. Thibault	d015c5cfb5	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-22 14:13:17 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
Anthony J. Thibault	7de8cc6422	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-16 16:49:57 -07:00
Brad Davis	f819e98d94	Fix menu so that functions indirectly triggered by menu scanning don't inherit the menu group	2016-08-12 22:28:40 -07:00
Anthony J. Thibault	8dac45c99e	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-10 11:27:21 -07:00
Zander Otavka	43bbe790d6	Add atp support to qml	2016-08-08 15:12:17 -07:00
Anthony J. Thibault	713bee84c3	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-03 14:06:43 -07:00
Anthony J. Thibault	75b88b0794	WebEntities now support custom hifi url handling ... WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml. marketplace urls and hifi urls should work properly in web entities.	2016-08-03 10:20:15 -07:00
Seth Alves	cc7322a0de	Merge pull request #8334 from ctrlaltdavid/21015 ... refresh file dialog when directory content changes	2016-08-03 08:11:40 -07:00
Brad Hefta-Gaub	193f0bbb99	Merge pull request #8345 from ctrlaltdavid/web-window-signals ... add OverlayWebWindow resized, moved, and closed signals	2016-08-02 18:41:49 -07:00
Zander Otavka	38ba54e481	Fix confirm dialog	2016-08-02 16:04:54 -07:00
David Rowe	31ac7a2812	Add OverlayWebWindow resized, moved, and closed signals	2016-08-02 12:40:01 +12:00
David Rowe	800c2b9ec0	Refresh file dialog when directory content changes	2016-07-30 11:21:40 +12:00
Andrew Meadows	5ce681154d	Merge pull request #8301 from AlexanderOtavka/asset-browser-ui ... Asset browser ui	2016-07-26 15:04:10 -07:00
Brad Hefta-Gaub	43064807d1	Merge pull request #8292 from jherico/webui ... Fix some UI elements triggered by WebViews	2016-07-23 13:47:04 -07:00
Zander Otavka	530e17a7e5	Move JSON parsing for custom dialog to be sooner	2016-07-22 17:14:45 -07:00
Brad Davis	faba1a4b4e	Fix UI elements triggered by WebViews	2016-07-21 15:13:07 -07:00
Zander Otavka	acf4539f4f	Return a JSON string from QML instead of JS object ... Idk why QML can't return a JS object, but it can't. Strings work, so I use a string.	2016-07-19 13:21:08 -07:00
Zander Otavka	c27e1d6fdb	Polish dialog behavior and spacing	2016-07-15 17:35:55 -07:00
Zander Otavka	71f62c02fc	Add basic implementation of customPrompt ... Still missing the warning and diabling of dynamic checkbox when the static mesh is selected.	2016-07-15 17:35:55 -07:00
Brad Davis	882139ebcf	Allow scripts to override the navigation focus state set by QML dialogs	2016-07-14 12:10:46 -07:00
Ryan Huffman	575d693a3c	Change default InfoView window width from 720 to 1024	2016-07-09 04:22:48 -07:00
Brad Davis	1f451269cd	Allow scripts to receive a visibility changed signal from their windows	2016-06-30 13:22:01 -07:00
howard-stearns	6a1dd235c9	Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui	2016-06-24 12:49:54 -07:00
Brad Davis	a095da31fd	Fix initial visibility of QML windows from scripts	2016-06-24 11:48:55 -07:00
howard-stearns	f8391f0062	fix reticle bugs	2016-06-23 16:51:15 -07:00
Brad Davis	8c13ff4ee1	Pinned UI support	2016-06-02 17:24:25 -07:00
Brad Davis	1f2f9da019	fix keys getting stuck	2016-05-22 23:34:45 -07:00
Brad Hefta-Gaub	ac15097f47	Merge pull request #7834 from huffman/feat/user-agent-plugins ... Add system information to UserAgent in AccountManager requests	2016-05-19 11:53:14 -07:00
Zach Pomerantz	87b102ae0f	Fix -Wunused-result from invokeResult	2016-05-18 18:19:44 -07:00
Zach Pomerantz	2c9b0f7233	Rm failing VrMenu assertion	2016-05-18 17:31:47 -07:00
Ryan Huffman	dd093e3fcd	Make AccountManager a DependencyManager singleton	2016-05-18 15:38:54 -07:00
Brad Hefta-Gaub	de17834dd1	Merge pull request #7740 from ctrlaltdavid/20887 ... Don't display "Reveal Scripts Folder" control in HMD mode	2016-04-22 13:04:07 -07:00
David Rowe	a7b82e8cae	Decouple ui and shared libraries	2016-04-22 12:58:47 +12:00
Brad Hefta-Gaub	0f966e934e	Merge pull request #7728 from ctrlaltdavid/20887 ... Add link in Running Scripts that opens scripts folder	2016-04-21 16:01:52 -07:00
David Rowe	9c9bca546c	Add button that opens scripts directory window	2016-04-21 11:52:03 +12:00
howard-stearns	0544bcaacd	Simpler cross-platform solution, with comments.	2016-04-20 15:02:41 -07:00
David Rowe	8f6cfb72ea	Fix QML warnings at shutdown	2016-04-16 15:23:41 +12:00
Brad Davis	dfc1d896cd	Fix shutdown crash	2016-04-12 11:49:55 -07:00
Brad Davis	4b02e8437c	Fix menu items created by plugins	2016-04-12 11:15:06 -07:00
Brad Hefta-Gaub	3f05ded932	Merge pull request #7611 from zzmp/guard/amd ... Disable gradient QML items on AMD	2016-04-12 08:32:57 -07:00
Zach Pomerantz	ab72d8d8fb	Init QML GL from share context	2016-04-11 13:47:45 -07:00
Brad Davis	7827c0f6f6	Suppress key release events for presses that were absorbed by QML	2016-04-08 17:09:11 -07:00
Brad Hefta-Gaub	cef599eaed	Merge pull request #7586 from zzmp/log/failed-menu ... Log failed MenuUserData::forObject	2016-04-06 19:44:05 -07:00
Zach Pomerantz	91126037e0	Fix showDesktop SIGNAL	2016-04-05 14:59:54 -07:00
Zach Pomerantz	6bcfeccdd8	Log failed MenuUserData::forObject	2016-04-05 14:59:52 -07:00
Brad Davis	ca67c7335f	Fix passing of simple string message types from QML to scripts	2016-04-01 11:04:01 -07:00
Brad Davis	27406f5b21	Add texture stress test	2016-03-31 15:13:04 -07:00
Brad Davis	5343dfef24	PR feedback on 7480	2016-03-28 10:19:38 -07:00
Brad Davis	ae82298e1b	Working on the App JS <-> HTML JS communication	2016-03-28 10:09:22 -07:00
Brad Davis	a47614c9b6	Revert "Build a better event bridge" ... This reverts commit a43fde0803.	2016-03-25 09:48:25 -07:00
Brad Davis	a43fde0803	Build a better event bridge	2016-03-24 11:01:06 -07:00
Brad Davis	8bbabf186f	Fix async issues related to JS / QML object lifetimes	2016-03-24 09:38:54 -07:00
Brad Hefta-Gaub	8c290ea6b9	Merge pull request #7390 from Atlante45/feat/udp-flood-protection ... Server side bandwidth dial	2016-03-23 11:47:41 -07:00
Brad Davis	28f25489f8	Fix occasional crash on creating overlay tool windows	2016-03-21 19:17:31 -07:00
Atlante45	6d2498b4f2	Remove debug print	2016-03-21 14:50:18 -07:00
Brad Davis	798d2a73db	Merge pull request #7326 from ZappoMan/toggleOverlay ... Various Overlay, Menu, and Away Mode bug fixes	2016-03-13 11:44:19 -07:00
David Rowe	9da64e540d	Add shortcut keys to HMD menu	2016-03-12 12:53:16 +13:00
David Rowe	ecf67282d5	Add separators to HMD menus	2016-03-12 12:29:52 +13:00
Brad Hefta-Gaub	18f5b14e7a	make all toggle menu items work properly through Menu scripting interface	2016-03-11 11:45:29 -08:00
Brad Davis	6d090895b7	Don't crash on QML menu creation failure	2016-03-09 14:48:20 -08:00
Brad Davis	d428f3b96f	Working on crash bugs	2016-03-09 14:00:05 -08:00
Brad Davis	6e24b66b38	Fix edit.js upload button	2016-03-09 12:21:31 -08:00
Seth Alves	efdef52081	Merge pull request #7269 from ctrlaltdavid/20822 ... Restyle bookmark dialogs	2016-03-09 07:31:15 -08:00
David Rowe	10e4e5e3a7	Use OffscreenUI icon enum instead of QMessageBox icon enum	2016-03-09 11:33:55 +13:00
David Rowe	03fb6b1444	Add ability to have icons in query dialogs ... Add icon to bookmark dialogs' titles.	2016-03-09 10:45:14 +13:00