81993 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	3b4d8ba168	Merge pull request #16508 from zfox23/DEV-2789 ... Fix DEV-2789: Implement retry timer when retrieving screen share info	2019-11-18 16:19:05 -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
Shannon Romano	f112ca4890	Merge pull request #16495 from ctrlaltdavid/DOC-209 ... DOC-209: AudioStats JSDoc	2019-11-18 11:16:40 -08: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
Zach Fox	39dfbeb9f8	Merge pull request #16504 from MiladNazeri/screenshare-desktopsharing-fix ... added desktopSharing var	2019-11-18 10:52:49 -08:00
milad	59511d2f29	forgot to add the actual var!	2019-11-18 09:52:55 -08:00
milad	ea6bc17195	added desktopsharing var	2019-11-18 09:51:19 -08:00
DouglasWilcox	ddbb8d70ed	Speed up acceleration and blends slightly per Joshua, add kicks to turn anim.	2019-11-15 17:04:51 -08:00
Zach Fox	3b9a8b426f	Merge pull request #16502 from MiladNazeri/dev-2718/models-brought-in-at-incorrect-dimensions ... dev-2718/models-brought-in-at-incorrect-dimensions	2019-11-15 15:54:08 -08:00
Shannon Romano	8d0a022f32	Merge pull request #16500 from hyperlogic/bug-fix/whoops ... Fix for inadvertent comment	2019-11-15 15:36:51 -08:00
Zach Fox	b64ce343bd	Merge pull request #16429 from MiladNazeri/screenshareElectronApp ... Screenshare in Interface!	2019-11-15 15:32:51 -08:00
milad	2fc0f01928	added natural dimensions after loading	2019-11-15 15:16:09 -08:00
milad	87adae6c6f	cr	2019-11-15 12:48:32 -08:00
MiladNazeri	481e239a37	Update scripts/system/create/edit.js ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-11-15 12:43:25 -08:00
milad	4ae3c67493	added Entities.isLoaded	2019-11-15 11:45:05 -08:00
Anthony J. Thibault	217e17b4ac	Fix for inadvertant comment ... This was likely breaking the avatar override feature.	2019-11-15 11:19:10 -08:00
Shannon Romano	bcc058ba5f	Merge pull request #16497 from ctrlaltdavid/DEV-2769 ... DEV-2769: Remove the "acceleration" entity property from Create app	2019-11-15 09:26:33 -08:00
Shannon Romano	3c271aa27a	Merge pull request #16490 from ctrlaltdavid/DEV-2742 ... DEV-2742: Fix Graphics.exportModelToOBJ() JavaScript crash	2019-11-15 09:02:08 -08:00
Brad Hefta-Gaub	f88f5ddded	Merge pull request #16496 from highfidelity/fix-realtime-unfocused ... DEV-2760 - Fix Realtime Unfocused to be 60hz	2019-11-14 17:37:19 -08:00
DouglasWilcox	d9065affad	comment explaining seatedrot deceleration section, and transition-> turn works	2019-11-14 17:18:43 -08:00
milad	b8b7e20c1a	added clickToZoom header	2019-11-14 17:17:33 -08:00
Zach Fox	ee7c539d7e	Add Click to Zoom to the repo and bootstrapper	2019-11-14 17:05:47 -08:00
milad	620a332199	removed old files and added new line	2019-11-14 16:12:08 -08:00
milad	664f9e2cdd	newline add	2019-11-14 16:08:44 -08:00
DouglasWilcox	fb289704e2	iterate the turns, and make turning accessible from fidgets	2019-11-14 16:07:51 -08:00
milad	7e9f944d4b	newline add	2019-11-14 16:07:05 -08:00
milad	1035467c27	newline add	2019-11-14 16:06:28 -08:00
milad	8f0d971e3a	merge conflict resolution	2019-11-14 15:49:28 -08:00
milad	49d2e997bf	updated readme and made sure there is an exact application title match	2019-11-14 15:47:02 -08:00
Zach Fox	5229b0c0f3	Various cleanup and CR	2019-11-14 15:45:52 -08:00
Zach Fox	e21ee20ff8	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-14 15:18:07 -08:00
David Rowe	7fbc9f5c5c	emove the "acceleration" entity property from the Create app	2019-11-15 12:11:15 +13:00
milad	65089494a8	updated cmake	2019-11-14 15:09:23 -08:00
DouglasWilcox	37010648be	Abandon exponential acceleration and use constant acceleration. Hook up turn->sit transitions.	2019-11-14 13:12:01 -08:00
Maia Hansen	df7ad31de3	Merge pull request #16361 from AndrewMeadows/colossal-cave-redux ... DEV-1811 redux: apply entity deletion rules	2019-11-14 12:10:23 -08:00
milad	a4ad78c337	comment updates and extra includes removed	2019-11-14 11:28:37 -08:00
Brad Hefta-Gaub	56b1be4958	Fix Realtime Unfocused to be 60hz	2019-11-14 10:21:55 -08:00
Andrew Meadows	ec872bfcf8	remove unused variable	2019-11-14 09:59:43 -08:00
Andrew Meadows	7692e858a1	use EntityItemID rather than QUuid	2019-11-14 09:59:43 -08:00
Andrew Meadows	9dd0105ba5	only one copy of entityIDs instead of two	2019-11-14 09:59:43 -08:00
Andrew Meadows	dbeea4038d	remove unused argument	2019-11-14 09:59:43 -08:00
Andrew Meadows	b5ca93a019	remove redundant checks in 'if' clause	2019-11-14 09:59:43 -08:00