30591 commits

Author	SHA1	Message	Date
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
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	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
David Rowe	3ebceff428	Doc review	2019-11-28 12:42:35 +13: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
David Rowe	46c389f064	Tidying	2019-11-26 15:19:54 +13:00
David Rowe	d797e33123	Stats JSDoc	2019-11-26 13:39:00 +13: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 Fox	5787b2f737	Merge branch 'master' of github.com:highfidelity/hifi into moreScreenshareBugs	2019-11-25 13:16:17 -05:00
Shannon Romano	85cea1fcb6	Merge pull request #16533 from ctrlaltdavid/DEV-2800 ... DEV-2800: Fix crash in Stats.forceUpdateStats() at start-up	2019-11-25 09:04:30 -08:00
Anthony Thibault	edfad97b64	Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin ... Input plugin for streaming blendshapes from an iPhone	2019-11-23 11:49:51 -08:00
David Rowe	b458a746b7	Fix crash in Stats.forceUpdateStats() at start-up	2019-11-23 15:23:57 +13:00
Anthony J. Thibault	98c951702d	Added DEFAULT_GAZE_DISTANCE constant	2019-11-22 09:29:21 -08:00
Anthony J. Thibault	404d1a3c93	Fix several bugs for eye tracking from input plugins to function	2019-11-21 17:57:44 -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
DouglasWilcox	b8d7f50eaf	Put away animation into resource and update script to use local resource path.	2019-11-21 14:50:05 -08:00
Anthony J. Thibault	9d6ce44131	Head is now computed in proper sensor space ... Eye tracking now works.	2019-11-20 15:30:16 -08:00
Shannon Romano	37a46d91fa	Merge pull request #16513 from DouglasWilcox/Fix_seated_rotation_edge_case_bounce ... Edge case fix for seated rotation - it would bounce forward if you let go of Q/E at exact right time.	2019-11-20 09:27:36 -08:00
DouglasWilcox	19aacde3a2	Fix case where Avatar could get stuck facing camera if rotating camera quickly and avatar faced backward.	2019-11-19 14:32:51 -08:00
Brad Hefta-Gaub	3b9c997317	Merge pull request #16505 from luiscuenca/zoomAndOrbitCamUsingTouchPad ... Touchpad improvements: pinch to zoom camera, two finger swipe to look around, bug fixes	2019-11-19 13:30:45 -08:00
Anthony J. Thibault	befbdcef48	Upgraded OSC plugin with changes from ARKit blendshape work.	2019-11-19 13:13:56 -08:00
milad	8676eaf0a0	removed additional signal	2019-11-19 13:04:27 -08:00
DouglasWilcox	8ccdfaf220	Clamp rotation velocity if hit trigger angle, but only bounce forward if cameraYaw is true.	2019-11-19 12:05:25 -08:00
Brad Hefta-Gaub	63b21af562	Merge pull request #16506 from ctrlaltdavid/DEV-2764 ... DEV-2764, DEV-2113: Remove Avatar app links to AvatarIsland and BodyMart	2019-11-19 12:05:10 -08:00
Brad Hefta-Gaub	69af66195c	Merge pull request #15334 from SaracenOne/screen_name_at_signup_push ... case 22189: Add display name field to the log in screen.	2019-11-19 12:02:31 -08:00
jennaingersoll	451ffcd1e0	Merge pull request #16492 from jennaingersoll/jsdoc-revisions ... DOC-208: Revisions to JSDoc added by developers since July 2019	2019-11-19 11:01:18 -08:00
Zach Fox	f07f81e976	Merge pull request #16510 from MiladNazeri/dev-2791/update-hardcoded-screen-values ... dev-2791/update-hardcoded-screen-values	2019-11-19 10:46:36 -08:00
Brad Hefta-Gaub	0f428f0afb	Merge pull request #16498 from DouglasWilcox/improve_seated_rotation ... Improve seated rotation	2019-11-19 10:22:08 -08:00
milad	0d713fcc8d	new values for position and dimensions	2019-11-19 10:12:17 -08:00
ingerjm0	d2118f0aac	DOC-208 revisions	2019-11-18 20:05:08 -08:00
Sabrina Shanman	359248829c	Merge pull request #16197 from highfidelity/instancing ... (DEV-430) Instancing: Introduce hfm::Shape to enable Instancing support	2019-11-18 16:40:10 -08:00
Zach Fox	73590d2570	Fix DEV-2789: Implement retry timer when retrieving screen share info	2019-11-18 15:13:51 -08:00
Sabrina Shanman	518d6a530a	Merge pull request #16507 from highfidelity/master ... Merge master into instancing	2019-11-18 13:54:33 -08:00
David Rowe	60d2845953	Remove further related dead code	2019-11-19 10:31:54 +13:00
David Rowe	748999b8d6	Remove reference to BodyMart in Avatar app	2019-11-19 09:59:59 +13:00
David Rowe	a912e97f1e	Remove reference to AvatarIsland in Avatar app	2019-11-19 09:53:58 +13:00
Sam Gateau	048626ba9a	Merge pull request #15278 from kitely/clear-more-disk-caches ... case 21983: Clear more disk caches	2019-11-18 11:11:26 -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