25278 commits

Author	SHA1	Message	Date
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
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
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
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
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
dante ruiz	cd6f9a774d	implement gesture pinch to camera zoom	2019-11-18 11:33:31 -07: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	b64ce343bd	Merge pull request #16429 from MiladNazeri/screenshareElectronApp ... Screenshare in Interface!	2019-11-15 15:32:51 -08:00
HifiExperiments	b73a608094	procedural vertex shaders	2019-11-15 00:22:40 -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	1035467c27	newline add	2019-11-14 16:06:28 -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
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
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	7692e858a1	use EntityItemID rather than QUuid	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	9d92546a8b	revert the revert of PR-16307	2019-11-14 09:59:43 -08:00
DouglasWilcox	11e1c4e6fe	linear acceleration experiment	2019-11-14 09:23:16 -08: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
Zach Fox	61f0896e30	Fix small bugs with the HTTP request to screenshare endpoint	2019-11-13 12:35:01 -08:00
Anthony J. Thibault	e81b21ac59	bug fix from code review comment	2019-11-13 10:40:00 -08:00
Zach Fox	b0c578aa7f	Improved HTTP request to proper endpoint - won't work until PR16459 is merged	2019-11-12 17:06:35 -08:00
Andrew Meadows	1c399f5e9b	add doc about PICK_BYPASS_IGNORE Pick FilterFlag	2019-11-12 16:58:09 -08:00
milad	ea8e285793	Zach's ss cpp cleanup changes	2019-11-12 16:02:52 -08:00
Anthony J. Thibault	365b132c30	Bugfix for t-pose avatar when moving ... The android specific optimized IK animation graph was out of date, it was referencing animations that have been deleted, hence the t-pose. This PR updates and renames the android/optimized ik animation graph to the latest.	2019-11-12 15:33:41 -08:00
ingerjm0	dda69bf91a	JSDoc revisions for PR16245	2019-11-12 14:47:09 -08:00
ingerjm0	ce174696c0	JSDoc revisions for PR 16144	2019-11-12 14:38:51 -08:00
ingerjm0	11cb6ac6e0	JSDoc updates for PR15974	2019-11-12 14:18:12 -08:00
ingerjm0	a61857b6d8	JSDoc revisions for PR16025	2019-11-12 14:17:23 -08:00
milad	49f972714c	more cleanup	2019-11-12 13:12:10 -08:00
DouglasWilcox	9d86e49a0b	Pretty good exponential acceleration, need to simplify	2019-11-12 11:59:39 -08:00
milad	0f605ffc43	clean up code	2019-11-12 11:37:07 -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
milad	7cce153b6d	working flow. Needs clean up and final ui tweaks	2019-11-11 20:13:23 -08:00
Kalila R	a7b2c3a32c	Updated application name and version.	2019-11-11 20:22:19 -05: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
milad	c7b8d97639	updated api to try and communicate over EB, but still not working	2019-11-11 09:56:46 -08:00
Anthony J. Thibault	52acfc9333	Speculative fix for infinite loop in SafeLanding ... This PR containts two fixes. 1) Tightening up the locks in the SafeLanding class to prevent race conditions. By inspection there are cases where variables are read and modified outside of locks. 2) A check to help prevent an infinite loop in the _sequenceNumber std::distance calculation. This is the main issue, in some cases backtrace is reporting the main thread as deadlocked. The stacktrace points to an issue with the std::distance() calculation. If the EntityQueryInitialResultsComplete is delayed signficantly, there could be a rare case where the _sequenceNumber map grows large enough for the wraparound less then operator will no longer function correctly. This will cause the std::distance calculation to never complete. I've added a guard to prevent this from happening and some logs to help diagnose this issue in the future.	2019-11-08 14:22:04 -08:00
milad	b206c102e8	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-08 12:19:06 -08:00
Sabrina Shanman	eebb9ad51f	Merge pull request #16475 from highfidelity/master ... Merge master into instancing	2019-11-08 10:10:50 -08:00
Nex-Pro	fea65133b4	Update WindowScriptingInterface.h ... replace "model" with "modal"	2019-11-08 12:51:00 +00:00
Zach Fox	c8464786e7	Steps closer...	2019-11-06 17:16:21 -08:00
Zach Fox	a41ae3daa9	Move the local web entity logic to c++ - might not be working	2019-11-06 15:45:48 -08:00
Zach Fox	40814f9086	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-06 14:46:14 -08:00
milad	894b4127b4	modifying screenshare API for viewer	2019-11-06 14:35:20 -08:00
Anthony Thibault	8f0ca7b6db	Merge pull request #16447 from luiscuenca/hideNeckSecondPass ... DEV-2461: Head woes in 1st person part 2	2019-11-06 12:11:59 -08:00
Clément Brisset	96f53dbbf3	Merge pull request #16448 from matt-hifi/deep-codesign ... "deep" codesign Interface on macOS	2019-11-06 12:08:29 -08:00
Shannon Romano	668061e154	Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes ... Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes	2019-11-06 10:35:53 -08:00
Matt Hardcastle	8dc91d640b	Remove this and connection from lambda expression ... Clang in Xcode 11 is more aggressive about its warnings. This resolves one of the issue Clang noticed in order to support building w/Xcode 11. I first attempted to remove `this` completes, but VS complained that `QObject::disconnect` was being called without `this`. This change satisfies both Clang and VS. A second attempt added this back and then called `disconnect` directly. This also generated a Clang warning. This version resolves the issue by removing the error handler. This also resolves a memory leak caused by the error handler.	2019-11-06 09:13:40 -08:00
milad	56838de22d	fixed conflicts	2019-11-05 17:32:46 -08:00
milad	c6f7c058bc	merging master	2019-11-05 17:30:09 -08:00
sabrina-shanman	921eed1ec1	Remove CollisionPick::computeShapeInfo	2019-11-05 10:57:54 -08:00
sabrina-shanman	7b14c00540	Merge branch 'master' into instancing	2019-11-05 10:22:24 -08:00
amerhifi	343807a9f5	Merge branch 'master' of https://github.com/highfidelity/hifi	2019-11-05 10:17:04 -08:00
amer cerkic	b10f2a86c2	removed extra spaces	2019-11-04 15:44:15 -08:00
amer cerkic	81881acafc	fixing a few spacing issues	2019-11-04 15:08:06 -08:00
amer cerkic	b2ab33116f	removing double calls to switch devices, handling default changes from scripting interface instead	2019-11-04 15:03:53 -08:00
luiscuenca	de2d2de938	Head woes in 1st person part 2	2019-11-04 13:33:00 -07:00
Sam Gateau	a4696992e8	Renaming the env variable to enable Material Proecural Shaders	2019-11-04 11:15:37 -08:00
Anthony J. Thibault	101ec9d753	Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes ... These blendshapes are not present in ARKit and are not used by any of our procedural face animations (talking, blinking etc). This change should have been part of #16400 but was accidently left out.	2019-11-04 09:49:24 -08:00
HifiExperiments	bae2ba7bae	merge with master	2019-11-02 01:08:56 -07:00
Zach Fox	e1b02fb73a	The same message as the last commit, except do the work this time	2019-11-01 13:23:25 -07:00
Zach Fox	9273db4844	Fix an issue that prevented new screenshare scripts from running properly	2019-11-01 13:03:16 -07:00
milad	d9d9877f83	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-01 10:53:03 -07:00
milad	f2e49cb553	Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp	2019-11-01 10:52:46 -07:00
milad	1b3367fcf9	logging ids	2019-11-01 10:51:23 -07:00
Sabrina Shanman	05ac16536e	Merge pull request #16436 from highfidelity/master ... Merge master into instancing	2019-10-31 17:39:15 -07:00
Anthony J. Thibault	4b34311a0a	Hooked up seated version of aim offset animation	2019-10-31 16:23:29 -07:00
MiladNazeri	676e7bd5b8	Merge branch 'master' into screenshareElectronApp	2019-10-31 13:11:56 -07:00
Anthony Thibault	f99bb3ec77	Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes ... Extended avatar blendshape support for ARKit compatiblity	2019-10-31 12:33:50 -07:00
Zach Fox	68819addd5	Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards	2019-10-31 11:29:46 -07:00
Zach Fox	a336a71db9	Add necessary include	2019-10-31 10:39:04 -07:00
Zach Fox	47b3fdbfe3	Stop screenshare process on interface shutdown	2019-10-31 10:01:00 -07:00
Maia Hansen	de5570ced8	Merge pull request #16421 from amerhifi/dev-2571new ... case DEV-2771: Audio client shutdown lock	2019-10-31 09:50:56 -07:00
Zach Fox	d8026304a4	Guard against a crash in stopScreenshare()	2019-10-31 09:47:31 -07:00
Zach Fox	1e2fcf8bd5	Add screenshareStopped signal; use std::unique_ptr<QProcess>	2019-10-31 09:43:56 -07:00
Zach Fox	c22f5097c0	Make SCREENSHARE_EXE_PATH private	2019-10-31 09:24:28 -07:00
Zach Fox	6291590737	Fixup paths	2019-10-31 09:01:02 -07:00
Zach Fox	1e24df3f71	Get Interface to look in the proper directories	2019-10-31 08:57:06 -07:00
amerhifi	52e0f54d0c	addressing comments	2019-10-31 07:21:16 -07:00
milad	ea373ac14c	First steps towards a screenshare app	2019-10-30 16:44:42 -07:00
amer cerkic	4b4b722875	fixed issues related to context switching and selection with hmd	2019-10-30 16:27:19 -07:00
Shannon Romano	8d6434fbca	Merge pull request #16367 from ctrlaltdavid/DOC-199 ... DOC-199: AudioScope JSDoc	2019-10-30 13:45:13 -07:00
amer cerkic	39e1092660	working on hmd fix	2019-10-30 11:34:41 -07:00
Shannon Romano	9948a181dc	Merge pull request #16392 from kitely/load-avatar-entities-after-skeleton ... In Bookmarks, attach avatar entities after the skeleton is loaded	2019-10-30 09:29:51 -07:00
Sabrina Shanman	e8b963b59a	Merge pull request #16425 from highfidelity/master ... Merge master into instancing	2019-10-30 09:16:04 -07:00
Oren Hurvitz	7953e3889f	Wait for the avatar skeleton to finish loading before adding the avatar entities	2019-10-30 12:12:26 +02:00
Shannon Romano	8fc135d972	Merge pull request #16423 from hyperlogic/bug-fix/third-person-look-at-fix-2 ... DEV-2302: Fix for head not turning in third person look at camera mode	2019-10-29 13:41:13 -07:00
Brad Hefta-Gaub	206e519b5e	Merge pull request #16390 from kitely/fix-walk-speed ... Fixed the sprint speeds of Desktop vs HMD	2019-10-29 13:04:45 -07:00
Anthony J. Thibault	e753010411	Fix for head not turning in third person look at camera mode ... If MyAvatar::setSkeletonModelURL() is called with the same url that has already been loaded the SkeletonModel::skeletonLoaded signal will not be triggered. In this case the MyAvatar local variable MyAvatar::_skeletonModelLoaded will be set to false and never re-set to true. This, in turn, caused MyAvatar::updateHeadLookAt() to skip setting the proper blend values that would turn the head. Rather then try to make MyAvatar::_skeletonModelLoaded handle all the possible edge cases. It has been removed. All conditionals that used to use it have been replased with _skeletonModel->isLoaded().	2019-10-29 12:38:06 -07:00
amerhifi	7d5dcbfc77	space cleanup	2019-10-29 11:58:04 -07:00
amerhifi	884cbd7de9	working on moving display plugin lookup to audiodevices	2019-10-29 09:26:48 -07:00
luiscuenca	ab6631fae3	Fix look at update and allow to release control	2019-10-28 17:51:29 -07:00
Oren Hurvitz	70c3bb2748	Emit an event when failing to load an avatar. ... Previously, MyAvatar only emitted an event (onLoadComplete) if the load succeeded. Now it also emits an event (onLoadFailed) if the load failed.	2019-10-27 10:55:31 +02:00
Oren Hurvitz	62e5b50e24	Fixed the sprint speeds of Desktop vs HMD (they were flipped)	2019-10-27 09:33:59 +02:00
Anthony J. Thibault	9325ea588a	Re-added removed jsdoc comments for removed AvatarInput jsapi. ... With a comment that these properties/functions have been removed.	2019-10-26 09:20:51 -07:00
HifiExperiments	deb5aacfad	fix materialcachescriptinginterface	2019-10-25 18:16:08 -07:00
Sabrina Shanman	e74de214e2	Merge pull request #16404 from highfidelity/master ... Merge master into instancing	2019-10-25 09:55:44 -07:00
Amer	42234b119f	Merge pull request #16381 from amerhifi/amer-dev471-re ... case Dev 471: HMD default audio behavior	2019-10-24 16:23:14 -07:00
Shannon Romano	15f27e53cb	Merge pull request #16372 from ctrlaltdavid/DEV-2055 ... DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value	2019-10-24 15:20:34 -07:00
Anthony J. Thibault	dc7b611e8e	documentation and warning fixes	2019-10-24 09:53:11 -07:00
HifiExperiments	1e100a672e	merge with master and try to fix opacity mode stuff	2019-10-23 22:21:45 -07:00
Anthony J. Thibault	d43d12dfa7	Merge branch 'master' into feature/arkit-blendshapes	2019-10-23 21:45:10 -07:00
Anthony Thibault	edb181bd16	Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI ... DEV-2285: Improve eyes look at	2019-10-23 20:42:27 -07:00
Anthony J. Thibault	f28d317914	Clean up reamining issues	2019-10-23 16:43:10 -07:00
Shannon Romano	3268fa7a9f	Merge pull request #16386 from luiscuenca/fixStrafingError ... DEV-2475: Fix head twitching when strafing	2019-10-23 14:48:57 -07:00
luiscuenca	bb0849d3a0	Move changes to Head and remove leftover code	2019-10-23 14:23:29 -07:00
Shannon Romano	fb7589eff9	Merge pull request #16347 from ctrlaltdavid/DOC-195 ... DOC-195: Keyboard JSDoc	2019-10-23 14:01:03 -07:00
David Rowe	423074463d	Typo	2019-10-24 09:17:13 +13:00
David Rowe	a949f327d2	Merge branch 'master' into DOC-199	2019-10-24 09:14:08 +13:00
amer cerkic	179f5e0873	fixed context switching issue with hmd. included additional output info for other audio crash issues	2019-10-23 12:56:43 -07:00
luiscuenca	9849205ca0	Add perf timer to code block	2019-10-23 12:32:16 -07:00
Zach Fox	f847d364a8	DEV-2498: Fix a crash in MenuScriptingInterface	2019-10-23 11:52:07 -07:00
Anthony J. Thibault	61b9f08fec	Blendshapes for OtherAvatars should update even if no joints have changes.	2019-10-22 22:19:03 -07:00
David Rowe	ea864e4e97	Remove unused variable	2019-10-23 08:13:46 +13:00
luiscuenca	f6aa4a2dd4	Head look at should update before rig	2019-10-22 11:42:19 -07:00
amer cerkic	0410a45da1	fixed selection issue	2019-10-22 11:11:13 -07:00
amerhifi	a8602195d4	addressing comments	2019-10-22 07:17:57 -07:00
David Rowe	6a2e67ca54	Typo	2019-10-22 21:07:04 +13:00
David Rowe	378c47d16c	Replace world detail quality float with enum	2019-10-22 19:18:11 +13:00
amerhifi	68681fdb2e	Merge branch 'master' into amer-dev471-re	2019-10-21 21:04:24 -07:00
Anthony J. Thibault	03f88f696d	Renamed LipsTogether to MouthClose and bug fixes.	2019-10-21 19:37:57 -07:00
luiscuenca	a4fcb2c39e	Add eyesLookAtTarget set/get API methods	2019-10-21 14:31:15 -07:00
amerhifi	421cff1cb2	fixed naming to match standards	2019-10-18 15:30:32 -07:00
amerhifi	c7e1fdaeac	adding hmd audio device info to deviceslist ... changing locations one more merge working on the threading issue changing offices, working on qml simple qml filtering fixed spacing problem when item is removed	2019-10-18 15:29:10 -07:00
Zach Fox	4c48d80da7	Fix warning on MacOS and Ubuntu	2019-10-18 13:34:42 -07:00
Zach Fox	d65538a11b	DEV-2471: Fix an issue with InteractiveWindow anchors that caused windows without anchors to move when the Interface window geometry changes	2019-10-18 12:41:19 -07:00
Sabrina Shanman	5d91d22314	Merge pull request #16379 from highfidelity/master ... Merge master into instancing	2019-10-18 10:24:35 -07:00
Maia Hansen	fbb47bcfbb	Merge pull request #16370 from AndrewMeadows/secondary-shadows ... DEV-2293: secondary canera shadow config should recognize performance tier restrictions	2019-10-17 18:26:29 -07:00
David Rowe	3bcb305f70	Santize LODManager.setWorldQualityDetail() parameter value	2019-10-18 11:51:51 +13:00
luiscuenca	33ea63c708	Fix warnings and update controls	2019-10-17 15:06:12 -07:00
Andrew Meadows	8aa1bddcee	RenderSecondView shadow config follows that of RenderMainView	2019-10-17 14:11:18 -07:00
luiscuenca	63c2b41929	Restate legacy first person camera mode	2019-10-17 13:26:42 -07:00
David Rowe	fa9bf4d51c	JSDoc fixes noticed in passing	2019-10-18 09:17:03 +13:00
David Rowe	24b4374967	AudioScope JSDoc	2019-10-18 09:15:56 +13:00
Shannon Romano	95f00e2caa	Merge pull request #16362 from huffman/fix/mac-early-exit ... DEV-830: Remove call to processEvents on Mac in ~Application	2019-10-16 22:22:58 -07:00
luiscuenca	9000b4c7f8	Tweak camera position in first person to further hide neck	2019-10-16 17:31:10 -07:00
Ryan Huffman	e83ac8c0dd	Remove call to processEvents on Mac in ~Application	2019-10-16 16:14:27 -07:00
luiscuenca	9f0e82e1e6	Improve eye's look at and blinking. Fix look at update	2019-10-16 15:29:28 -07:00
Sam Gateau	af269a4720	Merge branch 'master' of github.com:highfidelity/hifi into upstream-instancing	2019-10-16 11:57:15 -07:00
Anthony Thibault	5115b52ca0	Merge pull request #16356 from luiscuenca/fixLookAtNoHead ... DEV-2316: Fix camera position in first person	2019-10-16 10:52:53 -07:00
Anthony J. Thibault	389f5a1d33	ARKit Blendshape hookup work	2019-10-16 10:36:39 -07:00
Anthony J. Thibault	6efd74a339	WIP adding blendshapes to input system	2019-10-16 10:36:38 -07:00
Anthony J. Thibault	da0911e01b	Delete legacy blendshape code ... Move FaceshiftConstants to BlendshapeConstants. Delete FaceTracker and DdeFaceTracker classes. Delete old facetracker menu and preferences	2019-10-16 10:36:37 -07:00
Anthony J. Thibault	8411e6b033	Blendshape script API work ... * Moved hasScriptedBlendshapes, hasProceduralBlinkFaceMovement, hasProceduralEyeFaceMovement, hasAudioEnabledFaceMovement to AvatarData so they are accessable via agent scripts. * Marked setForceFaceTrackerConnected as depricated. * Updated jsdoc comments	2019-10-16 10:36:35 -07:00
luiscuenca	02837be13f	Get state using CharacterController	2019-10-16 09:04:03 -07:00
Shannon Romano	c2270765c1	Merge pull request #16355 from hyperlogic/bug-fix/hmd-flying-fix ... Fix for HMD mode flying	2019-10-16 08:42:22 -07:00
luiscuenca	93a1adc736	Fix camera position in first person	2019-10-15 18:25:33 -07:00
Anthony J. Thibault	288f9bfb16	Fix for HMD mode flying ... In HMD mode you should fly/move in the direction you are looking.	2019-10-15 18:22:42 -07:00
Zach Fox	1527bf2e11	Merge pull request #16294 from RebeccaStankus/friction ... First Time User Experience Project	2019-10-15 14:56:25 -07:00
David Rowe	b793e23cb0	Keyboard JSDoc	2019-10-15 15:24:41 +13:00
Shannon Romano	f29d4aad1b	Merge pull request #16322 from Atlante45/feat/xcode-11-compatible-build ... Add Bullet3 patch for Xcode 11 build	2019-10-14 16:28:17 -07:00
Zach	e495dc7990	Fix crash on MacOS; don't do resizing in C++ anymore	2019-10-14 15:55:33 -07:00
Sabrina Shanman	c38462bf6d	Merge pull request #16345 from highfidelity/master ... Merge master into instancing	2019-10-14 14:54:22 -07:00
Zach Fox	341abb8185	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-14 12:36:35 -07:00
luiscuenca	505813b3c3	Fix blink async and other is talking bug	2019-10-14 10:44:55 -07:00
Brad Hefta-Gaub	51669e1ac3	Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 11:06:10 -07:00
Clement	0df6661f5b	Fix incorrect assert	2019-10-10 15:57:05 -07:00
Zach Fox	19acd76854	Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup	2019-10-10 15:48:40 -07:00
Ken Cooke	8325ee2c8e	Merge pull request #16327 from kencooke/audio-device-sleep-wake ... DEV-1901: No audio in Interface when restoring from sleep	2019-10-10 15:12:07 -07:00
Ken Cooke	ec67b67966	On waking from sleep/hibernate, restart the audio devices	2019-10-10 14:10:47 -07:00
Maia Hansen	07b916f0b7	Merge pull request #16307 from AndrewMeadows/colossal-cave ... DEV-1811: apply deletion rules to linked entities	2019-10-10 13:24:43 -07:00
Zach Fox	240f904b85	DEV-2386: Remove 'Run Client Script Test'	2019-10-10 11:11:27 -07:00
Sam Gateau	c0e4509095	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-10 09:04:38 -07:00
Sam Gateau	3e8d6671f7	Merge branch 'instancing' of github.com:highfidelity/hifi into instancing	2019-10-10 09:04:22 -07:00
Brad Hefta-Gaub	1316f9b046	Merge pull request #16301 from dooglifeSF/drivekey_anim_triggers ... Drivekey anim triggers	2019-10-09 18:25:10 -07:00
Sabrina Shanman	63fa9afa13	Merge pull request #16323 from highfidelity/master ... Merge master into instancing	2019-10-09 16:59:54 -07:00
Maia Hansen	6b5f90f641	Merge pull request #16315 from jherico/qt_5.13 ... Qt 5.13 changes	2019-10-09 15:04:07 -07:00
luiscuenca	fc018257e1	Select avatar to look using API. Blink when look at change	2019-10-09 12:20:35 -07:00
Sam Gateau	9df2186696	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-09 10:03:09 -07:00
Shannon Romano	b3d974504a	Merge pull request #16316 from luiscuenca/fixForwardEyeLookAt ... DEV-2285: Fix eye look at forward vector	2019-10-09 09:13:02 -07:00
dooglifeSF	8a262a3d1a	Merge branch 'master' into drivekey_anim_triggers	2019-10-09 07:37:38 -07:00
Sam Gateau	abaf0262a7	Merge branch 'master' of https://github.com/highfidelity/hifi into instancing	2019-10-08 18:55:51 -07:00
Sam Gateau	1f3993c308	getting the transform right for the rigid bodies	2019-10-08 18:13:24 -07:00
Brad Davis	960cab9994	Qt 5.13 warnings & fixes	2019-10-08 15:40:13 -07:00
luiscuenca	68e287628c	Fix eye look at forward vector	2019-10-08 14:39:27 -07:00
jennaingersoll	0b1a4878fe	Merge pull request #16308 from ctrlaltdavid/DOC-189 ... DOC-189: SpeechRecognizer JSDoc	2019-10-08 12:53:04 -07:00
Shannon Romano	0bf7fd0233	Merge pull request #16310 from luiscuenca/fixStrafeWhileFlying ... DEV-2261: DEV-2320: Fix strafe while flying, and ramp up diagonal movement	2019-10-08 11:45:26 -07:00
Zach Fox	960440e802	DEV-2352: Modify Release Notes URL	2019-10-08 14:28:01 -04:00
luiscuenca	5576132df7	Fix strafe while flying, and ramp up diagonal movement	2019-10-08 10:13:58 -07:00
David Rowe	1106d8fdfa	Doc review	2019-10-08 21:15:16 +13:00
David Rowe	f224832d27	Merge branch 'master' into DOC-111	2019-10-08 20:44:13 +13:00
David Rowe	570abba3ce	SpeechRecognizer JSDoc	2019-10-08 13:04:52 +13:00
Andrew Meadows	052a0c3ebe	remove cruft, add comments, change variable name	2019-10-07 16:23:30 -07:00
Sabrina Shanman	2fcb526a5c	Merge pull request #16305 from highfidelity/master ... Merge master into instancing	2019-10-07 15:44:42 -07:00
Sam Gateau	521ce3936b	I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion...	2019-10-07 15:19:23 -07:00
Andrew Meadows	8ab70225d9	apply delete rules down linked hierarchy	2019-10-07 14:38:36 -07:00
Andrew Meadows	470a45c012	EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities	2019-10-07 14:38:36 -07:00
Andrew Meadows	3155ffe07e	remove useless unreachable code	2019-10-07 14:38:36 -07:00
Sam Gateau	42bc91b389	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-07 09:42:14 -07:00
dooglifeSF	387f0a3f10	add isInput* and isNotInput vars for use in json, and edit json to use them	2019-10-04 15:28:35 -07:00
Shannon Romano	f797f714bd	Merge pull request #16298 from luiscuenca/addisSeatedAPImethod ... DEV-2011: Add MyAvatar::isSeated API method	2019-10-04 15:06:46 -07:00
luiscuenca	07080f0138	Clarify jdocs	2019-10-04 13:47:20 -07:00
luiscuenca	3a9c829c95	Add MyAvatar::isSeated API method	2019-10-04 11:07:49 -07:00
Sam Gateau	c7ca431296	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-04 10:00:41 -07:00
luiscuenca	e0d0ec5852	Fix isInAir so takes into account the new seated state:	2019-10-03 10:36:23 -07:00
luiscuenca	75f0b4ea54	Fix First Person Camera issues	2019-10-02 14:17:57 -07:00
luiscuenca	059bcc10cc	merge master	2019-10-02 13:24:32 -07:00
luiscuenca	521aa50356	Set time and angle recentering parameters	2019-10-02 11:43:06 -07:00
Sam Gateau	9b9f91ab85	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-02 10:22:43 -07:00
Sam Gateau	dcfc3cddd2	Merge branch 'master' of https://github.com/highfidelity/hifi into instancing	2019-10-01 19:50:33 -07:00
amer cerkic	c0a852d68c	updated audio wording and removed audio defaul spamming.	2019-10-01 16:55:37 -07:00
luiscuenca	18af7c5d84	Add recenter timer and temp API	2019-10-01 13:44:27 -07:00
Shannon Romano	38574cd66b	Merge pull request #16245 from luiscuenca/implementPointAt ... DEV-442: Implement directional blending node for point reaction	2019-10-01 11:46:30 -07:00
Sam Gateau	1d19671e88	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-01 11:27:16 -07:00
Maia Hansen	220123ff3b	Merge pull request #16254 from kencooke/macos-appnap-disabler ... BUGZ-1117: On Mac OS, disable App Nap to prevent audio glitches	2019-10-01 10:53:03 -07:00
luiscuenca	d4a74f798c	aimToBlendValues to static function	2019-10-01 10:15:16 -07:00
Anthony Thibault	c2690eb39d	Merge pull request #16268 from luiscuenca/limitRotationWhileSeated ... DEV-2125: Rotation while seated do not trigger re-centering	2019-10-01 09:33:02 -07:00
luiscuenca	7c55cee1f0	Limit rotation while seated to not trigger recentering	2019-09-30 17:37:14 -07:00
luiscuenca	0fac1e134f	Allow avatar look at when in first person camera	2019-09-30 16:43:02 -07:00
Shannon Romano	e8f1eecc5b	Merge pull request #16258 from samcake/yellow ... DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches	2019-09-30 16:36:24 -07:00
Ken Cooke	de5da65757	Use NSActivityUserInitiated instead of NSActivityBackground	2019-09-30 15:48:01 -07:00
Shannon Romano	95b219475d	Merge pull request #16260 from jherico/warnings ... BUGZ-1596: Cleaning up android build warnings	2019-09-30 11:58:21 -07:00
luiscuenca	02d889ba6e	account for point target validity	2019-09-30 11:35:00 -07:00
Sam Gateau	25bcc31b72	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-27 09:24:25 -07:00
Brad Davis	403499bf32	Cleaning up android build warnings	2019-09-27 09:19:52 -07:00
Sam Gateau	24cc302a8b	second pass of cleaning on the code to make it ready for merge	2019-09-26 16:56:00 -07:00
luiscuenca	1b064a0ebe	Fix Q key on first person cam. Let camera control flying Y axis	2019-09-26 14:29:01 -07:00
Sam Gateau	9d999baab2	FIrst pass to clean up before pushing a pr:	2019-09-26 11:59:01 -07:00
Ken Cooke	6e54ff30bd	Bugfix	2019-09-26 11:36:23 -07:00
Ken Cooke	ae62b96f67	On Mac OS, disable App Nap to prevent audio glitches while running in the background	2019-09-26 08:52:35 -07:00
Sam Gateau	ba11c3e702	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-25 17:54:21 -07:00
Amer	1e94a82ee6	Merge pull request #16196 from amerhifi/dev469 ... DEV-469: Default Audio device	2019-09-25 16:28:00 -07:00
luiscuenca	d7fc4e905c	fix function on jsdoc	2019-09-25 14:02:43 -07:00
amer cerkic	73f14d812f	addressing cr comments	2019-09-25 13:22:50 -07:00
luiscuenca	0aab2ed07f	Disable head look at when pointing	2019-09-25 12:37:24 -07:00
Sam Gateau	3e3c4c2e70	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2019-09-24 18:58:29 -07:00
luiscuenca	ad79393e1f	Implement point at directional blend and API	2019-09-24 17:55:38 -07:00
Clement	96b58756b1	Add flag for account settings feature	2019-09-24 16:50:10 -07:00
Shannon Romano	0c2ca7500d	Merge pull request #16241 from RebeccaStankus/removeInspect ... Undo removal of User Inspection	2019-09-24 15:41:35 -07:00
amer cerkic	9daf670678	Merge branch 'master' into dev469	2019-09-24 15:38:07 -07:00
Anthony Thibault	6fbcc9151e	Merge pull request #16235 from luiscuenca/resetLookAtOnGoTo ... BUGZ-1553: Reset look at params when the avatar's location is set	2019-09-24 13:20:26 -07:00
RebeccaStankus	978bcaffeb	Undo removal of User Inspection	2019-09-24 11:18:16 -07:00
amerhifi	fbc68e7f69	removed clang format issue, removed old attempt at getting defaults to startup correctly	2019-09-23 15:07:04 -07:00
RebeccaStankus	e41632e3ec	Removing connections to use inspect mode on mouse events	2019-09-23 14:42:13 -07:00
luiscuenca	10f76da3ec	Reset look at values when goToLocation or sitting	2019-09-23 11:53:47 -07:00
amer cerkic	e3db7a43a6	set default value for non set devices, typically only for first time runs	2019-09-23 11:00:51 -07:00
Sam Gateau	483a716839	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-23 10:19:45 -07:00
Sam Gateau	3c2809b9ed	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2019-09-21 08:52:13 -07:00
Sam Gateau	4480d56433	Rendering just the overlay layer and improving the resoruceCache inspector to sort	2019-09-20 19:00:03 -07:00
Clement	1ca30b688d	Put flush timer on right thread without parenting	2019-09-20 15:39:35 -07:00
Shannon Romano	bd488f0196	Merge pull request #16144 from luiscuenca/addLookAtThirdCamera ... DEV-391: Keyboard Input Controls Camera Not Avatar Orientation	2019-09-20 13:03:03 -07:00
luiscuenca	f979c4e1ab	Add more info to jdocs	2019-09-20 09:51:51 -07:00
luiscuenca	365aa1bf03	Add jdoc to camera modes and fix variable namings	2019-09-19 17:30:01 -07:00
David Rowe	5a4ab1d43f	Missed typo	2019-09-20 10:27:21 +12:00
David Rowe	605d272392	Merge branch 'master' into DOC-111	2019-09-20 10:25:21 +12:00
David Rowe	9d9317c50d	Miscellaneous fixes and typos	2019-09-20 10:19:45 +12:00
David Rowe	34883990b4	Clarify which line3d overlay properties aren't working	2019-09-20 10:19:02 +12:00
David Rowe	42bc9356ca	Add Steam to list of limited commerce versions	2019-09-20 09:23:09 +12:00
David Rowe	19888fad03	Format findableBy and audioListenerMode property values as lists	2019-09-20 08:35:23 +12:00
luiscuenca	279e25ca70	Merge master	2019-09-19 13:21:49 -07:00
David Rowe	d5e08d19e3	Fix JSDoc for miscellaneous white space issues	2019-09-20 08:17:24 +12:00
luiscuenca	6d98537a20	Clean up code and refactor avatar-animation.json	2019-09-19 10:45:20 -07:00
amerhifi	9cc3b7a5c7	addressing pr comments	2019-09-19 10:08:30 -07:00
Sam Gateau	819c942056	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-19 09:01:19 -07:00
Clement	527b27b32d	Make sure the flush timer is not spawned too early	2019-09-18 17:05:05 -07:00
luiscuenca	7bc8e6b237	Solved some sitting and sound issues while looking at	2019-09-18 17:00:10 -07:00
Shannon Romano	e7001c3f1b	Merge pull request #16157 from sethalves/vive-pro-groundwork ... DEV-605: Vive pro groundwork	2019-09-18 16:36:12 -07:00
Shannon Romano	0be972062d	Merge pull request #16207 from hyperlogic/bug-fix/sitting-bug-fixes ... Sit bug fixes	2019-09-18 16:20:51 -07:00
Sam Gateau	381fc5146f	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-17 18:08:09 -07:00
Sam Gateau	c0660329a3	Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family	2019-09-17 18:06:08 -07:00
luiscuenca	1054e8fcde	Selfie camera and updated camera menus	2019-09-17 17:15:16 -07:00
amer cerkic	c1854d3438	fixing gnu warnings and removing debug output	2019-09-17 14:42:35 -07:00
Anthony J. Thibault	1157d59f67	Sit bug fixes ... * You should not be able to move after being seated, even if you switch seats. * You should not be able to jump out of the chair by holding the space bar. * Fixed small issue with the sitting to standing transition being delayed. (causing the user to look like there were sitting in mid-air) This was due to a missing transition in the animation.json	2019-09-17 13:40:43 -07:00
amer cerkic	a777757c48	fixed android build	2019-09-17 12:46:38 -07:00
Seth Alves	3ece763a8e	code review	2019-09-17 10:52:55 -07:00
Seth Alves	58cf51058b	code review	2019-09-17 09:43:32 -07:00
Seth Alves	a288c0a52d	remove old/unused eyetracker code.	2019-09-17 09:43:21 -07:00
Seth Alves	5c570d28a0	remove old/unused eyetracker code	2019-09-17 09:43:20 -07:00
Seth Alves	943348ba51	input action channels for eyes and eyelids and fingers. connect eyelid input actions to blendshapes.	2019-09-17 09:43:20 -07:00
Seth Alves	b64ff70d6c	add show-lookat-targets DebugDraw. remove old/unused eyetracker code.	2019-09-17 09:43:19 -07:00
amerhifi	66725f5f1b	working on swapping default devices on system change	2019-09-17 07:50:22 -07:00
David Rowe	dff37a71eb	Fix JSDoc markup HTML issues	2019-09-17 16:26:09 +12:00
luiscuenca	481917ae8a	Rotate avatar with camera and diagonal rotation	2019-09-16 18:26:19 -07:00
Sam Gateau	60045f4783	Replacing key combination to trigger a frame capture	2019-09-16 17:48:30 -07:00
amerhifi	e689531410	added unique identifier to device for comparison. Because a default device had a different name, but same underlying device. So comparing with device name is not necessarily the same device. Possibly fixed select issue with multiple devices same name	2019-09-16 15:31:44 -07:00
sabrina-shanman	76b1f551b1	Merge branch 'master' into instancing	2019-09-16 10:17:59 -07:00
sabrina-shanman	46616b4efd	Fix more integer conversion warnings	2019-09-16 09:55:25 -07:00
sabrina-shanman	a166b41216	Fix build warnings/errors	2019-09-13 15:39:29 -07:00
luiscuenca	5adf3e8c25	Expose API some parameters for live configuration	2019-09-13 14:10:11 -07:00
amerhifi	cc11bd9552	created new AudioWrapper	2019-09-13 11:24:41 -07:00
sabrina-shanman	b944db3e79	std::vector-ize joints and materials in hfm::Model	2019-09-11 16:54:07 -07:00
luiscuenca	8af22f0c04	Compute when negative deltas	2019-09-11 16:27:07 -07:00
luiscuenca	793b2917f6	Compute only when delta is not zero	2019-09-11 16:25:48 -07:00
luiscuenca	8a6cb93a84	Limit the camera pitch and use the eyes as the pivot point	2019-09-11 16:08:14 -07:00
MiladNazeri	fb9a6a3c78	Merge pull request #16175 from MiladNazeri/dev-551/hide-crash-menu-behind-enviornment-variables ... DEV-551/hide-crash-menu-behind-environment-variable	2019-09-11 15:47:40 -07:00
luiscuenca	7c7c3cd223	merge master	2019-09-11 14:07:19 -07:00
Shannon Romano	65d0bb1342	Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc ... Kasen Plugin Infrastructure v½ Codename "Modkit Mini"	2019-09-11 13:04:01 -07:00
milad	f9c5d00efa	remove source from variable name	2019-09-11 12:10:47 -07:00
luiscuenca	f0dcfa7f15	fix rotation frame	2019-09-11 12:04:23 -07:00
luiscuenca	b28154235a	Look at camera when camera in front	2019-09-11 11:43:26 -07:00
milad	5ec8b0d589	added environment variable check for crash menu	2019-09-11 11:39:19 -07:00
luiscuenca	7584fe587e	Fix warnings and initial camera orientation	2019-09-11 11:21:53 -07:00
luiscuenca	2f33e37eb6	Angles instead dot product and fix API	2019-09-10 18:10:02 -07:00
Shannon Romano	e1dac580b6	Merge pull request #16121 from luiscuenca/audioPosesSyncFix ... BUGZ-1234: Mitigate the effect of audio noise on talking animations	2019-09-09 10:37:07 -07:00
Shannon Romano	4017a4f937	Merge pull request #16156 from sethalves/wtf-audio-devices ... BUGZ-1434: use existing audio settings on startup	2019-09-09 10:09:34 -07:00
Shannon Romano	c7db287458	Merge pull request #16146 from AndrewMeadows/ess-with-simulation ... BUGZ-1385: allow entity-script-server to move entities kinematically	2019-09-09 07:51:28 -07:00
Seth Alves	4eb88fb396	use existing audio settings on startup	2019-09-07 15:55:31 -07:00
Matt Hardcastle	3074ff96e0	Merge pull request #16150 from MattHardcastle/add-signing-2.0-rebase ... Add signing 2.0 rebase	2019-09-07 09:09:11 -07:00
luiscuenca	1f458d195e	Refactorting, up/down attenuation and comments	2019-09-06 17:50:06 -07:00
Andrew Meadows	227b99859d	fix api for checking EntityItem grab status	2019-09-06 17:23:38 -07:00
luiscuenca	0e4e09acb5	Add blending	2019-09-06 14:30:10 -07:00
luiscuenca	189ddf39e2	Merge branch 'master' into addLookAtThirdCamera	2019-09-06 14:29:51 -07:00
dante ruiz	c2e0e6a976	Change Launcher config.json location ... Launcher `config.json` can not be inside Interface's app bundle, as it will break signing.	2019-09-06 11:20:06 -07:00
luiscuenca	78eee5961c	Fix key mapping for new camera	2019-09-05 18:05:46 -07:00
luiscuenca	ddbd30fac9	Fix magic numbers and refactor some code	2019-09-05 17:14:35 -07:00
luiscuenca	ff8f2c5c16	Add new LookAt camera	2019-09-05 17:04:39 -07:00
Anthony J. Thibault	c35640f739	Warning fixes and small bug fix to anim stats	2019-09-05 14:54:19 -07:00
humbletim	271fac4bca	Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge	2019-09-05 09:46:21 -04:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
Shannon Romano	5f4b2a0080	Merge pull request #16109 from sethalves/fix-saccade-override ... apply fake eye saccades if eye joints aren't overridden	2019-09-03 11:34:02 -07:00
RebeccaStankus	a34a533c07	Added defaults for some params	2019-09-03 10:06:17 -07:00
RebeccaStankus	37304f57ea	Merge branch 'master' of github.com:highfidelity/hifi into feetposition	2019-08-30 14:20:58 -07:00
RebeccaStankus	5fadfa5275	Updated property in MyAvatar.h	2019-08-30 13:52:02 -07:00
Bradley Austin Davis	8e3b337a6e	Merge pull request #16120 from jherico/fix/bugz-1365 ... BUGZ-1365: prevent server scripts from accessing local files in HTML controls	2019-08-30 13:10:09 -07:00
Bradley Austin Davis	29424ca971	Merge pull request #16113 from jherico/fix/bugz-1363 ... BUGZ-1363: crash when checking for web content restrictions	2019-08-30 13:09:49 -07:00
Brad Davis	82a49d4641	Fix android build	2019-08-29 20:19:49 -07:00
luiscuenca	265b6f57a1	Try to mitigate the effect of background mic noise when simulating talking	2019-08-29 15:19:17 -07:00
Brad Davis	6aa967f29f	fixing test code	2019-08-29 14:11:22 -07:00
Brad Davis	428a58710d	BUGZ-1365: Ensure that by default web views can't access local content	2019-08-29 13:44:49 -07:00
Shannon Romano	3695a5e633	Merge pull request #16105 from amerhifi/bugz-186 ... CASE DEV-186: HQ Launcher/Interface Icons and wording need to be standardized	2019-08-28 15:58:10 -07:00
Shannon Romano	e07e8abc0d	Merge pull request #16106 from AndrewMeadows/less-MyAvatar-mesh-tuneling-2 ... BUGZ-1325 prevent MyAvatar from pushing through mesh barrier	2019-08-28 15:51:42 -07:00
Brad Davis	954773124a	BUGZ-1363: crash when checking for web content restrictions	2019-08-28 09:56:45 -07:00
Andrew Meadows	6be3750b38	use collision brake feedback to prevent tunneling	2019-08-27 20:28:56 -07:00
Seth Alves	1979e1dbc7	apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true)	2019-08-27 16:47:01 -07:00
amerhifi	335dea43df	changing app name to high fidelity and changing icons to the new logo	2019-08-27 20:08:21 +02:00
Shannon Romano	3134332513	Merge pull request #16098 from hyperlogic/feature/backtrace-shutdown-flag ... Added "shutdown" crash annotation and crash menu option	2019-08-27 10:57:07 -07:00
Anthony J. Thibault	e98cdab294	Moved CrashHelper.h include to the appropriate place.	2019-08-26 17:05:08 -07:00
Bradley Austin Davis	07ee9e901f	Merge pull request #16099 from jherico/fix/wake_crash ... BUGZ-1264: Support platform independent sleep/wake notifications	2019-08-26 16:20:50 -07:00
Brad Davis	e1bf3f2540	PR feedback	2019-08-26 11:51:33 -07:00
Zach Fox	83ef260941	Merge pull request #16093 from zfox23/emoteTweaks ... BUGZ-1346: Tons of changes to Emote/Emoji system	2019-08-26 10:15:03 -07:00
Zach Fox	497edf6068	Add a comment	2019-08-26 09:03:10 -07:00
Brad Davis	dfd78a2662	Support platform independent sleep/wake notifications	2019-08-24 13:16:48 -07:00
Anthony J. Thibault	d410cb4fda	Added "shutdown" crash annotation and crash menu option	2019-08-24 11:12:28 -07:00
Zach Fox	dfcf70b9b5	Tons of Emote/Emoji changes	2019-08-23 14:14:53 -07:00
RebeccaStankus	f6a32b9318	Fix for PTT not working comments	2019-08-23 13:46:46 -07:00
RebeccaStankus	f109edbd48	Fix for PTT not working comments	2019-08-23 13:45:32 -07:00
RebeccaStankus	63038d12c2	Fix for PTT not working comments	2019-08-23 13:43:15 -07:00
RebeccaStankus	85ee61af9d	Fix for PTT not working	2019-08-23 13:35:58 -07:00
Shannon Romano	af46a180ab	Merge pull request #16091 from luiscuenca/reactionsRefCountFix ... BUGZ-1265: Don't allow reactions refcount go bellow 0	2019-08-23 10:57:56 -07:00
Shannon Romano	86518d222d	Merge pull request #16089 from RebeccaStankus/MuteIssues ... Push To Talk Bugs 1207/1208	2019-08-23 10:42:16 -07:00
luiscuenca	19d85ba824	MyAvatar.endReaction return false when no reaction has been trigger previously	2019-08-23 09:07:27 -07:00
luiscuenca	da9163616a	Don't allow reactions ref count got bellow 0	2019-08-23 08:46:59 -07:00
RebeccaStankus	6e96b800b6	Engine handles turning PTT off if unmuting	2019-08-22 13:22:45 -07:00
Zach Fox	177590614e	Fix emote bar always visible on MacOS; small logic cleanup	2019-08-22 11:44:09 -07:00
Zach Fox	330b8ceb91	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-22 10:24:00 -07:00
Andrew Meadows	7cf0899d59	more correct safeLanding trigger	2019-08-20 17:33:29 -07:00
Andrew Meadows	32400a6baf	improved isStuck detection and MyAvatar::safeLanding() trigger	2019-08-20 17:33:29 -07:00
Andrew Meadows	c8c704eb57	revert last change	2019-08-20 17:33:29 -07:00
Andrew Meadows	6d7565a568	CharacterController don't fight MyaAvatar::safeLanding()	2019-08-20 17:33:29 -07:00
Ryan Huffman	de476d0569	Merge pull request #16075 from huffman/fix/mouse-look-stuck-on-macos ... BUGZ-374: Fix Mac getting stuck in mouse look	2019-08-20 16:25:02 -07:00
Zach Fox	70b3f44f8c	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 14:04:35 -07:00
Anthony Thibault	2b74e2a7fa	Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes ... Avatar sitting bug fixes	2019-08-20 11:09:25 -07:00
RebeccaStankus	e48e733343	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 09:01:18 -07:00
Shannon Romano	1569c4049f	Merge pull request #16069 from SimonWalton-HiFi/nonverified-avatar-more-robust ... BUGZ-1247: Better handling of other-avatar verify-failed appearance	2019-08-19 17:32:27 -07:00
Zach Fox	083470e4fe	Ensure that geometryChanged is emitted after docked widget is resized	2019-08-19 16:48:40 -07:00
Ryan Huffman	8097ecef11	Fix cmd-leftclick not working correctly on Mac OS ... On Mac OS, Cmd+LeftClick is treated as a RightClick (more specifically, it seems to be Cmd+RightClick without the modifier being dropped). Starting in Qt 5.12, only on Mac, the MouseButtonRelease event for these mouse presses are sent to the top level QWidgetWindow, but are not propagated further. The change here gets around this problem by capturing these pseudo-RightClicks, and re-emitting them as "pure" RightClicks.	2019-08-19 15:53:20 -07:00
Zach Fox	14a04dfb1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 13:52:35 -07:00
Zach Fox	ca2cdfc533	Fix some engine bugs that fix muted state in all UIs including simplifiedUI	2019-08-19 11:13:11 -07:00
Simon Walton	150b4e45d4	More robust handling of the avatar verify-failed property	2019-08-16 17:30:28 -07:00
Zach Fox	c13697803d	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-16 12:14:44 -07:00
Anthony J. Thibault	381f7c6bc4	Avatar sitting bug fixes ... * Added seatedToIdle transition, to make transition quicker to better match the capsule physics. * Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms. * Created "isNotSeated" anim var for exiting the seated state. * MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called. * MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation. Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing. * Disable leg IK in HMD mode while seated.	2019-08-16 10:57:03 -07:00
Simon Walton	85da916a3b	Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown ... BUGZ-984: Wait for client entity-scripts to unload when shutting down	2019-08-16 10:12:38 -07:00
Zach Fox	92c5ca2d75	Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd	2019-08-16 09:58:44 -07:00
RebeccaStankus	c64da85344	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-16 09:11:03 -07:00
Zach Fox	a053f9ed9e	Impelement settingChanged; clean up some emoteIndicatorVisible code	2019-08-15 17:00:27 -07:00
Brad Hefta-Gaub	b0b406adda	Merge pull request #16015 from HifiExperiments/renderUpdate ... BUGZ-902: Drastically reduce locking and branching necessary for render updates	2019-08-15 09:35:17 -07:00
Simon Walton	9aacd136b8	Add blocking to script unload for client entity-scripts	2019-08-14 13:51:40 -07:00
RebeccaStankus	0645796e74	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-14 13:28:08 -07:00
RebeccaStankus	8728640f60	Initial CR changes	2019-08-14 12:03:49 -07:00
Sam Gateau	9a1e1a001a	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-13 10:00:59 -07:00
Zach Fox	a225a009cd	BUGZ-1233: Remove keyboard shortcut to LoD tools	2019-08-12 11:27:34 -07:00
Sam Gateau	53642763c9	Merge branch 'master' of https://github.com/highfidelity/hifi into toulouse	2019-08-11 21:57:36 -07:00
Shannon Romano	1011880698	Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation ... (BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away	2019-08-09 17:28:46 -07:00
sabrina-shanman	16593ec3c9	Remove invalid deprecated comment	2019-08-09 16:32:31 -07:00
sabrina-shanman	07ea79689e	Fix build warnings	2019-08-09 13:34:55 -07:00
Sam Gateau	fe08609b0c	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-09 11:25:03 -07:00
Brad Hefta-Gaub	555a875405	Merge pull request #16047 from jherico/fix/bugz-1097 ... BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs	2019-08-09 09:51:38 -07:00
Shannon Romano	1993ff6277	Merge pull request #15922 from SimonWalton-HiFi/min_threadpool_2 ... BUGZ-993: Bump minimum threadpool size to 2	2019-08-09 09:20:55 -07:00
Brad Davis	c28d850514	BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs	2019-08-09 08:13:20 -07:00
sabrina-shanman	99a774c89c	Do not display high viewing distance as 20:0 vision	2019-08-08 13:03:40 -07:00
sabrina-shanman	1571c2be27	Fix LOD math	2019-08-08 13:03:20 -07:00
sabrina-shanman	9c16fcfdef	Make the LOD half angle the definitive LOD variable	2019-08-07 17:23:04 -07:00
Sam Gateau	c01ab954e3	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-07 16:39:11 -07:00
Sabrina Shanman	0728df8a8f	Merge pull request #16025 from sabrina-shanman/picks_debug ... (BUGZ-1059) Improve debug API for picks/pointers	2019-08-07 12:01:26 -07:00
sabrina-shanman	66dbb08b01	Be explicit about pickType/pointerType being returned when getting script parameters	2019-08-07 10:44:43 -07:00
sabrina-shanman	4cb925e973	Fix jsdoc for getPointerScriptParameters	2019-08-07 10:04:44 -07:00
sabrina-shanman	8cde93973d	Disambiguate pick and pointer types in the returned properties	2019-08-07 09:56:23 -07:00
sabrina-shanman	0d5260bccc	More LOD renaming with focus on angles	2019-08-06 16:35:41 -07:00
sabrina-shanman	6db6890bac	Deprecate LODManager script properties: boundaryLevelAdjust and octreeSizeScale	2019-08-06 15:54:28 -07:00
sabrina-shanman	bc3acfa3c0	Clean up and re-name to reflect what uses octreeSizeScale and what uses ... visibilityDistance	2019-08-06 15:46:10 -07:00
Simon Walton	baa586939c	Merge branch 'master' into min_threadpool_2	2019-08-06 14:25:37 -07:00
Shannon Romano	93d5d9bd3f	Merge pull request #15988 from ctrlaltdavid/DOC-98 ... DOC-98, DOC-114: PlatformInfo API changes JSDoc	2019-08-06 13:22:36 -07:00
Shannon Romano	9e0e6f9d5e	Merge pull request #16003 from ctrlaltdavid/DOC-84 ... DOC-84: Update JSDoc with glTF	2019-08-06 13:22:04 -07:00
Shannon Romano	8c981140b0	Merge pull request #16005 from ctrlaltdavid/DOC-61 ... DOC-61: Render API JSDoc	2019-08-06 13:18:17 -07:00
jennaingersoll	f487d094fe	Merge pull request #15959 from ctrlaltdavid/DOC-124 ... DOC-124: Tidy JSDoc from some recent API changes	2019-08-06 11:57:28 -07:00
Shannon Romano	9d3d5b7701	Merge pull request #15992 from hyperlogic/feature/reaction-fixes ... Refined reaction and sitting animations	2019-08-06 09:15:44 -07:00
Sam Gateau	eb616452ec	An afternounwatchign code	2019-08-05 17:54:46 -07:00
David Rowe	1abf0eb207	Merge branch 'master' into DOC-124 ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp	2019-08-06 10:59:50 +12:00
Sam Gateau	3a053c32f4	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-05 14:26:18 -07:00
sabrina-shanman	30482c2db4	Give the pointer its own copy of the script parameters in case its pick is deleted	2019-08-05 13:36:15 -07:00
David Rowe	f97417932c	Fix typo	2019-08-06 08:08:08 +12:00
David Rowe	419044021b	Merge branch 'master' into DOC-61	2019-08-06 08:03:12 +12:00
Zach Fox	34bc71fba9	Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users	2019-08-05 15:12:29 -04:00
Sam Gateau	d55f143300	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-05 09:49:14 -07:00
Anthony J. Thibault	704a2d2ac9	Merge branch 'master' into feature/reaction-fixes	2019-08-05 09:43:32 -07:00
HifiExperiments	1b84244210	merge with master	2019-08-05 09:35:56 -07:00
sabrina-shanman	64fb046a33	Simplify naming for script functions to get list of picks/pointers	2019-08-05 09:25:32 -07:00
Kalila R	28b27a1e48	Merge branch 'v0.83.0-rc' into kasen/core	2019-08-03 15:27:23 -04:00
David Rowe	e2748a861a	Merge branch 'master' into DOC-98 ... # Conflicts: # libraries/platform/src/platform/backend/Platform.cpp	2019-08-03 11:22:23 +12:00
sabrina-shanman	20fa78e51d	Fix some dates and no newline at EOF	2019-08-02 16:13:07 -07:00
sabrina-shanman	f7c324c017	Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility	2019-08-02 16:10:39 -07:00
MiladNazeri	ae7b415152	Merge pull request #16008 from HifiExperiments/text ... Supporting text effects + fonts on Text Entities	2019-08-02 14:25:28 -07:00
MiladNazeri	76e9f8896c	Merge pull request #16021 from kencooke/audio-volume-control-persist ... BUGZ-352: Persist the audio volume settings across sessions	2019-08-02 10:34:44 -07:00
Bradley Austin Davis	543f07b6ae	Merge pull request #16018 from jherico/fix/dev-279 ... DEV-279: Add rendering API information to the platform JSON object	2019-08-02 10:16:06 -07:00
Sam	d84bebcc28	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-02 09:36:58 -07:00
Ken Cooke	437d0ea928	Save and restore the audio gain settings	2019-08-02 06:46:34 -07:00
David Rowe	789f9c7d67	Merge branch 'master' into DOC-124 ... # Conflicts: # interface/src/scripting/Audio.h	2019-08-02 20:34:09 +12:00
Shannon Romano	2f6d79fb45	Merge pull request #15920 from annabrewer/combine-tone-map-resample ... BUGZ-965: Standardize and shorten deferred/forward and desktop/android pipelines	2019-08-01 17:39:38 -07:00
Brad Davis	06ad461c32	PR feedback	2019-08-01 16:57:54 -07:00
Brad Davis	bfe42215aa	DEV-279: Add rendering API information to the platform JSON object	2019-08-01 14:29:03 -07:00
Sam	7948fb266e	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-07-31 11:46:09 -07:00
HifiExperiments	7b29f0f718	reduce locking necessary for render updates	2019-07-31 11:21:29 -07:00
humbletim	bad32e9916	remove unnecessary include	2019-07-30 17:33:48 -04:00
Seth Alves	8ec4505b95	add an on/off control for audio echo cancelation to Audio Settings page. It's not yet hooked to anything.	2019-07-30 14:09:32 -07:00
Andrew Meadows	54dc66bd5f	Merge pull request #16006 from jherico/fix/bugz-964-rc83 ... BUGZ-964: fix for incorrect color curve when rendering 3D into QML	2019-07-30 12:06:20 -07:00
Anna	f58400950a	made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility	2019-07-30 11:57:01 -07:00
Shannon Romano	fe900cf55f	Merge pull request #15991 from jherico/fix/bugz-964 ... BUGZ-964: fix for incorrect color curve when rendering 3D into QML	2019-07-30 11:52:58 -07:00
HifiExperiments	078ca7edea	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
Brad Davis	36b249d4dc	BUGZ-964: fix for incorrect color curve when rendering 3D into QML	2019-07-29 17:57:20 -07:00
David Rowe	833bbf1cce	Render API JSDoc	2019-07-30 11:36:56 +12:00
David Rowe	ade85ad8c0	Update API JSDoc with glTF	2019-07-30 10:41:07 +12:00
Shannon Romano	f29284198c	Merge pull request #15978 from roxanneskelly/bugz829 ... BUGZ-829 DEV-168 - domain backup/content management improvements	2019-07-29 15:28:49 -07:00
Amer	7bc0ea27d0	Merge pull request #15995 from amerhifi/master ... BUGZ 1029: changing raw pointer to unique pointer with custom deleter	2019-07-29 13:04:58 -07:00
Howard Stearns	b17e796f0f	Merge pull request #15994 from howard-stearns/steam-store-commerce ... steam gets the oculus store commerce treatment	2019-07-29 12:06:29 -07:00
Howard Stearns	d5d53afe67	Merge branch 'steam-store-commerce' of https://github.com/howard-stearns/hifi into steam-store-commerce-83	2019-07-29 12:04:03 -07:00
amer cerkic	85fa510d38	addressing comment	2019-07-29 10:28:31 -07:00
Shannon Romano	75146a104d	Merge pull request #15982 from sabrina-shanman/bug_lod_too-low ... (BUGZ-1040) Fix LOD randomly being too low in simplified UI	2019-07-29 09:45:19 -07:00
amer cerkic	b3ea9d0de7	addressing commetn	2019-07-29 09:40:58 -07:00
amer cerkic	854f89cace	addressing comment	2019-07-29 09:39:31 -07:00
amer cerkic	1f4b149f75	Merge branch 'master' of https://github.com/highfidelity/hifi	2019-07-29 09:36:03 -07:00
Sam	767f413a2c	merging the various job/task/switch congif into one	2019-07-29 00:07:16 -07:00
Anna	6a6b2f6d27	added tone mapping back	2019-07-26 18:55:08 -07:00
Anthony J. Thibault	2f949a4d4d	Disable head ik while reacting ... Also, split getReactions() API into two calls * getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction(). * getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().	2019-07-26 15:26:43 -07:00
amer cerkic	de0b038ee1	trunked to a lambda for simplicity	2019-07-26 13:52:38 -07:00
Anthony Thibault	5375e53ecb	Merge pull request #15974 from luiscuenca/avatarSitAPI ... DEV-269: First Class Sitting API	2019-07-26 13:36:00 -07:00
amer cerkic	087b19d64d	removed extra space	2019-07-26 13:15:01 -07:00
amer cerkic	b2e07fd990	changing raw pointer to unique pointer with custom deleter	2019-07-26 13:02:59 -07:00
Howard Stearns	6ef0821801	steam gets the oculus store commerce treatment	2019-07-26 12:44:48 -07:00
Oren Hurvitz	d7ef7a052d	The "Clear Disk Caches" command also deletes the HTTP cache used by QtWebEngine ... Note that this only clears the HTTP cache (used for files), but not the directory used for persistent data such as Cookies, Local Databases, etc. There's no Qt API to do that. Fortunately, this directory should be small.	2019-07-26 15:28:44 +03:00
Oren Hurvitz	dbd9299e85	The "Clear Disk Caches" command also clears the KTX cache (on the next restart)	2019-07-26 10:30:43 +03:00
humbletim	058c81aa1a	Merge branch 'hifi-master' into kpi-v1-modkit-rc	2019-07-26 01:36:52 -04:00
humbletim	d334a2e5e2	QML-only write access for 'private/' Settings keys	2019-07-26 01:32:01 -04:00
Brad Davis	11d7890f48	BUGZ-964: fix for incorrect color curve when rendering 3D into QML	2019-07-25 18:24:53 -07:00
luiscuenca	c1b818cd9b	Set timeout before enabling drive keys	2019-07-25 17:40:09 -07:00
sabrina-shanman	3da5896e22	Bring back lodQualityLevel	2019-07-25 17:16:14 -07:00
sabrina-shanman	94e725dc2a	Fix rare case where script would fail to set LOD after disabling auto LOD	2019-07-25 17:15:28 -07:00
sabrina-shanman	4b5a45209e	Prefer using LODManager.lodAngleDeg for setting manual LOD	2019-07-25 17:15:22 -07:00
Ryan Huffman	ef0977248d	Merge pull request #15986 from huffman/fix/create-not-working-patch ... Fix non-functional Create	2019-07-25 16:17:43 -07:00
David Rowe	0555cf1804	Revisions and typos	2019-07-26 10:50:53 +12:00
David Rowe	bce3e9bd6b	PlatformInfo API JSDoc update	2019-07-26 10:32:19 +12:00
Roxanne Skelly	130e68c9b5	DEV-168 - make interface-installed content sets display info on web ... installed content section	2019-07-25 14:37:41 -07:00
Ryan Huffman	9872c1c2f7	Add missing emit inside of	2019-07-25 13:55:44 -07:00
Howard Stearns	520ba59899	Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown ... BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor	2019-07-25 12:50:07 -07:00
sabrina-shanman	3a4ce44633	On second thought, do not expose default octree size scale	2019-07-24 17:32:25 -07:00
sabrina-shanman	772eb57898	Remove broken/undocumented LODManager script features	2019-07-24 16:43:51 -07:00
sabrina-shanman	9d93a2f502	Fix simplifiedUI stuck on wrong LOD value	2019-07-24 16:27:24 -07:00
amer cerkic	db945851ac	fixed merge conflict	2019-07-24 16:03:23 -07:00
amer cerkic	3315271493	reverting commit:	2019-07-24 15:43:31 -07:00
Anthony Thibault	abeba03a7e	Merge pull request #15975 from huffman/fix/interactive-window-qmlto-script-crash ... BUGZ-1028: Fix qmlToScript getting called on script thread and causing crash	2019-07-24 15:39:25 -07:00
Simon Walton	53cf915e8d	Guard for AudioInjectorManager existance; clear an audio interface pointer	2019-07-24 14:51:41 -07:00
amer cerkic	bea31237b7	addressing comments	2019-07-24 14:30:43 -07:00
Ryan Huffman	c4b63ed5e4	Fix qmlToScript getting called on script thread and causing crash	2019-07-24 13:44:20 -07:00
luiscuenca	8900c4f2cd	stand up to right location-orientation	2019-07-24 13:29:01 -07:00
luiscuenca	6e4d1bde8e	Fix code and warnings	2019-07-24 13:16:53 -07:00
amer cerkic	f94b082946	addressing comment	2019-07-24 11:47:10 -07:00
amer cerkic	ac17493a40	removing comments	2019-07-24 11:37:38 -07:00
amer cerkic	8c022b025d	implementing Dante's change to connect the slots	2019-07-24 11:19:32 -07:00
luiscuenca	015d1951fc	Add sitting clip node	2019-07-24 10:44:33 -07:00
amer cerkic	ddc678bbc0	added interactivewindow proxy. moved event bridge binding to the proxy instead	2019-07-23 16:57:53 -07:00
luiscuenca	e7e864121f	Merge branch 'master' into avatarSitAPI	2019-07-23 14:22:42 -07:00
luiscuenca	9cec979552	Add sit API to MyAvatar	2019-07-23 14:20:54 -07:00
Shannon Romano	266230a53c	Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api ... Initial version of Avatar Reaction API	2019-07-23 13:13:31 -07:00
jennaingersoll	1e84b3f4a2	Merge pull request #15951 from ctrlaltdavid/DOC-122 ... DOC-122: LocationBookmarks JSDoc	2019-07-23 12:00:03 -07:00
David Rowe	8c92f972e5	Merge branch 'master' into DOC-124 ... # Conflicts: # interface/src/scripting/Audio.h	2019-07-23 12:53:35 +12:00
David Rowe	3b2bb65c77	Tidy MyAvatar API's animation debug graphics methods' JSDod	2019-07-23 12:42:41 +12:00
David Rowe	6b80a27258	Tidy Audio API's gain properties etc. JSDoc	2019-07-23 11:26:48 +12:00
Shannon Romano	4f922e350e	Merge pull request #15913 from ctrlaltdavid/DOC-102 ... DOC-102: Overlays JSDoc Update	2019-07-22 16:24:53 -07:00
Shannon Romano	1594e25c4e	Merge pull request #15950 from ctrlaltdavid/DOC-121 ... DOC-121: AvatarBookmarks JSDoc	2019-07-22 15:43:57 -07:00
David Rowe	1e8a205275	Fix typo	2019-07-23 10:30:10 +12:00
Shannon Romano	6d0ba98bfc	Merge pull request #15953 from ctrlaltdavid/DOC-123 ... DOC-123: AvatarInputs JSDoc	2019-07-22 15:21:50 -07:00
Shannon Romano	d719952022	Merge pull request #15946 from AndrewMeadows/avoid-nan-scriptedMotor ... BUGZ-870: MyAvatar's scripted motor needs to filter against NaN input	2019-07-22 15:06:35 -07:00
David Rowe	a36bcbb2ed	Doc review	2019-07-23 07:36:11 +12:00
David Rowe	ddffb8ab9a	Doc review	2019-07-23 07:25:34 +12:00
jennaingersoll	abe1ce288c	Merge pull request #15926 from ctrlaltdavid/DOC-115 ... DOC-115: Comfort mode JSDoc	2019-07-22 10:46:11 -07:00
David Rowe	6d7b6f3e0a	AvatarInputs JSDoc	2019-07-20 10:19:22 +12:00
David Rowe	3a3bfd1463	Doc review	2019-07-20 09:39:34 +12:00
David Rowe	0a32386f45	Merge branch 'master' into DOC-102	2019-07-20 09:13:52 +12:00
Zach Fox	d62dde1ab8	Merge pull request #15952 from zfox23/setShowBubbleToolsCorrection ... Fix BUGZ-1062: Set the correct Settings value for bubble tools	2019-07-19 11:51:59 -07:00
Zach Fox	510c922912	Fix BUGZ-1062: Set the correct Settings value for bubble tools	2019-07-19 11:34:14 -07:00
David Rowe	9165a04641	Typo and improvement	2019-07-19 11:41:12 +12:00
David Rowe	c2b67f28d0	LocationBookmarks JSDoc	2019-07-19 11:35:06 +12:00
David Rowe	cf9e563458	Miscellaneous JSDoc fixes noticed in passing	2019-07-19 08:37:10 +12:00
David Rowe	a04da70f16	AvatarBookmarks JSDoc	2019-07-19 08:36:45 +12:00
Andrew Meadows	dcf3df68f2	avoid NaN input for MyAvatar's scripted motor	2019-07-18 10:58:41 -07:00
Andrew Meadows	7b7414dead	revert optimization that would skip read from packet	2019-07-17 17:04:12 -07:00
Anthony Thibault	ecae92724e	Added reaction api	2019-07-17 14:28:39 -07:00
Andrew Meadows	63b3d666f9	simplify rollover logic for SafeLanding sequence size calculation	2019-07-17 13:57:08 -07:00
Andrew Meadows	b0f297e696	wait for SafeLanding to start before starting octreeQuery	2019-07-17 11:22:01 -07:00
Andrew Meadows	05d896f3de	fix SafeLanding failure mode when first sequence number not 0	2019-07-17 11:22:01 -07:00
Shannon Romano	d49fabf370	Merge pull request #15932 from SimonWalton-HiFi/remove-orb-on-kill ... BUGZ-781: Remove loading-orb upon killing of avatar	2019-07-16 15:31:37 -07:00
dante ruiz	e896a53113	fix interactive crash	2019-07-15 17:18:38 -07:00
Shannon Romano	3f7e5a48bb	Merge pull request #15533 from sethalves/squeeze-vision-while-moving ... Case 21663: comfort mode	2019-07-15 14:54:31 -07:00
Simon Walton	e259aa55c2	Remove loading-orb upon killing avatar, in case destructor isn't called	2019-07-15 14:14:24 -07:00
Shannon Romano	a64bc7f638	Merge pull request #15761 from danteruiz/fix-interactive-window-crash ... BUGZ-400: Crash in Application::notify	2019-07-15 11:35:15 -07:00
Shannon Romano	7ea8675e83	Merge pull request #15919 from howard-stearns/mac-sleep-monitor ... Mac sleep monitor	2019-07-15 08:39:19 -07:00
Shannon Romano	09729fb430	Merge pull request #15918 from zfox23/newGraphicsSettings ... New Settings -> Graphics... dialog for Classic UI users	2019-07-15 08:38:01 -07:00
Shannon Romano	1bc72a86da	Merge pull request #15911 from amerhifi/bugz-968 ... case Bugz-968 adding a null check to the display plugin. Possible that display plug…	2019-07-15 08:35:29 -07:00
Shannon Romano	8ce64d95ab	Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux ... BUGZ-863: wait for objects to be added to physics before completing SafeLanding	2019-07-15 08:34:17 -07:00
kasenvr	e9e9607a3b	modkit core changes initial commit ... whitespace corrections + warnings updated cmake plugin rework with focus on JS API integration example cleanup edit_filter scope separate-out edit_filter wantsScope stuff -plugin metadata split scriptengines out separately cleanup __url/__filename sets additional cleanup fix typo; consolidate ScriptInitializerMixin inits add more example API protoypes cleanup pass; fix entity_server / agent init fix whitespace remove technically unnessary plugin filtering +EDIT_FILTER_SCRIPT; cleanup reorder public/slot/private use std::count_if formatting better debug output; cleanup fix msvc compiler warning cleanup eradicate QtScript references from API Example updated header comments Updated KasenAPIExample	2019-07-14 21:35:13 -04:00
David Rowe	8a82ea55c7	HMD API vision squeeze properties JSDoc	2019-07-13 10:39:40 +12:00
dante ruiz	d78661a47f	redo requested work	2019-07-12 13:34:08 -07:00
SamGondelman	60600779c9	merge with master	2019-07-12 11:01:17 -07:00
amerhifi	ba6307e8e4	revert of extra space	2019-07-12 10:55:44 -07:00
amerhifi	f78c1cb5d0	reverting display plugin reset change	2019-07-12 10:54:08 -07:00
Howard Stearns	7ce6dd71d5	fix comment	2019-07-12 10:48:05 -07:00
Simon Walton	33494d7477	Bump minimum threadpool size to 2	2019-07-12 10:30:52 -07:00
Shannon Romano	74b830dd12	Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen ... BUGZ-918: Generate RSA key-pair early in start-up	2019-07-12 09:42:11 -07:00
Shannon Romano	3e70f4f51c	Merge pull request #15671 from SamGondelman/uber ... DEV-203, BUGZ-978: Condense all redundant shader variants using new slp defines feature and add Haze to Forward renderer	2019-07-12 09:39:33 -07:00
Seth Alves	9baf4c7078	comfort mode -- squeeze vision to avoid sickness	2019-07-12 09:14:17 -07:00
howard-stearns	cc7214fca3	cleanup	2019-07-11 16:56:35 -07:00
Dante Ruiz	2f74f8253f	finishing requested changes	2019-07-11 15:39:59 -07:00
howard-stearns	2eb3fdb1ec	Merge branch 'master' of https://github.com/highfidelity/hifi into mac-sleep-monitor	2019-07-11 14:35:00 -07:00
amer cerkic	15e7663ed5	removing the destroy call since its not necessary	2019-07-11 14:27:41 -07:00
SamGondelman	22a7a97a9a	fix forward web + parabola blending	2019-07-11 12:23:04 -07:00
amer cerkic	efccd10a65	adding a destroy call to hmd scripting interface to ensure that it does not call isHmd mode on already dead display plugin. Also moved displayplugin reset below ui destroy calls to make sure it does not get called after its been destroyed	2019-07-11 12:15:15 -07:00
PrestonB1123	07c71cbadb	disabled P shortcut and re-enabled in metaverse	2019-07-11 12:05:15 -07:00
Zach Fox	ce2b7e5baa	Finish all of the logic and most of the layout	2019-07-11 12:05:13 -07:00
howard-stearns	8d3dc52ac0	mac sleep monitor checkpoint	2019-07-11 10:58:31 -07:00
Zach Fox	2471a3eb72	Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings	2019-07-11 09:02:42 -07:00
SamGondelman	d545ba5bc6	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
David Rowe	2cb3425740	Merge branch 'master' into DOC-102	2019-07-11 16:38:23 +12:00
David Rowe	a45d8924fa	Miscellaneous minor JSDoc fixes noticed in passing	2019-07-11 16:31:09 +12:00
David Rowe	46c81b268a	Typos and inconsistencies	2019-07-11 16:29:56 +12:00
David Rowe	e1f181e8ee	Update Overlays events and signals JSDoc	2019-07-11 16:15:24 +12:00
David Rowe	42bee63f52	Update Overlays methods JSDoc	2019-07-11 15:33:45 +12:00
dante ruiz	c4a0b39068	requested changes	2019-07-10 17:56:54 -07:00
Simon Walton	645a99c200	Generate RSA key-pair early in start-up	2019-07-10 17:36:25 -07:00
Zach Fox	4caa00d6cc	Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface	2019-07-10 16:42:48 -07:00
Amer	4c145386e5	Merge pull request #15899 from amerhifi/bugz-907 ... Case bugz-907: On launch default to non hmd device	2019-07-10 16:03:29 -07:00
Andrew Meadows	1a5a925a4c	fix a typo	2019-07-10 14:18:34 -07:00
amer cerkic	e463a828ef	removed extra line	2019-07-10 14:09:51 -07:00
amer cerkic	bc51b8e709	removed extra space	2019-07-10 14:08:20 -07:00
amer cerkic	fc21f6088a	undoing code structures changes to else blocks	2019-07-10 14:07:10 -07:00
dante ruiz	7c024b4e8a	fix interactive window crash	2019-07-10 11:49:36 -07:00
Shannon Romano	f235778a6e	Merge pull request #15866 from huffman/feat/override-default-scripts ... DEV-164: Add defaultScriptsOverride option	2019-07-10 10:16:55 -07:00
Andrew Meadows	2da0714e36	comments and more readable code	2019-07-09 15:51:56 -07:00
Andrew Meadows	1bfd5386a9	restore entity->requestRenderUpdate() in SafeLanding::updateTracking()	2019-07-09 15:51:56 -07:00
Andrew Meadows	520c62f6f6	wait for objects added to physics before stop SafeLanding	2019-07-09 15:51:56 -07:00
Zach Fox	4dfbc489e8	Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype	2019-07-09 15:40:16 -07:00
SamGondelman	bd2003fa01	Merge remote-tracking branch 'upstream/master' into uber	2019-07-09 13:45:14 -07:00
RebeccaStankus	169b15c985	Merge branch 'master' of github.com:highfidelity/hifi into createAgain	2019-07-09 13:03:08 -07:00
RebeccaStankus	714a3f6b08	Fixed path to tabletAssetServer in HMD, simplifiedUI system folder	2019-07-09 13:02:54 -07:00
amer cerkic	09ecb49e5b	--no-launcher is the launcher override for interface. if app is launched with the args, the first run is bypassed and default display device will always be desktop. not hmd	2019-07-09 11:39:42 -07:00
amer cerkic	45b339a6c7	removing comment	2019-07-09 09:35:58 -07:00
amer cerkic	d04a06e757	changing the default fallback to non hmd device	2019-07-09 09:33:44 -07:00
Howard Stearns	7aef864d7f	Merge pull request #15898 from howard-stearns/log-windows-wakeup ... log wakeup (on client and report to DS) during connection on Windows	2019-07-09 09:29:57 -07:00
Amer	749a78680d	Merge pull request #15877 from amerhifi/bugz-690 ... case BUGZ-690 & BUGZ382 : adding a null check escape to the activeItem. On right click back to …	2019-07-09 09:17:30 -07:00