82122 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Shannon Romano	f01a39adf5	Merge pull request #16553 from MiladNazeri/macScreenshareFix ... Dev-2812: Broadcasting from MacOs won't work	2019-12-04 16:42:50 -08:00
milad	63e6875e27	added flag for windows and apple only on dependency	2019-12-04 11:28:32 -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	2d6f18fb99	removed interface from mac install directory	2019-12-04 09:49:17 -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
dante ruiz	aeab06de53	fixing screenshare cmake issue for mac	2019-12-03 14:03:52 -08:00
miladi	60d074932c	experimenting with mac .app cmake build	2019-12-03 11:01:06 -08:00
jennaingersoll	cc0c829ff7	Merge pull request #16539 from ctrlaltdavid/DOC-227 ... DOC-227: Stats JSDoc	2019-12-02 12:19:42 -08:00
milad	2da99625fa	trying to add to resources	2019-12-02 11:43:25 -08:00
Howard Stearns	11aa2e829f	Merge pull request #16540 from SimonWalton-HiFi/screenshare-zone ... DEV-2700: Add screenshare property to zones and evaluate in avatar mixer	2019-12-02 10:17:42 -08:00
Amer	710185b517	Merge pull request #16550 from amerhifi/initInput ... DEV-2729: Airpods starve on startup	2019-11-27 17:23:56 -08:00
Amer	2602e5ddc6	Merge pull request #16542 from amerhifi/localinjectorwait ... dev-829: waiting on local injector prep	2019-11-27 16:23:32 -08:00
David Rowe	3ebceff428	Doc review	2019-11-28 12:42:35 +13:00
amerhifi	e02725e418	input init to dummy to prevent starve and airpods thread lock	2019-11-27 15:30:47 -08:00
jennaingersoll	c9bdd54b1d	Merge pull request #16541 from ctrlaltdavid/DOC-233 ... DOC-233: MaterialCache JSDoc	2019-11-27 14:56:42 -08:00
Zach Fox	d0a3aeb7cf	Merge pull request #16549 from zfox23/autoMinimizeScreenshare ... DEV-2832, DEV-2816, DEV-2843: Auto-minimize Screen Share; enable switching between windows; prevent video dropout	2019-11-27 14:02:34 -05:00
Zach Fox	327508aa0d	Prevent video dropout with audioFallbackEnabled set to false	2019-11-27 13:56:55 -05:00
Zach Fox	5eae6711e6	Resolve DEV-2816 while I'm at it - allow users to switch between screens	2019-11-27 13:01:41 -05:00
Zach Fox	d4b50523c2	DEV-2832: Automatically minimize Screen Share app when sharing window is confirmed	2019-11-27 12:55:44 -05:00
Zach Fox	37efdfd3d4	Merge pull request #16547 from zfox23/smartboard_v1.4 ... DEV-2840: Fix z-fighting issues in Smartboard and enable quicker positional iteration in the future	2019-11-26 19:33:21 -05:00
Simon Walton	e3ae92ec84	Send notification whenever screen-share zone changes	2019-11-26 16:06:25 -08:00
Anthony Thibault	84c1fe2f39	Merge pull request #16545 from luiscuenca/addAutomaticLookToScripts ... Add automaticLookAt.js to developer scripts	2019-11-26 15:30:56 -08:00
amer cerkic	168e85b26a	addressing comment	2019-11-26 15:27:40 -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
Shannon Romano	7a0ef65278	Merge pull request #16544 from howard-stearns/ignore-anonymous-screenshare-zone-entry ... ignore anonymous screenshare zone entry GHA built so we're good on this.	2019-11-26 14:55:33 -08:00
Simon Walton	65fcf898be	Use null zone id for leaving a screen zone	2019-11-26 13:40:37 -08:00
Simon Walton	8b2fc968f6	Fix logic in zone-checking code, other clean-up	2019-11-26 13:32:50 -08:00
luiscuenca	f17caf48ca	Add automaticLookAt.js to the developer scripts	2019-11-26 13:42:01 -07:00
Zach Fox	52205d27d3	Merge pull request #16534 from zfox23/moreScreenshareBugs ... Fix a few Screenshare bugs (see description)	2019-11-26 15:38:12 -05:00
Shannon Romano	07da496fa7	Merge pull request #16532 from hyperlogic/feature/animedit ... Added animedit avatar-animation.json graph editor tool	2019-11-26 12:20:15 -08:00
Howard Stearns	323007eb2c	ignore anonymous screenshare zone entry	2019-11-26 12:11:38 -08:00
amer cerkic	0de812b7b5	waiting on local injector prep	2019-11-26 11:41:41 -08: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
Anthony J. Thibault	764b6a9adf	code review feedback	2019-11-26 10:52:21 -08:00
miladi	90605b5338	Merge branch 'master' of github.com:highfidelity/hifi into moreScreenshareBugs	2019-11-26 10:43:21 -08:00
David Rowe	c998148589	Revise recent changes to Entities.Material JSDoc	2019-11-26 17:43:41 +13:00
David Rowe	fafb3dd30b	MaterialCache JSDoc	2019-11-26 17:43:23 +13:00
David Rowe	5eb6e9dadd	Add recently added properties to caches' JSDoc	2019-11-26 17:00:13 +13:00
Simon Walton	6b371ec388	Changes to avatar mixer to use screenshare zones	2019-11-25 18:30:53 -08:00
David Rowe	46c389f064	Tidying	2019-11-26 15:19:54 +13:00
Anthony Thibault	0a12dc7446	Merge pull request #16531 from luiscuenca/fixWheelPitch ... DEV-2825: Fix camera pitch by mouse wheel	2019-11-25 17:03:05 -08:00
David Rowe	d797e33123	Stats JSDoc	2019-11-26 13:39:00 +13:00
Zach Fox	18f410c6db	Merge pull request #16537 from danteruiz/document-qt-launcher ... DEV-491: Create a README.md file to document the Qt Launcher	2019-11-25 18:28:12 -05:00
danteruiz	60140a3aca	fix more typos	2019-11-25 15:26:57 -08:00
danteruiz	e0c5edfccd	fix typos	2019-11-25 14:58:40 -08:00
danteruiz	c08a18c517	making requested changes	2019-11-25 14:52:53 -08:00
milad	8b6df032e4	forgot a slash	2019-11-25 14:40:38 -08:00