34142 commits

Author	SHA1	Message	Date
HifiExperiments	59c67e5590	put back stepping in translucent case	2019-12-12 23:01:57 -05:00
HifiExperiments	3fe395ca32	properly implement alphaModes	2019-12-12 23:01:57 -05:00
HifiExperiments	b66fa1d57a	put back stepping in translucent case	2019-12-12 22:58:36 -05:00
HifiExperiments	d54ca43554	properly implement alphaModes	2019-12-12 22:58:36 -05:00
HifiExperiments	6e961b9f2f	procedural vertex shaders ... Signed-off-by: Kasen IO <kasenvr@gmail.com>	2019-12-12 22:49:48 -05:00
David Rowe	3232f89a33	OverlayWindow and OverlayWebWindow JSDoc	2019-12-13 10:13:10 +13:00
HifiExperiments	5fc55d1763	Merge branch 'master' into cullFace	2019-12-11 00:49:58 -08:00
HifiExperiments	2eb0ec18fc	fix non-procedural material entity crash	2019-12-11 00:42:59 -08:00
David Rowe	65bba26dfb	EntityScriptServerLog API	2019-12-11 19:22:28 +13:00
Marcus Llewellyn	af4c0ea0d1	Removes the environment variable requirement for procedural material shaders. ... Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>	2019-12-10 16:52:19 -06:00
David Rowe	bbd16d7544	Fix global print function's JSDoc	2019-12-11 07:42:58 +13:00
David Rowe	5caa21e5d9	Update Script JSDoc accordingly	2019-12-11 07:42:40 +13:00
David Rowe	7d2e818ab1	console JSDoc	2019-12-11 07:41:37 +13:00
jennaingersoll	6312a7cdd8	Merge pull request #16563 from ctrlaltdavid/DOC-198 ... DOC-198: OffscreenFlags JSDoc	2019-12-09 16:01:49 -08:00
jennaingersoll	6f44373141	Merge pull request #16556 from ctrlaltdavid/DOC-235 ... DOC-235: DriveKeys JSDoc	2019-12-09 15:58:31 -08:00
David Rowe	deb60f66d0	Update API status	2019-12-10 09:20:12 +13:00
David Rowe	b7af7fe1ab	OffscreenFlags JSDoc	2019-12-10 09:14:59 +13:00
David Rowe	204215c573	Typo	2019-12-10 07:49:37 +13:00
David Rowe	3a48a97a90	AddressManager JSDoc	2019-12-10 07:34:17 +13:00
Kasen IO	3e6660b633	Updated whitelist debugs for clarity in dev log	2019-12-09 08:30:02 -05:00
Kasen IO	2de388ab3b	Fixes bug where empty "" whitespace allows all scripts.	2019-12-09 01:20:04 -05:00
Kasen IO	fe66dc82f3	scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly.	2019-12-08 23:11:21 -05:00
Kasen IO	f49e64b99f	Cleaned out extra commented code.	2019-12-08 21:12:20 -05:00
Kasen IO	2e36c40912	added QML + C++ system for whitelists	2019-12-07 21:37:23 -05:00
David Rowe	4d4e9d32de	Update JSDoc	2019-12-08 12:38:48 +13:00
David Rowe	064e97aa4c	Fix misc. JSDoc typo	2019-12-06 21:27:50 +13: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
HifiExperiments	400b771a1a	fix shadows!!	2019-12-05 01:41:56 -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
Kasen IO	edfce861a8	Merge branch 'kasen/core' into v0860-kasen-release+freshstart	2019-12-01 22:56:19 -05:00
Kasen IO	07d706d681	Removed all hardcoded whitelist rules	2019-12-01 22:55:51 -05:00
Kasen IO	0b46c53df1	Merge branch 'kasen/core' into v0860-kasen-release+freshstart	2019-12-01 19:59:59 -05:00
David Rowe	c7f82a8264	Add new MyAvatar.getAvatarEntityData() implementation for API	2019-11-28 17:10:19 +13:00
David Rowe	9144e78cb9	Rename current getAvatarEntityData() method and use internally	2019-11-28 16:30:26 +13:00
Amer	710185b517	Merge pull request #16550 from amerhifi/initInput ... DEV-2729: Airpods starve on startup	2019-11-27 17:23:56 -08:00
David Rowe	845d388cbf	Fix AvatarEntityMap string values to be primitives, not objects	2019-11-28 13:56:33 +13: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
amerhifi	e02725e418	input init to dummy to prevent starve and airpods thread lock	2019-11-27 15:30:47 -08:00
HifiExperiments	413bf10f79	stupid, shadows still broken	2019-11-26 22:28:06 -08:00
HifiExperiments	3dfd63d46b	merge with master	2019-11-26 20:42:44 -08:00
amer cerkic	168e85b26a	addressing comment	2019-11-26 15:27:40 -08:00
HifiExperiments	69714a89ca	material entities support cullFaceMode and support gltf doubleSided	2019-11-26 14:48:48 -08:00
amer cerkic	0de812b7b5	waiting on local injector prep	2019-11-26 11:41:41 -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
HifiExperiments	b4c9a3e73d	Merge remote-tracking branch 'origin/alphaModes' into cullFace	2019-11-25 14:23:50 -08:00
luiscuenca	d301378210	Merge branch 'master' into fixWheelPitch	2019-11-25 14:48:13 -07:00
Simon Walton	6e23924ed9	Add screenshare zone-property - WIP	2019-11-25 13:22:35 -08:00
luiscuenca	69a063a700	Better mouse wheel detection and attenuated touchpad X axis	2019-11-25 10:19:54 -07:00
HifiExperiments	f55c4b8b12	put back stepping in translucent case	2019-11-24 12:44:42 -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
luiscuenca	2f887228cf	Fix camera pitch by mouse pitch	2019-11-22 14:51:37 -07:00
Seth Alves	ea2c6b4dfb	fix linux build	2019-11-22 11:35:23 -08:00
Shannon Romano	d76dfbe83b	Merge pull request #16525 from amerhifi/master ... DEV-2871: signal connection check before emit of devices changed	2019-11-22 08:22:24 -08:00
HifiExperiments	5371fd613a	properly implement alphaModes	2019-11-22 00:41:32 -08:00
Bradley Austin Davis	cf09e9f45e	Merge pull request #16526 from sabrina-shanman/crash_updateMeshPart ... Call updateGeometry before Model::createRenderItemSet	2019-11-21 20:13:58 -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
sabrina-shanman	79d470c70e	Call updateGeometry before Model::createRenderItemSet to ensure well-defined state	2019-11-21 16:12:49 -08:00
amer cerkic	87afa636a2	typo	2019-11-21 15:52:56 -08:00
amer cerkic	4f009d884f	signal connection check before emit of devices changed	2019-11-21 15:46:11 -08:00
Howard Stearns	854d84912e	Merge pull request #16511 from howard-stearns/fix-lookupurl-helper-regex ... fix handleUrl helper regex	2019-11-21 11:38:47 -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
Maki	96a09a894a	Fixed type conversions for environmental domain ports	2019-11-20 09:13:08 +00: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
Maia Hansen	6169936c2b	Merge pull request #16512 from AndrewMeadows/time-moves-forward ... DEV-2585: fix for whiteboard poly lines getting their parentID incorrectly reverted	2019-11-19 12:34:53 -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
Maia Hansen	48cdbcf933	Merge pull request #16401 from jherico/github_actions ... DEV-2773: GitHub actions initial work	2019-11-19 11:46:52 -08:00
luiscuenca	45aca5115d	Add missing comment	2019-11-19 12:20:54 -07: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
Howard Stearns	2cc39a2f32	fix handleUrl helper regex	2019-11-19 10:51:20 -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
Andrew Meadows	0bccc38906	remove one call to usecTimestampNow()	2019-11-19 08:52:14 -08:00
Andrew Meadows	3b8275c240	_lastEdited can only increase or be reset	2019-11-19 08:44:33 -08:00
Andrew Meadows	08263b2672	add helpful comment about mysterious code	2019-11-19 08:42:28 -08:00
Maki	cd5ea20cca	Added environment variables to change domain server ports	2019-11-19 12:35:06 +00:00
ingerjm0	d2118f0aac	DOC-208 revisions	2019-11-18 20:05:08 -08:00
Brad Davis	d4b3a9ba49	Github actions	2019-11-18 15:20:37 -08:00
luiscuenca	f1a9f52ee1	Set pinch to unzoom	2019-11-18 15:59:45 -07:00
Sabrina Shanman	518d6a530a	Merge pull request #16507 from highfidelity/master ... Merge master into instancing	2019-11-18 13:54:33 -08:00
luiscuenca	e06e1bb377	Fix wheel touch interference with mac camera orbit	2019-11-18 14:49:35 -07:00
David Rowe	adaa061690	Replace "AvatarIsland" with "DomainName" in AddressManager JSDoc	2019-11-19 10:32:38 +13: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
luiscuenca	1338cbd943	Fix touch event timeout on mac and allow camera orbit using the touchpad on windows	2019-11-18 11:38:12 -07:00
dante ruiz	cd6f9a774d	implement gesture pinch to camera zoom	2019-11-18 11:33:31 -07: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
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	3c271aa27a	Merge pull request #16490 from ctrlaltdavid/DEV-2742 ... DEV-2742: Fix Graphics.exportModelToOBJ() JavaScript crash	2019-11-15 09:02:08 -08:00
HifiExperiments	b73a608094	procedural vertex shaders	2019-11-15 00:22:40 -08:00
Zach Fox	e21ee20ff8	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-14 15:18:07 -08:00
DouglasWilcox	37010648be	Abandon exponential acceleration and use constant acceleration. Hook up turn->sit transitions.	2019-11-14 13:12:01 -08:00
Andrew Meadows	ec872bfcf8	remove unused variable	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
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
DouglasWilcox	b8e85aedc7	Merge branch 'master' into improve_seated_rotation	2019-11-13 13:11:30 -08:00
Sabrina Shanman	579eb04df9	Merge pull request #16491 from sabrina-shanman/instancing ... Fix code style / remove cruft	2019-11-13 12:53:10 -08:00
sabrina-shanman	516debdcb2	Fix code style / remove cruft	2019-11-13 12:50:13 -08:00
David Rowe	1145bc8904	Fix Graphics.exportModelToOBJ() JavaScript crash	2019-11-14 08:43:51 +13:00
milad	abf592f533	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-13 10:14:14 -08:00
Zach Fox	8aea0dd951	Merge in Howard's 'screenshare presence' open PR	2019-11-13 10:11:16 -08:00
DouglasWilcox	a3de25618a	Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states. ... (cherry picked from commit f9f28fc286)	2019-11-13 09:52:56 -08:00
Brad Hefta-Gaub	1f2deed941	Merge pull request #16477 from samcake/zorro ... DEV-2711: Fix crash when highlighting custom pipeline shapes	2019-11-13 09:50:16 -08:00
ingerjm0	417856fec4	JSDoc updates for PR16399	2019-11-12 20:45:20 -08:00
amerhifi	3939c7e6fd	adding qaudio reset on switch.	2019-11-12 17:07:43 -08:00
Anthony Thibault	7736582f3b	Merge pull request #16486 from DouglasWilcox/HMD_strafe_transition_bug ... Fix HMD strafe locomotion animation.	2019-11-12 15:49:15 -08:00
DouglasWilcox	f9f28fc286	Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.	2019-11-12 14:15:19 -08:00
Sabrina Shanman	5f99c36bb1	Merge pull request #16484 from sabrina-shanman/instancing_oven ... (DEV-2593) Instancing: Fix model baking to work with new hfm::Shape material definition	2019-11-12 11:40:40 -08:00
DouglasWilcox	995f5f92cd	Do not use turningSpeed when setting seatedTurn vars, and iterate acceleration formula	2019-11-12 11:11:19 -08:00
Andrew Meadows	cf08a4162a	add workload job to help debug entity proxies	2019-11-12 10:35:16 -08:00
Sabrina Shanman	769a332d22	Merge pull request #16485 from highfidelity/master ... Merge master into instancing	2019-11-12 10:07:28 -08:00
sabrina-shanman	f39121c53b	Fix build error/warning	2019-11-12 09:52:58 -08:00
sabrina-shanman	2169952613	Remove unused mesh.part.materialID	2019-11-11 17:52:16 -08:00
sabrina-shanman	9a65d78cdf	Fix model baking to work with new hfm::Shape material definition (1 ... material per mesh part)	2019-11-11 17:52:00 -08:00
Kalila R	7c1b9e79ae	Setting ModelBaker.cpp back to main.	2019-11-11 20:28:16 -05:00
Kalila R	fd7ac223b0	activitylogger still disabled but does not output to console	2019-11-11 20:08:03 -05:00
amer cerkic	35065cf4d8	Merge branch 'master' of https://github.com/highfidelity/hifi	2019-11-11 16:15:41 -08:00
Shannon Romano	5f2f647dfb	Merge pull request #16480 from kencooke/audio-hrtf-attn-improved ... DEV-2330: Improved attenuation zones	2019-11-11 13:17:36 -08:00
DouglasWilcox	64634f51b1	Merge branch 'master' into improve_seated_rotation	2019-11-11 11:31:56 -08:00
DouglasWilcox	c36c4a17b1	first pass hookup of seated rotation with acceleration and animation response	2019-11-11 11:31:34 -08:00
amer cerkic	3a764169ba	adding new device to list if default not found	2019-11-11 11:13:44 -08:00
amer cerkic	549e181be0	adding safeguard in case device list is empty	2019-11-11 11:00:33 -08:00
Ken Cooke	ddd11305de	Improved HRTF algorithm to expose parametric occlusion/lowpass effect	2019-11-09 09:57:16 -08:00
sabrina-shanman	b7da5d0d72	Update Model::calculateTriangleSets to use hfm::Shapes	2019-11-08 13:56:49 -08:00
dooglifeSF	055d5cdf9b	Simplify boolean statements, revise several settle anims	2019-11-08 13:46:38 -08:00
Sam Gateau	8175b9486f	Fix crash when highlighting custom pipeline shapes	2019-11-08 11:18:02 -08:00
Sabrina Shanman	eebb9ad51f	Merge pull request #16475 from highfidelity/master ... Merge master into instancing	2019-11-08 10:10:50 -08:00
sabrina-shanman	a42e09aef8	Fix unused variables/implicit type conversions	2019-11-08 10:04:34 -08:00
Sam Gateau	269289412e	Same fix for highlight effects	2019-11-08 09:11:58 -08:00
Sam Gateau	5682e8ee2f	Fixing bug with custom pipeline and deformed shape renderItems in shadow pass	2019-11-07 15:16:11 -08:00
dooglifeSF	8e11d91c03	Merge branch 'master' into rand_settles_and_by_momentum	2019-11-07 15:09:10 -08:00
Maia Hansen	7855747386	Merge pull request #16470 from samcake/zorro ... Procedural Material crashes in shadow pass on deformed shape renderItems	2019-11-07 15:00:06 -08:00
Sam Gateau	86b62f921d	Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it	2019-11-07 14:01:50 -08:00