31259 commits

Author	SHA1	Message	Date
Kasen IO	872a0b4496	Updated application version to 86.	2019-12-01 20:04:00 -05:00
Kasen IO	0b46c53df1	Merge branch 'kasen/core' into v0860-kasen-release+freshstart	2019-12-01 19:59:59 -05:00
David Rowe	91581ef3c5	Update JSDoc	2019-12-01 21:59:47 +13:00
David Rowe	200ff2499e	Include localVelocity etc. to match Entity.getEntityProperties()	2019-12-01 21:24:40 +13: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
David Rowe	3ebceff428	Doc review	2019-11-28 12:42:35 +13:00
Zach Fox	8be866ebbb	DEV-2840: Fix z-fighting issues in Smartboard and enable quicker positional iteration in the future	2019-11-26 18:10:21 -05:00
HifiExperiments	69714a89ca	material entities support cullFaceMode and support gltf doubleSided	2019-11-26 14:48:48 -08:00
Zach	7b49542a4d	Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode	2019-11-26 14:16:09 -05:00
David Rowe	46c389f064	Tidying	2019-11-26 15:19:54 +13:00
David Rowe	d797e33123	Stats JSDoc	2019-11-26 13:39:00 +13:00
milad	8b6df032e4	forgot a slash	2019-11-25 14:40:38 -08:00
milad	a38e0007f8	trying to go back several directories for the mac build	2019-11-25 13:32:48 -08:00
Zach Fox	5787b2f737	Merge branch 'master' of github.com:highfidelity/hifi into moreScreenshareBugs	2019-11-25 13:16:17 -05:00
Shannon Romano	85cea1fcb6	Merge pull request #16533 from ctrlaltdavid/DEV-2800 ... DEV-2800: Fix crash in Stats.forceUpdateStats() at start-up	2019-11-25 09:04:30 -08:00
Anthony Thibault	edfad97b64	Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin ... Input plugin for streaming blendshapes from an iPhone	2019-11-23 11:49:51 -08:00
David Rowe	b458a746b7	Fix crash in Stats.forceUpdateStats() at start-up	2019-11-23 15:23:57 +13:00
Anthony J. Thibault	98c951702d	Added DEFAULT_GAZE_DISTANCE constant	2019-11-22 09:29:21 -08:00
Anthony J. Thibault	404d1a3c93	Fix several bugs for eye tracking from input plugins to function	2019-11-21 17:57:44 -08:00
Zach	e7091245b3	Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode	2019-11-21 15:38:28 -08:00
DouglasWilcox	b8d7f50eaf	Put away animation into resource and update script to use local resource path.	2019-11-21 14:50:05 -08:00
Anthony J. Thibault	9d6ce44131	Head is now computed in proper sensor space ... Eye tracking now works.	2019-11-20 15:30:16 -08:00
Shannon Romano	37a46d91fa	Merge pull request #16513 from DouglasWilcox/Fix_seated_rotation_edge_case_bounce ... Edge case fix for seated rotation - it would bounce forward if you let go of Q/E at exact right time.	2019-11-20 09:27:36 -08:00
DouglasWilcox	19aacde3a2	Fix case where Avatar could get stuck facing camera if rotating camera quickly and avatar faced backward.	2019-11-19 14:32:51 -08:00
Brad Hefta-Gaub	3b9c997317	Merge pull request #16505 from luiscuenca/zoomAndOrbitCamUsingTouchPad ... Touchpad improvements: pinch to zoom camera, two finger swipe to look around, bug fixes	2019-11-19 13:30:45 -08:00
Anthony J. Thibault	befbdcef48	Upgraded OSC plugin with changes from ARKit blendshape work.	2019-11-19 13:13:56 -08:00
milad	8676eaf0a0	removed additional signal	2019-11-19 13:04:27 -08:00
DouglasWilcox	8ccdfaf220	Clamp rotation velocity if hit trigger angle, but only bounce forward if cameraYaw is true.	2019-11-19 12:05:25 -08:00
Brad Hefta-Gaub	63b21af562	Merge pull request #16506 from ctrlaltdavid/DEV-2764 ... DEV-2764, DEV-2113: Remove Avatar app links to AvatarIsland and BodyMart	2019-11-19 12:05:10 -08:00
Brad Hefta-Gaub	69af66195c	Merge pull request #15334 from SaracenOne/screen_name_at_signup_push ... case 22189: Add display name field to the log in screen.	2019-11-19 12:02:31 -08:00
jennaingersoll	451ffcd1e0	Merge pull request #16492 from jennaingersoll/jsdoc-revisions ... DOC-208: Revisions to JSDoc added by developers since July 2019	2019-11-19 11:01:18 -08:00
Zach Fox	f07f81e976	Merge pull request #16510 from MiladNazeri/dev-2791/update-hardcoded-screen-values ... dev-2791/update-hardcoded-screen-values	2019-11-19 10:46:36 -08:00
Brad Hefta-Gaub	0f428f0afb	Merge pull request #16498 from DouglasWilcox/improve_seated_rotation ... Improve seated rotation	2019-11-19 10:22:08 -08:00
milad	0d713fcc8d	new values for position and dimensions	2019-11-19 10:12:17 -08:00
ingerjm0	d2118f0aac	DOC-208 revisions	2019-11-18 20:05:08 -08:00
Sabrina Shanman	359248829c	Merge pull request #16197 from highfidelity/instancing ... (DEV-430) Instancing: Introduce hfm::Shape to enable Instancing support	2019-11-18 16:40:10 -08:00
Zach Fox	73590d2570	Fix DEV-2789: Implement retry timer when retrieving screen share info	2019-11-18 15:13:51 -08:00
Sabrina Shanman	518d6a530a	Merge pull request #16507 from highfidelity/master ... Merge master into instancing	2019-11-18 13:54:33 -08:00
David Rowe	60d2845953	Remove further related dead code	2019-11-19 10:31:54 +13:00
David Rowe	748999b8d6	Remove reference to BodyMart in Avatar app	2019-11-19 09:59:59 +13:00
David Rowe	a912e97f1e	Remove reference to AvatarIsland in Avatar app	2019-11-19 09:53:58 +13:00
Sam Gateau	048626ba9a	Merge pull request #15278 from kitely/clear-more-disk-caches ... case 21983: Clear more disk caches	2019-11-18 11:11:26 -08:00
Sam Gateau	6370059a96	Merge pull request #16483 from AndrewMeadows/debug-workload-selection ... Add tools for debugging entity workload proxies	2019-11-18 11:02:00 -08:00
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
DouglasWilcox	fb289704e2	iterate the turns, and make turning accessible from fidgets	2019-11-14 16:07:51 -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
DouglasWilcox	b8e85aedc7	Merge branch 'master' into improve_seated_rotation	2019-11-13 13:11:30 -08:00
milad	c6c9059a29	Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp	2019-11-13 13:06:12 -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
milad	abf592f533	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-13 10:14:14 -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
Anthony J. Thibault	b92badbe76	Updated avatar-animation-optimized-ik.json from latest avatar-animation.json	2019-11-13 08:23:27 -08:00
Anthony J. Thibault	b4c4d81bd1	Merge branch 'master' into bug-fix/android-t-pose	2019-11-13 08:21:19 -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
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
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
milad	ae35ec0975	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-11 16:42:55 -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
Shannon Romano	75ba65c2c9	Merge pull request #16467 from DouglasWilcox/rand_settles_and_by_momentum ... Different settle transition depending on momentum	2019-11-11 10:48:57 -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
dooglifeSF	055d5cdf9b	Simplify boolean statements, revise several settle anims	2019-11-08 13:46:38 -08:00
milad	b206c102e8	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-08 12:19:06 -08:00
dooglifeSF	02045a9fdf	add random versions of full sized settle	2019-11-08 11:57: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
dooglifeSF	8e11d91c03	Merge branch 'master' into rand_settles_and_by_momentum	2019-11-07 15:09:10 -08:00
dooglifeSF	73202b9caf	Different settle transition depending on momentum	2019-11-07 09:52:26 -08:00
milad	dd1795e9b6	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-07 09:33:47 -08:00
Shannon Romano	4484ef095c	Merge pull request #16464 from DouglasWilcox/seated_fidgets_less_fidgety ... Reduce fidgety motions in seated fidgets	2019-11-07 09:09:05 -08:00
milad	4b06e429d2	Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp	2019-11-06 17:43:38 -08:00
Zach Fox	c8464786e7	Steps closer...	2019-11-06 17:16:21 -08:00
milad	fa8d5e57d1	Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp	2019-11-06 15:48:24 -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
Shannon Romano	10a1ee24e8	Merge pull request #16462 from zfox23/removeHomeIcon ... DEV-2701: Remove the home icon from the profile app	2019-11-06 15:34:18 -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
dooglifeSF	15b935b491	remove jitter and bounce from several seated idles and fidgets, also reduce look-around cone	2019-11-06 13:08:42 -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
Zach Fox	ca8a61f085	DEV-2701: Remove the home icon from the profile app	2019-11-06 11:11:57 -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
Zach Fox	683c3f1300	An experiment with the top bar. Will you notice?	2019-11-05 09:33:11 -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
Shannon Romano	2b25dd30d2	Merge pull request #16424 from RebeccaStankus/consoleText ... Specified color on text edit for console	2019-10-30 09:15:27 -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
Rebecca Stankus	9c0003515a	Specified color on text edit for console	2019-10-29 15:46:16 -07:00
amerhifi	ddfbb55e19	fixed old ui filtering of audio devices	2019-10-29 15:36:43 -07: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 Thibault	4341da03c5	Merge pull request #16419 from luiscuenca/lookAtFixes ... DEV-2285: Fix look at update and allow to release control	2019-10-29 12:56:22 -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
Rebecca Stankus	b8d6a2cf0b	Added extra attempt to parent interactive window content on creation	2019-10-29 11:20:14 -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
Zach Fox	bda1e3f696	Merge pull request #16398 from RebeccaStankus/grayEmoteWindow ... Gray emote window	2019-10-28 11:37:17 -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
Rebecca Stankus	9a8fda2705	Feedback changes	2019-10-24 12:07:34 -07:00
Rebecca Stankus	f8102be74d	Added a timeout to update the content holder parent after interactive window has finished loading	2019-10-24 12:07:25 -07:00
Rebecca Stankus	8e8c157567	Debugging stuff	2019-10-24 12:07:20 -07:00
Rebecca Stankus	83a6155592	Added tons of logging to debug interactive window	2019-10-24 12:06:49 -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
Zach Fox	a6bcbe4c66	DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial	2019-10-23 14:32:03 -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
Zach Fox	1b24f61dd9	Merge pull request #16395 from zfox23/menuInstanceCheck ... DEV-2498: Fix a crash in MenuScriptingInterface	2019-10-23 13:42:45 -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
Zach Fox	df782edcd9	DEV-2541: Update 'Jump To' top bar expanded text	2019-10-23 11:14:22 -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
dooglifeSF	b8a607dcf0	remove unused slow speed sidesteps	2019-10-22 11:53:59 -07: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
dooglifeSF	b914bb60fe	Change strafeleft<->straferight transitions to isMoving vars and remove the sidesteps from the blendranges	2019-10-21 14:15:31 -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	71ef645781	Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed ... Fix sliding when stopping from run.	2019-10-16 09:03:00 -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
dooglifeSF	a043f0a17e	Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s	2019-10-15 14:51:42 -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
Sabrina Shanman	b8df1c180f	Merge pull request #16343 from jherico/fix/DEV-2375 ... DEV-2375: ensure web entities stop playing audio	2019-10-14 13:04:57 -07:00
Zach Fox	341abb8185	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-14 12:36:35 -07:00
Brad Davis	6c35387b8d	also fix DEV-2083	2019-10-14 10:56:23 -07:00
Brad Davis	95b5c8a905	DEV-2375: ensure web entities stop playing audio	2019-10-14 10:46:32 -07:00
luiscuenca	505813b3c3	Fix blink async and other is talking bug	2019-10-14 10:44:55 -07:00
Zach Fox	c8b975b2f1	Merge pull request #16342 from zfox23/newInvalidatedLanguage ... DEV-2334: New 'Item Invalidated' language in Inventory	2019-10-14 13:28:33 -04:00
Zach Fox	b45156b44c	Merge pull request #16337 from RebeccaStankus/locationText ... Added blank placeholder text on focus to text field	2019-10-14 12:35:29 -04:00
Zach Fox	7bd550e37b	DEV-2334: New 'Item Invalidated' language in Inventory	2019-10-14 09:30:44 -07:00
Maia Hansen	db75d03f76	Merge pull request #16332 from highfidelity/Fix-stand-talk-pops ... Fix stand talk pops	2019-10-11 15:51:00 -07:00
Rebecca Stankus	21503137d4	Added blank placeholder text on focus to text field	2019-10-11 14:42:39 -07:00
Sam Gateau	93e266cde5	Merge pull request #16333 from highfidelity/revert-16307-colossal-cave ... Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 13:13:55 -07:00
Brad Hefta-Gaub	51669e1ac3	Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 11:06:10 -07:00
dooglifeSF	96510429ba	Fix stand talking pops	2019-10-11 10:44:50 -07:00
dooglifeSF	df11977b39	remove all transitions from seated except idle via isNotSeated	2019-10-11 09:54: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
Zach Fox	2220234d68	Removed yellow	2019-10-09 14:33:28 -07:00
Zach Fox	bed1192d70	A bunch of fixes, plus added a debug mode Settings switch	2019-10-09 14:18:36 -07:00
Zach Fox	601f7ac5e9	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-09 13:26:21 -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
Zach Fox	5871e6b83a	Host avatars remotely	2019-10-08 17:39:57 -04:00
luiscuenca	68e287628c	Fix eye look at forward vector	2019-10-08 14:39:27 -07:00
Zach Fox	17478af32d	Remove debug code	2019-10-08 17:31:35 -04: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
Zach Fox	42bf2bf30e	All windows 'done' except for final tweaks; debug mode still ON	2019-10-08 13:17:04 -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
Zach Fox	a23bee19e8	Controls screen done	2019-10-07 19:52:22 -04: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
Zach Fox	643dd21f86	Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration	2019-10-07 13:22:08 -04:00
Sam Gateau	42bc91b389	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-07 09:42:14 -07:00
Shannon Romano	3db915c432	Merge pull request #16275 from dooglifeSF/sit_variants_and_fidgets ... Sit variants and fidgets	2019-10-07 09:14:38 -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
dooglifeSF	37afabe866	Merge branch 'master' into sit_variants_and_fidgets	2019-10-04 10:29:15 -07:00
Sam Gateau	c7ca431296	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-04 10:00:41 -07:00
RebeccaStankus	2f2b7b0306	Ready for CR Thank you Zach	2019-10-03 17:30:47 -07:00
luiscuenca	e0d0ec5852	Fix isInAir so takes into account the new seated state:	2019-10-03 10:36:23 -07:00
Zach Fox	b23aecf6c5	Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction	2019-10-03 10:12:58 -07:00
Zach Fox	33b8942ffd	Changes to Avatar/Profile App complete	2019-10-03 09:41:30 -07:00
dooglifeSF	ebd0b06475	animation revisions after checking them in a standup group	2019-10-02 17:18:36 -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
RebeccaStankus	47841d9bcd	Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction	2019-10-02 12:42:53 -07:00
RebeccaStankus	dc15b55aa5	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-02 12:05:34 -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
Zach Fox	50b06a40d7	Improved random avatar selection logic, plus local avatars	2019-10-01 17:22:24 -07:00
amer cerkic	c0a852d68c	updated audio wording and removed audio defaul spamming.	2019-10-01 16:55:37 -07:00
dooglifeSF	86e67afe34	Merge branch 'master' into sit_variants_and_fidgets	2019-10-01 16:52:17 -07:00
dooglifeSF	0ab4075c3b	sit idles and idle fidgets with json edits	2019-10-01 16:51:10 -07:00
RebeccaStankus	d2e62749c7	Ready for Zach to add default avatar changes	2019-10-01 16:36:06 -07:00
luiscuenca	09f0222285	Restore previous control keys for free camera	2019-10-01 14:18:46 -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
RebeccaStankus	3167dc9a35	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-01 09:59:14 -07:00
RebeccaStankus	0dfb234089	Finished UI, ready for CR	2019-10-01 09:58:44 -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
Anthony Thibault	7ee5b8e229	Merge pull request #16252 from dooglifeSF/emotes_revisions_per_feedback ... Emotes revisions per feedback	2019-09-30 15:46:50 -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
RebeccaStankus	68f52584cf	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-09-30 09:19:15 -07:00
Sam Gateau	c8663f7fe6	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-30 09:18:23 -07:00
David Rowe	cd6d9b57c4	Fix Blocks script displaying a blank page	2019-09-28 11:30:56 +12: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
RebeccaStankus	de4e8b9cc4	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-09-27 09:16:26 -07:00
RebeccaStankus	f4ecd3dcd8	Working on initial/second launch	2019-09-27 09:15:39 -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	ea23a82f33	Make mouse pitch less sensitive	2019-09-26 15:14:47 -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	3f686be7ab	Add all Objective-C sources in CMakeLists.txt	2019-09-26 10:50:00 -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
dooglifeSF	0fa7220750	tilt head down slightly to minimize crazy eyes	2019-09-25 15:27:11 -07:00
dooglifeSF	a8fa3a136c	emote revisions, json tuning	2019-09-25 14:47:07 -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
MiladNazeri	7d7024f5eb	Merge pull request #16247 from MiladNazeri/DEV-148/add-mirror-mode-to-settings ... Dev 148/add mirror mode to settings	2019-09-25 12:08:09 -07:00
milad	aba6a28d54	updated camera modes	2019-09-25 11:05:32 -07:00
milad	39d96b76a6	fixed help text	2019-09-25 08:41:38 -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	7c4fe39918	Add point directional blending node to animation json	2019-09-24 18:24:27 -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
milad	677dbe59cc	fixed qml typo	2019-09-24 16:47:07 -07:00
milad	edb135776a	Added selfie view and updated help	2019-09-24 16:44:34 -07:00
Shannon Romano	73c558bc51	Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle ... Transition between walk/emote should be faster	2019-09-24 15:49:31 -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
Shannon Romano	b491d00c00	Merge pull request #16238 from RebeccaStankus/fullSizeWindow ... Prereq work for 'Reduce User Friction'	2019-09-24 10:58:39 -07:00
RebeccaStankus	982bdf5c98	Prereq work for 'Reduce User Friction'	2019-09-23 16:49:16 -07:00
dooglifeSF	7307bea16f	speed up interpolation of point, rework point animation, add transitions for emotes to idle from settle	2019-09-23 16:45:35 -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
Shannon Romano	68c37e561a	Merge pull request #16233 from Atlante45/fix/flush-timer ... Put flush timer on right thread without parenting	2019-09-23 09:37:05 -07:00
Sam Gateau	fd3e3aba7b	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-23 09:32:10 -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
dante ruiz	b478a22ed2	fix edge case	2019-09-20 15:25:10 -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
Anthony Thibault	fecef584c9	Merge pull request #16226 from danteruiz/fix-snap-html-issue ... BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page	2019-09-20 12:39:01 -07:00
Shannon Romano	22dffa5ce8	Merge pull request #16217 from Atlante45/fix/flush-timer ... BUGZ-489: Make sure the flush timer is not spawned too early	2019-09-20 12:35:39 -07:00
luiscuenca	f979c4e1ab	Add more info to jdocs	2019-09-20 09:51:51 -07:00
dante ruiz	fe2a4c3600	fix fix-snap-html-issue	2019-09-19 18:20:08 -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
Zach Fox	97ef2c030e	Merge pull request #16223 from zfox23/simplifiedGoToIteration ... Whoops! New placeholder text color	2019-09-19 16:40:48 -04:00
Zach Fox	10352f1cb2	New placeholder text color	2019-09-19 13:38:37 -07: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
Zach Fox	a472e723e2	Merge pull request #16222 from zfox23/simplifiedGoToIteration ... BUGZ-1529: Iteration on JumpTo Field visuals/interaction states	2019-09-19 16:13:21 -04:00
Zach Fox	5077089518	BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap	2019-09-19 11:15:53 -07: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
Zach Fox	5e96ce8822	DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR	2019-09-19 09:48:11 -07:00
Sam Gateau	819c942056	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-19 09:01:19 -07:00
luiscuenca	fc223e4cb6	Reverse the up/down arrow keys if in selfie mode	2019-09-18 17:15:25 -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
Zach Fox	f92c5d0882	DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO	2019-09-18 14:39:11 -07:00
Zach Fox	59184edc89	DEV-521: Update Emoji window's search field to display emoji's name during hover	2019-09-18 13:37:46 -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
Zach Fox	610e0c3d82	Merge pull request #16205 from zfox23/changeAboutCopyright ... v85: BUGZ-1485: Fix Copyright date in About dialog	2019-09-17 14:55:11 -04:00
Zach Fox	60f4189eb3	BUGZ-1485: Fix Copyright date in About dialog	2019-09-17 11:36:12 -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	8875453585	remove old/unused eyetracker code	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
Shannon Romano	dd0b527d63	Merge pull request #16185 from huffman/fix/hifi-log-login ... BUGZ-1441: Update logo on login popup Build failure is on Android not communicated to Docker.	2019-09-16 13:15:58 -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
Shannon Romano	79d845d127	Merge pull request #16190 from danteruiz/fix-html ... BUGZ-1398: HMD Tablet Apps blocked by Web access error	2019-09-13 12:35:29 -07:00
amerhifi	cc11bd9552	created new AudioWrapper	2019-09-13 11:24:41 -07:00
danteruiz	8491a37923	fixing WebEntities html	2019-09-13 09:57:51 -07:00
Ryan Huffman	5370e67507	Update logo on login popup	2019-09-12 14:48:21 -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
Zach Fox	a5504c3780	Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode ... BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode	2019-09-11 15:05:44 -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
MiladNazeri	a9da5b8f16	Update interface/resources/qml/hifi/audio/Audio.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-09-11 12:45:18 -07:00
MiladNazeri	d95a803324	Update interface/resources/qml/hifi/audio/Audio.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-09-11 12:44:59 -07:00
milad	3cf56210b2	modified Audio.qml to handle desktop audio level meter visible	2019-09-11 12:30:24 -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
Zach Fox	50ba55a988	Protect against engine not returning a valid CPU/GPU object	2019-09-10 13:03:40 -07:00
Zach Fox	e52d65a7bc	BUGZ-1451: Update links in controller reference	2019-09-10 11:31:51 -07:00
Zach Fox	eb286d992e	Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound ... Emoji app duplicates sound on opening from toolbar	2019-09-09 11:27:26 -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
RebeccaStankus	33b78bea4f	Changed textField module sounds	2019-09-09 10:36:35 -07:00
Shannon Romano	ca190f9932	Merge pull request #16143 from dooglifeSF/Sitting_emote_variants ... Sitting emote variants, revisions on stand emote agree anims, point bug fix	2019-09-09 10:12:56 -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
dooglifeSF	932093bead	Merge branch 'master' into Sitting_emote_variants	2019-09-06 15:06:52 -07:00
luiscuenca	3b8d3f987d	Add animation	2019-09-06 14:31:53 -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
dooglifeSF	422ad52a87	Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges	2019-09-06 13:57:33 -07:00
dante ruiz	768ac08d11	Add entitlements for Launcher and Interface	2019-09-06 11:20:16 -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
dooglifeSF	b5d2675a05	Merge branch 'master' into Sitting_emote_variants	2019-09-05 16:45:24 -07:00
dooglifeSF	5061aca487	Update sitting_emote_raisehand03_all.fbx	2019-09-05 16:44:13 -07:00
dooglifeSF	9cfa4753d9	sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit	2019-09-05 15:31:07 -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
Zach Fox	df3f7fcb72	Merge pull request #16132 from MiladNazeri/dev-486/emote-ui-toggle-fix ... Dev-486 : emote indicator should still be showing	2019-09-04 13:11:24 -07:00
milad	5fdcf0ecaf	updated setting name and changed default value to true for show tray	2019-09-04 12:59:17 -07:00
Shannon Romano	24faa4a7cb	Merge pull request #16124 from MattHardcastle/call-interface-highfidelity ... Call Interface "High Fidelity" on macOS	2019-09-04 09:34:35 -07:00
milad	669fef763a	removed logs	2019-09-03 18:11:56 -07:00
milad	44e518f5a1	working fix	2019-09-03 18:06:25 -07:00
dooglifeSF	6b3dfd6d56	sitting emote raised hand 03 wip	2019-09-03 16:53:36 -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
Zach Fox	d88c43614c	Merge pull request #16129 from RebeccaStankus/feetPosition ... Feet position	2019-09-03 11:04:17 -07:00
Jamil Akram	a9d8f105ae	Merge pull request #16112 from dooglifeSF/Anim_memory_reduction ... Anim memory reduced ~10mb by removing static channels	2019-09-03 10:08: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
Matt Hardcastle	f91ec8fbf5	Call Interface "High Fidelity" on macOS	2019-08-30 09:18:36 -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	31340d278a	Add test for local file access	2019-08-29 13:45:43 -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
dooglifeSF	974b18b16b	Export one more that used to be hosted. I moved it to the source repo.	2019-08-28 14:16:57 -07:00
dooglifeSF	a5118d8a31	Merge branch 'master' into Anim_memory_reduction	2019-08-28 10:21:21 -07:00
dooglifeSF	577a82f750	Export animations, remove static channels. Remove unused joints. Exclude all scene data from fbx.	2019-08-28 10:10:39 -07:00
Brad Davis	954773124a	BUGZ-1363: crash when checking for web content restrictions	2019-08-28 09:56:45 -07:00
Anthony Thibault	1a1e8297e6	Merge pull request #16077 from dooglifeSF/tweak_sit_pose ... Sit pose reworked and new sit emote variants added.	2019-08-28 09:06:31 -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	42357904cd	fixed icon name spacing	2019-08-27 20:13:15 +02: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
dooglifeSF	c6f72e0e77	Merge branch 'master' into Anim_memory_reduction	2019-08-27 09:52:16 -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
dooglife@gmail.com	01b912210a	json tuning to minimize the double-blend reduced animation effect, and to address some Joshua feedback	2019-08-23 15:06:31 -07:00
dooglife@gmail.com	e8492beb4a	Merge branch 'master' into tweak_sit_pose	2019-08-23 14:21:09 -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
dooglife@gmail.com	fed14ac588	Merge branch 'master' into tweak_sit_pose	2019-08-23 09:34:45 -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
dooglife@gmail.com	01e98e194a	animation tuning pass	2019-08-22 16:48:41 -07:00
Andy Howell	f5767168ed	Merge pull request #16035 from MiladNazeri/emojiAppAdd ... Using my superpowers to get this in the build.	2019-08-22 16:10:22 -07:00
RebeccaStankus	6e96b800b6	Engine handles turning PTT off if unmuting	2019-08-22 13:22:45 -07:00
Zach Fox	7c4a0545c4	BUGZ-1327: Fix PTT icon when PTTing and clipping	2019-08-22 12:51:34 -07:00
dooglife@gmail.com	75dd4d8da9	json tuning, adding cheer/disbelief anim block-ins, BUG: these are tposing here so do not merge - this is a test	2019-08-22 11:50:22 -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
dooglife@gmail.com	ec06a02fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into tweak_sit_pose	2019-08-21 08:46:59 -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
RebeccaStankus	cc22386f06	CR feedback changes	2019-08-20 13:29:02 -07:00
Zach Fox	780a081d16	Remove unused TabletAddressDialog internal property, fixing BUGZ-1294	2019-08-20 12:05:00 -07:00
Zach Fox	41d992a307	Merge pull request #16078 from zfox23/helpSupport1 ... DEV-412: Implement Support tab in Help app	2019-08-20 11:57:44 -07:00
dooglifeSF	8d05d9e5d4	fix the worst of the mismatched emote poses for the eval mtg	2019-08-20 11:57:20 -07:00
Zach Fox	bb97b4f866	Fix BUGZ-1303: Make 'View All Controls' go to knowledge base	2019-08-20 11:17:05 -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
Zach Fox	0cc28c58ae	DEV-415: Implement Support tab in Help app	2019-08-20 10:54:58 -07:00
Zach Fox	010b4b8312	Merge pull request #16076 from zfox23/removeAboutFromSettings ... Remove 'About' tab from Settings	2019-08-20 10:46:42 -07:00
dooglifeSF	8a3b93b913	add 3 sits with different hand placements for eval - also 2 new sit emotes	2019-08-20 10:35:56 -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	78edfb9af9	Remove 'About' tab from Settings	2019-08-19 17:22:38 -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	b40d5658e3	Moved a timer from JS to QML; progress circle on Emote Indicator	2019-08-19 15:12:48 -07:00
Jamil Akram	a3919af747	Merge pull request #16062 from dooglifeSF/animation_json_tuning ... Tuning pass on anim-graph, using the new blend modes and engine features	2019-08-19 14:02:37 -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	072261f551	Merge pull request #16074 from zfox23/helpQuickFixes ... BUGZ-1295: Fix typo in Help > Controls > Turn Right	2019-08-19 13:15:10 -07:00
Zach Fox	36dffb7dc8	Merge pull request #16073 from zfox23/micIconFix ... Fix some engine bugs that fix muted state in all UIs including simplifiedUI	2019-08-19 13:09:43 -07:00
Zach Fox	35a2cb7f27	BUGZ-1295: Fix typo in Help > Controls > Turn Right	2019-08-19 13:08:42 -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
Zach Fox	42705c2fea	Combine conditional statements	2019-08-19 11:04:54 -07:00
Zach Fox	2b86947d4a	Mipmap images; better padding	2019-08-19 10:32:08 -07:00
Simon Walton	150b4e45d4	More robust handling of the avatar verify-failed property	2019-08-16 17:30:28 -07:00
Zach Fox	3de9f44bf3	It's working	2019-08-16 16:00:30 -07:00
Zach Fox	4c006c50aa	Controls almost done	2019-08-16 15:53:30 -07:00
Zach Fox	30d552919a	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-16 14:06:58 -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
Zach Fox	0338b0258c	Add Search to Emoji window and clean up some code	2019-08-15 12:21:29 -07:00
Zach Fox	143c3e966c	Big optimizations to Emoji window	2019-08-15 10:58:13 -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
dooglifeSF	2f3f6be693	Tuning pass on anim-graph, using the new blend modes and engine features.	2019-08-14 15:18:19 -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
Zach Fox	52c4d4fe69	better FAQ	2019-08-14 09:31:08 -07:00
Zach Fox	7297ac9a09	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-14 09:11:04 -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
Zach Fox	66199297cb	button	2019-08-09 12:24:37 -07:00
Zach Fox	dc2e08ef6b	Initial integration of browser	2019-08-09 12:05:03 -07:00
sabrina-shanman	49f1ecb1bf	Fix new bugs in TabletLODTools.qml	2019-08-09 11:41:11 -07:00
Sam Gateau	fe08609b0c	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-09 11:25:03 -07:00
Anthony Thibault	c2fbfd70c4	Merge pull request #16045 from hyperlogic/feature/reaction-intro-loop-outro ... Higher quality standing and seated reactions	2019-08-09 11:16:49 -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
Zach Fox	e8b93998da	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-09 09:33:13 -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
Anthony J. Thibault	733d7455f4	new seated talking anim	2019-08-09 08:52:38 -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
Anthony J. Thibault	b4869508a0	updated clap	2019-08-08 14:47:31 -07:00
sabrina-shanman	8347d9d23e	Update LODManager setter in TabletLODTools.qml	2019-08-08 13:59:50 -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
Anthony J. Thibault	ef81ccafed	Hooked up seated clap	2019-08-08 13:02:19 -07:00
RebeccaStankus	ecbcb6a178	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-08 11:16:31 -07:00
Anthony J. Thibault	5d405cac3b	Merge branch 'master' into feature/reaction-intro-loop-outro	2019-08-08 09:56:45 -07:00
Anthony J. Thibault	317c2f5219	sitting raise hand	2019-08-08 09:37:03 -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
Anthony J. Thibault	e5e012a83e	agree, point and disagree sitting emotes	2019-08-07 14:15:29 -07:00
Zach Fox	72e14a32f9	Implement the Help App skeleton; Implement Help App Controls; Implement Help App About	2019-08-07 17:13:20 -04: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
Anthony J. Thibault	147753309f	Updated clap02 with new version that is not as slow.	2019-08-06 17:57:27 -07:00
Anthony J. Thibault	3f6b488f27	Added intro-loop-outro phases for raiseHand, applaud and point	2019-08-06 17:39:30 -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
milad	75708170dd	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-06 13:23:32 -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
milad	1a95c126c3	working version but taking a snapshot of added emoji code before removing for handoff	2019-08-06 13:13:38 -07:00
Zach Fox	8b85bbfe67	Merge pull request #16034 from zfox23/masterGPU ... BUGZ-1103: Use 'Master GPU' information in About screen	2019-08-06 12:31:54 -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
Zach Fox	2a4c0a3ecd	BUGZ-1103: Use 'Master GPU' information in About screen	2019-08-06 14:13:31 -04:00
milad	77023b281b	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-06 09:27:49 -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
milad	5e12f4c42a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-05 19:01:20 -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
Anthony J. Thibault	649ef6c721	Added sitting idle variation and removed rejected emote variations.	2019-08-05 09:42:01 -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
milad	d1efbc051a	working UI	2019-08-04 15:11:55 -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
Anthony J. Thibault	31762a0c80	Bug fixes in seated reactions	2019-08-02 10:17:59 -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
Anthony J. Thibault	c8e4536bba	Hooked up variations of seated while talking and stubs for reactions while seated.	2019-08-02 10:11:38 -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
Anthony J. Thibault	f843c01b35	added missing seated idle pose	2019-08-01 13:09:02 -07:00
Anthony J. Thibault	a2e37b7275	talking/reactions while seated, work in progress check in	2019-08-01 13:05:15 -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	d8b940cc96	add control to enable/disable acoustic echo cancellation to simplified UI	2019-07-30 14:09:34 -07: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
milad	7d3ac62c86	changed root to micBar which had the gated property	2019-07-30 13:09:01 -07:00
Anthony J. Thibault	ee4bb233b9	Bug fix for head nod not going back to idle.	2019-07-30 12:56:43 -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
MiladNazeri	b81d0ecce3	Merge pull request #16002 from MiladNazeri/addNewTextSizeAPI ... [BUGZ-972] :: changed root to micBar which had the gated property	2019-07-30 09:59:40 -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
Anthony J. Thibault	4f5d0d1c0f	Updated a negative reaction animation.	2019-07-29 16:49:16 -07:00
David Rowe	833bbf1cce	Render API JSDoc	2019-07-30 11:36:56 +12:00
Anthony J. Thibault	6f3bb749e2	Added new applaud, point and raisehand reactions.	2019-07-29 16:17:50 -07: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
Anthony J. Thibault	e205d90df6	Hooked up random positive & negative emote animations.	2019-07-29 15:01:10 -07:00
milad	2ea8b9efa4	changed root to micBar which had the gated property	2019-07-29 14:05:55 -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