1511 commits

Author	SHA1	Message	Date
David Rowe	31bae651c6	DialogsManager JSDoc	2019-12-08 15:51:08 +13:00
Zach Fox	2b7d66c710	Slight optimization; comments	2019-12-06 10:32:45 -08:00
Zach Fox	04fe2988f5	Working	2019-12-05 18:50:31 -08:00
Zach Fox	c96c684400	Initial path to fixing screenshare auth race condition	2019-12-05 15:47:43 -08:00
milad	f71cf1fb74	fixed type	2019-12-04 10:06:57 -08:00
milad	83285aa414	fixed mac resource path location	2019-12-04 09:56:54 -08:00
milad	f350701eac	fixed resouce path and removed unused include	2019-12-04 08:44:56 -08:00
milad	8b45710aea	Got the F out of there	2019-12-03 14:36:13 -08:00
milad	fee4c826cc	Merging Dantes fix	2019-12-03 14:19:33 -08:00
miladi	60d074932c	experimenting with mac .app cmake build	2019-12-03 11:01:06 -08:00
milad	2da99625fa	trying to add to resources	2019-12-02 11:43:25 -08:00
Zach Fox	8be866ebbb	DEV-2840: Fix z-fighting issues in Smartboard and enable quicker positional iteration in the future	2019-11-26 18:10:21 -05:00
Zach	7b49542a4d	Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode	2019-11-26 14:16:09 -05:00
milad	8b6df032e4	forgot a slash	2019-11-25 14:40:38 -08:00
milad	a38e0007f8	trying to go back several directories for the mac build	2019-11-25 13:32:48 -08:00
Zach	e7091245b3	Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode	2019-11-21 15:38:28 -08:00
milad	8676eaf0a0	removed additional signal	2019-11-19 13:04:27 -08:00
milad	0d713fcc8d	new values for position and dimensions	2019-11-19 10:12:17 -08:00
Zach Fox	73590d2570	Fix DEV-2789: Implement retry timer when retrieving screen share info	2019-11-18 15:13:51 -08:00
Sam Gateau	6370059a96	Merge pull request #16483 from AndrewMeadows/debug-workload-selection ... Add tools for debugging entity workload proxies	2019-11-18 11:02:00 -08:00
milad	1035467c27	newline add	2019-11-14 16:06:28 -08:00
Zach Fox	5229b0c0f3	Various cleanup and CR	2019-11-14 15:45:52 -08:00
milad	65089494a8	updated cmake	2019-11-14 15:09:23 -08:00
milad	a4ad78c337	comment updates and extra includes removed	2019-11-14 11:28:37 -08:00
Zach Fox	b4135e2655	We are so close...	2019-11-13 17:35:57 -08:00
Zach Fox	8255210c6a	Add new screenshare error signals	2019-11-13 15:43:41 -08:00
Zach Fox	50a1ebaa4d	Call stopScreenshare when screenshare app closed	2019-11-13 14:24:01 -08:00
Zach Fox	61f0896e30	Fix small bugs with the HTTP request to screenshare endpoint	2019-11-13 12:35:01 -08:00
Zach Fox	b0c578aa7f	Improved HTTP request to proper endpoint - won't work until PR16459 is merged	2019-11-12 17:06:35 -08:00
milad	ea8e285793	Zach's ss cpp cleanup changes	2019-11-12 16:02:52 -08:00
milad	49f972714c	more cleanup	2019-11-12 13:12:10 -08:00
milad	0f605ffc43	clean up code	2019-11-12 11:37:07 -08:00
Andrew Meadows	cf08a4162a	add workload job to help debug entity proxies	2019-11-12 10:35:16 -08:00
milad	7cce153b6d	working flow. Needs clean up and final ui tweaks	2019-11-11 20:13:23 -08:00
milad	c7b8d97639	updated api to try and communicate over EB, but still not working	2019-11-11 09:56:46 -08:00
milad	b206c102e8	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-08 12:19:06 -08:00
Nex-Pro	fea65133b4	Update WindowScriptingInterface.h ... replace "model" with "modal"	2019-11-08 12:51:00 +00:00
Zach Fox	c8464786e7	Steps closer...	2019-11-06 17:16:21 -08:00
Zach Fox	a41ae3daa9	Move the local web entity logic to c++ - might not be working	2019-11-06 15:45:48 -08:00
Zach Fox	40814f9086	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-06 14:46:14 -08:00
milad	894b4127b4	modifying screenshare API for viewer	2019-11-06 14:35:20 -08:00
amer cerkic	b10f2a86c2	removed extra spaces	2019-11-04 15:44:15 -08:00
amer cerkic	81881acafc	fixing a few spacing issues	2019-11-04 15:08:06 -08:00
amer cerkic	b2ab33116f	removing double calls to switch devices, handling default changes from scripting interface instead	2019-11-04 15:03:53 -08:00
Zach Fox	e1b02fb73a	The same message as the last commit, except do the work this time	2019-11-01 13:23:25 -07:00
Zach Fox	9273db4844	Fix an issue that prevented new screenshare scripts from running properly	2019-11-01 13:03:16 -07:00
milad	f2e49cb553	Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp	2019-11-01 10:52:46 -07:00
milad	1b3367fcf9	logging ids	2019-11-01 10:51:23 -07:00
MiladNazeri	676e7bd5b8	Merge branch 'master' into screenshareElectronApp	2019-10-31 13:11:56 -07:00
Zach Fox	68819addd5	Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards	2019-10-31 11:29:46 -07:00