82020 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Andrew Meadows	b231dadba5	add check for local-entity when changing phys properties	2019-11-14 09:59:43 -08:00
Andrew Meadows	28f51f6204	add comments	2019-11-14 09:59:43 -08:00
Andrew Meadows	de44cdaf25	remove unnecessary check in if clause	2019-11-14 09:59:43 -08:00
Andrew Meadows	0f2d9027e1	fix indentation	2019-11-14 09:59:43 -08:00
Andrew Meadows	039f7cae13	avoid Qt container in another spot	2019-11-14 09:59:43 -08:00
Andrew Meadows	3546bab19a	use std::vector<> instead of QVector<>	2019-11-14 09:59:43 -08:00
Andrew Meadows	fb090d1388	force delete OtherAvatar entities when necessary	2019-11-14 09:59:43 -08:00
Andrew Meadows	4159bc4862	abide by domain-entity hierarchy deletion rules	2019-11-14 09:59:43 -08:00
Andrew Meadows	4e6a647718	don't restrict edit properties of myAvatarEntity	2019-11-14 09:59:43 -08:00
Andrew Meadows	9d92546a8b	revert the revert of PR-16307	2019-11-14 09:59:43 -08:00
milad	82c85b51df	cleanup	2019-11-14 09:54:41 -08:00
Shannon Romano	ba60f5e96d	Merge pull request #16494 from hyperlogic/bug-fix/revert-safe-landing-fix ... Revert safe landing "fix"	2019-11-14 09:52:14 -08:00
milad	d664b9e118	removed icon log	2019-11-14 09:28:05 -08:00
DouglasWilcox	11e1c4e6fe	linear acceleration experiment	2019-11-14 09:23:16 -08:00
milad	90b58ebeba	icon for screenshare app	2019-11-14 09:13:31 -08:00
David Rowe	ef45a6092f	Polishing	2019-11-14 16:07:00 +13:00
David Rowe	c44c7dd85e	AudioStats JSDoc	2019-11-14 15:57:51 +13:00
Zach Fox	b4135e2655	We are so close...	2019-11-13 17:35:57 -08:00
Anthony Thibault	929e829801	Revert "Speculative fix for infinite loop in SafeLanding" ... This reverts commit 52acfc9333.	2019-11-13 17:17:37 -08:00
Anthony Thibault	487515d956	Revert "bug fix from code review comment" ... This reverts commit e81b21ac59.	2019-11-13 17:17:17 -08:00
Zach Fox	8255210c6a	Add new screenshare error signals	2019-11-13 15:43:41 -08:00
ingerjm0	ed9db81bed	Fix for displaying moved properties' documentation in docs	2019-11-13 14:58:32 -08:00
Shannon Romano	e1fc666b0f	Merge pull request #16479 from hyperlogic/bug-fix/safe-landing-deadlock ... Speculative fix for infinite loop in SafeLanding	2019-11-13 14:47:41 -08:00
Zach Fox	50a1ebaa4d	Call stopScreenshare when screenshare app closed	2019-11-13 14:24:01 -08:00
Anthony Thibault	a06905e6d0	Merge pull request #16488 from hyperlogic/bug-fix/android-t-pose ... Bugfix for t-pose avatar when moving	2019-11-13 14:07:36 -08:00