31259 commits

Author	SHA1	Message	Date
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
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
Anthony J. Thibault	6e6440232c	Updated avatar-animation.json from animedit tool	2019-07-29 10:49:34 -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
MiladNazeri	e6e771df7b	Merge pull request #15977 from MiladNazeri/permissionsUIFix ... [DEV-190] + [DEV-191] :: Permissions UI	2019-07-26 11:25:18 -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
Kalila R	bac59b52aa	Added checkbox for script plugins to security.qml	2019-07-26 01:32:14 -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
MiladNazeri	b0723599d8	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:48 -07:00
MiladNazeri	b419be97be	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:24 -07:00
MiladNazeri	cf23b7a303	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:17 -07:00
MiladNazeri	20b709b382	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:46:10 -07:00
milad	5083e449b0	cr round 2	2019-07-25 15:42:25 -07:00
milad	2f4566b63c	merged master and fixed height	2019-07-25 15:42:03 -07:00
milad	4c0d8b6fda	improved layout to match the figment more	2019-07-25 15:42:02 -07:00
milad	993e5db2da	changed rectangle to have anchor.fill	2019-07-25 15:42:02 -07:00
milad	2498bf2fd8	Cr changes r1	2019-07-25 15:42:02 -07:00
milad	9f0fc8bd06	removed logs and prototype code	2019-07-25 15:42:02 -07:00
milad	189809dc2c	Fixed undefined error when displaying from the dictionary	2019-07-25 15:42:02 -07:00
milad	2b4dd327ec	removed log statements	2019-07-25 15:42:01 -07:00
milad	cd5df63f51	working version for all qml web files	2019-07-25 15:41:53 -07:00
milad	fb7a66b110	working version with just flickable	2019-07-25 15:38:23 -07:00
milad	43268c0f65	Working QML window	2019-07-25 15:38:23 -07:00
milad	dec176b921	checking to see if I did something blocking the build	2019-07-25 15:38:22 -07: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
Ryan Huffman	de233e456e	Merge pull request #15976 from huffman/feat/serverless-tutorial ... DEV-266: Add serverless tutorial	2019-07-25 13:39:03 -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
Zach Fox	12a9837a4b	Merge pull request #15984 from zfox23/removeSomeEventBridgeCode ... BUGZ-969: Remove some audio-related code that hasn't worked in a while	2019-07-25 12:41:43 -07:00
Zach Fox	6e33f3f23a	BUGZ-969: Remove some audio-related code that hasn't worked in a while	2019-07-25 11:49:28 -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
Ryan Huffman	2ec87f4e61	Add serverless tutorial	2019-07-24 16:38:03 -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	e6dd52d331	Merge branch 'master' into bugz-1029a	2019-07-24 15:53: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
Zach Fox	e1c198903d	Merge pull request #15973 from zfox23/fixGatedLog ... BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 11:19:02 -07:00
luiscuenca	015d1951fc	Add sitting clip node	2019-07-24 10:44:33 -07:00
Zach Fox	03b5f9f7f8	BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 10:18:03 -07:00
Zach Fox	b918979fab	DEV-301: Adjust size of VR-mode header icon	2019-07-24 10:02:26 -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
Shannon Romano	0031b238c6	Merge pull request #15957 from AndrewMeadows/mac-readable-stats ... BUGZ-937: more readable debug stats on MacOS	2019-07-23 12:05:01 -07:00
jennaingersoll	1e84b3f4a2	Merge pull request #15951 from ctrlaltdavid/DOC-122 ... DOC-122: LocationBookmarks JSDoc	2019-07-23 12:00:03 -07:00
Anthony J. Thibault	687588cde7	Hooked up first-pass reaction animations.	2019-07-23 09:47:37 -07:00
dante ruiz	ce2849b570	Revert "Merge pull request #15944 from danteruiz/add-signing" ... This reverts commit 47b7e9a5dc, reversing changes made to 6d0ba98bfc.	2019-07-23 09:38:32 -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
Shannon Romano	47b7e9a5dc	Merge pull request #15944 from danteruiz/add-signing ... DEV-117: the signing of MAC HQ launcher AND the interface exe	2019-07-22 15:30:26 -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
Andrew Meadows	95187f97c8	use bold monospace font for debug stats	2019-07-22 12:38:24 -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
Shannon Romano	4f7b865cfe	Merge pull request #15945 from huffman/fix/create-window-not-reopening ... BUGZ-998: Fix create window being destroyed when closed	2019-07-19 11:07:02 -07:00
Shannon Romano	c919980e8b	Merge pull request #15928 from AndrewMeadows/fix-safe-landing-003 ... BUGZ-942: fix SafeLanding to not accidentally "neglect to track" incoming entity packet when connecting to new domain	2019-07-19 09:53:15 -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
Ryan Huffman	03b8de1ee7	Fix create window being destroyed when closed	2019-07-18 08:43:39 -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
milad	a3b8ded56a	changed sessionDisplayName logic	2019-07-17 14:17:58 -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
dante ruiz	99991c3259	fix signing crash	2019-07-16 19:49:37 -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
Zach Fox	a4f4961dfd	Merge pull request #15941 from zfox23/graphicsSettingsMargin ... Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:26:43 -07:00
Zach Fox	1cd136f178	Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:15:08 -07:00
Jamil Akram	d2000d810d	Merge pull request #15929 from dooglifeSF/teleport_fix ... add teleport.fbx back to avatar/animations	2019-07-16 14:37:24 -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
dooglifeSF	413a089402	add teleport.fbx back to avatar/animations ... compiled and tested in local sandbox but need to test with Jamil in HMD to see that teleport plays correctly for remote viewer	2019-07-15 13:24:21 -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
Matt Hardcastle	afb5f81ca0	Add signing to macOS Interface and HQ Launcher ... This change adds signing to the macOS version of Interface and HQ Launcher. By default, signing is not enabled; to enable signing you must add the `XCODE_DEVELOPMENT_TEAM` environment variable and rerun CMake. Jira: https://highfidelity.atlassian.net/browse/DEVOPS-52	2019-07-15 10:54:44 -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
Zach Fox	5828f46c6b	Incorrect ID fixed - thanks Milad	2019-07-12 12:27:55 -07:00
Zach Fox	e0392642f7	Don't enable supersampling from graphics settings	2019-07-12 11:18:34 -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
Zach Fox	56a55efbb3	Fix a quick renderer bug	2019-07-11 16:12:40 -07:00
Dante Ruiz	2f74f8253f	finishing requested changes	2019-07-11 15:39:59 -07:00
Zach Fox	4c7d0fc6f4	Updated layout	2019-07-11 14:46:05 -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
Howard Stearns	7eaa29c147	Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui ... new-account wallets in simplified UI	2019-07-10 15:09:59 -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
Howard Stearns	4191c37f6e	indentation	2019-07-09 14:48:17 -07:00
Howard Stearns	79a3d45eae	new-account wallets in simplified UI	2019-07-09 14:25:11 -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
SamGondelman	41e8a08484	Merge remote-tracking branch 'upstream/master' into uber	2019-07-08 23:00:36 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
Howard Stearns	335119cb58	log wakeup (on client and report to DS) during connection on Windows	2019-07-08 16:50:36 -07:00
Zach Fox	5048b8bd89	Implement DEV-218 & DEV-219 and commit a starting point for the Emote app	2019-07-08 16:46:58 -07:00
Shannon Romano	31582cf857	Merge pull request #15887 from sethalves/set-default-gl-format ... BUGZ-926: use the correct gl format when creating the initial platform window	2019-07-08 14:03:43 -07:00
Jamil Akram	aa82c4e971	Merge pull request #15806 from dooglifeSF/idles_talks_locomotion_improvements ... Idles talks locomotion improvements	2019-07-08 13:30:51 -07:00
amerhifi	84055a6f0d	adding focus back on _glWidget	2019-07-08 11:12:50 -07:00
amer cerkic	386d945eeb	Merge branch 'master' into bugz-690	2019-07-08 09:28:28 -07:00
Sam Gateau	f2cda426d8	Merge pull request #15884 from samcake/nut ... BUGZ-736 / BUGZ-914 : Improve the enumeration of the platform and profiler / apply a specific PPI per Tier	2019-07-06 02:18:11 +02:00
David Rowe	9f4c657bc3	Update Overlays properties JSDoc	2019-07-06 12:12:33 +12:00
Sam Gateau	b4e86741e0	Adress typo in gpuident and add extra checks on the recommended scale value	2019-07-06 01:13:38 +02:00
Zach Fox	243733028b	Merge pull request #15891 from zfox23/SUI/audioIOAboutSwitch ... BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About	2019-07-05 12:59:56 -07:00
Zach Fox	38ad93a7ed	BUGZ-917: Fix log spam in NameCard.qml due to errant line of code	2019-07-05 12:24:05 -07:00
Zach Fox	4223800af7	BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About	2019-07-05 12:17:28 -07:00
Seth Alves	708979a30c	use the correct gl format when creating the initial platform window	2019-07-05 10:48:57 -07:00
Sam Gateau	11f036246e	Implement the ppi scaling in sync with the platform tier	2019-07-05 17:52:44 +02:00
Samuel Gateau	6ef652038b	EXpose the master index for cpu, gpu and display and adjust the profuiler to support it / remove unsupported deferred for macs since now it is fixed	2019-07-05 16:15:19 +02:00
Shannon Romano	ab376d59db	Merge pull request #15865 from ctrlaltdavid/DOC-105 ... DOC-105: Pointers JSDoc revision	2019-07-04 12:02:52 -07:00
David Rowe	8fb83e98be	Doc review.	2019-07-04 20:02:42 +12:00
SamGondelman	8b9fcd43b1	merge with master	2019-07-03 17:58:23 -07:00
amer cerkic	9384c5b3a3	testing what happens (for mac specifically) when we specify the focus item to be the root, not NULL as sometimes happens when toggling between modal popups and the main window	2019-07-03 16:02:56 -07:00
Sam Gondelman	00441f1899	Merge pull request #15875 from SamGondelman/load ... BUGZ-910: Return entity load priority operator to proper state after safe landing	2019-07-03 14:20:03 -07:00
amer cerkic	e429b7a1e2	Merge branch 'master' into bugz-690	2019-07-03 14:00:27 -07:00
Zach Fox	1f54f3c159	BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text	2019-07-03 12:49:23 -07:00
amer cerkic	39fd16fc9e	adding a null check escape to the activeItem. On right click back to root window active item becomes null instead of root item	2019-07-03 11:05:38 -07:00
Sam Gateau	1a71a63a8b	Merge pull request #15867 from SamGondelman/unlit ... BUGZ-661: Add unlit property to text entities	2019-07-03 18:43:26 +02:00
Amer	f97cde46bf	Merge pull request #15868 from amerhifi/bugz-103 ... case BUGZ-103: HMD Mouse rendering	2019-07-03 09:17:23 -07:00
David Rowe	c70d2c006f	Revise organization of Overlays types and properties JSDoc per Entities	2019-07-03 14:25:11 +12:00
Anna	75c5a99ee2	removed secondary camera tone mapping compensation during 360 screenshot	2019-07-02 17:59:30 -07:00
SamGondelman	4973563c20	return entity load priority operator to proper state	2019-07-02 16:29:19 -07:00
amer cerkic	75beb95a97	Since switching to system mouse due to eco mode trailing mouse issues, this in turn caused hmd mode to render a blank mouse. Added a mouse setting functionality on activeplugin change lambda so taht when in hmd mode it uses either reticle mouse, if selected, or arrow. Othewise if non hmd use system mouse.	2019-07-02 10:31:31 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
Ryan Huffman	d29cd796ca	Add defaultScriptsOverride option	2019-07-01 23:51:34 -07:00
David Rowe	5c29eb04b3	Typo	2019-07-02 16:19:32 +12:00
David Rowe	c6fd726111	Typos etc.	2019-07-02 16:12:47 +12:00
David Rowe	b7e92e0994	LaserPointers API JSDoc update	2019-07-02 16:12:47 +12:00
David Rowe	e109c8f6d3	Picks and RayPick API JSdoc updates per Pointers API JSDoc	2019-07-02 16:12:47 +12:00
David Rowe	f2cf3bd05c	Revise Pointers API JSDoc	2019-07-02 16:12:47 +12:00
Anthony Thibault	6c66f5a37b	Fix for DependencyManager crash on shutdown on Mac ... On Mac, it is possible to crash when shutting down, it is not clear if this is due to shutting down the app on another thread during logout or something that can happen during normal shutdown, because it is so difficult to reproduce. However, from looking at the stack traces it is possible for a [NSApplication terminate:] event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning() This causes AppKit to invoke the static destructors too early. Which in turn, causes the DependencyManager destructor to fire while there are still many dependencies running. Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown in an incorrect order. To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible, in the Application destructor. Theoretically, this will be a safe time for the static destructors to be invoked, because it is after all of the DependencyManager's dependencies have been manually destroyed. However, this is only a speculative fix, because this is so difficult to reproduce.	2019-07-01 17:37:57 -07:00
Andrew Meadows	4bbfd7cad1	more correct bounding sphere around avatar for SafeLanding query	2019-07-01 15:53:42 -07:00
Andrew Meadows	0d8fdf51c5	fix safe landing to load proper set of objects	2019-07-01 14:18:19 -07:00
Zach Fox	b8485361ce	Merge pull request #15858 from zfox23/PTTDuckingSlider ... DEV-194: Iterate on PTT Ducking Slider design	2019-07-01 12:00:17 -07:00
Zach Fox	73db19464f	DEV-194: Iterate on PTT Ducking Slider design	2019-07-01 11:28:48 -07:00
Brad Hefta-Gaub	191086c57a	Merge pull request #15857 from PrestonB1123/webcamPermissions ... DEV-193: Disallow mic and webcam access always.	2019-07-01 09:54:58 -07:00
Shannon Romano	89f654175c	Merge pull request #15856 from PrestonB1123/defaultShortcuts ... DEV-173: Re-enable shortcuts	2019-06-28 15:29:53 -07:00
Preston Bezos	ef674a5934	removed permission for qml to access webcam and mic	2019-06-28 15:23:50 -07:00
Preston Bezos	1315677aec	fixed doc and removed log spam	2019-06-28 15:02:33 -07:00
Preston Bezos	d1470d3323	readded ctrl+n and ctrl+b as shortcuts with a default script	2019-06-28 14:33:03 -07:00
Shannon Romano	7ff751567b	Merge pull request #15848 from jherico/fix/dev-175-source ... DEV-175: QML content URL validation, whitelist trusted sources	2019-06-28 14:18:56 -07:00
Sabrina Shanman	0b6dfe3f7c	Merge pull request #15846 from AndrewMeadows/avoid-SafeLanding-event-flood ... BUGZ-868: Avoid SafeLanding signal-slot connection resource leak	2019-06-28 13:29:31 -07:00
Brad Hefta-Gaub	8082ff8529	Merge pull request #15850 from zfox23/PTTAttenuationOption ... BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-28 11:08:11 -07:00
Brad Davis	e3393a8ee5	Apply URL validation to top level window QML	2019-06-28 10:43:03 -07:00
Shannon Romano	67901166ba	Merge pull request #15851 from ctrlaltdavid/DOC-79 ... DOC-79: Entities JSDoc Update - Doc Review	2019-06-28 10:12:05 -07:00
Zach Fox	5cc6efc831	CR feedback	2019-06-28 09:07:58 -07:00
David Rowe	2d6d3eb4fe	Doc review	2019-06-28 17:05:36 +12:00
Brad Davis	8bcde84d89	Disable remote QML unless whitelisted	2019-06-27 16:37:56 -07:00
Zach Fox	8af469992e	BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-27 15:55:58 -07:00
Andrew Meadows	0bec2bca83	OctreePacketProcessor should process packet even when no SafeLanding	2019-06-27 14:44:23 -07:00
Zach Fox	7c189d46f2	BUGZ-363: Remove 20dB output attenuation during PTT	2019-06-27 13:28:29 -07:00
dooglifeSF	7856ab611f	rig shoulder rotation order fixed, animations batch converted and polished, json updated with new ranges for side steps, tabs converted to spaces	2019-06-27 11:37:05 -07:00
Andrew Meadows	bf068a3211	fix SafeLanding start/stop on entity-server connection flow	2019-06-27 11:33:51 -07:00
Andrew Meadows	dfb7ac7044	name changes and improved flow for SafeLanding logic	2019-06-27 08:14:34 -07:00
Andrew Meadows	00185ee82e	cleaup to help unravel one spaghetti strand	2019-06-26 17:05:44 -07:00
Andrew Meadows	496a7f3608	less cruft, more readable	2019-06-26 16:02:00 -07:00
Andrew Meadows	46b3d84be5	remove unused cruft	2019-06-26 15:41:50 -07:00
Andrew Meadows	355de0e6d5	move Application::setFailedToConnect() to cpp for easier debugging	2019-06-26 15:41:01 -07:00
Andrew Meadows	c96b704a28	avoid dupe connections and teardown old connections	2019-06-26 15:38:59 -07:00
SamGondelman	5937a219dd	wait on thread pool threads	2019-06-26 15:25:17 -07:00
Zach Fox	6e4b9c1723	Merge pull request #15774 from PrestonB1123/iconChanges ... New Top Bar Icons	2019-06-26 11:01:12 -07:00
Preston Bezos	f0dd28e71a	removed extra line	2019-06-26 09:54:43 -07:00
dooglifeSF	9f8d1dd51d	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-26 09:31:23 -07:00
Preston Bezos	bd3fe8a092	fixed conflict and spacing	2019-06-26 09:12:32 -07:00
SamGondelman	9c1b139d5f	merge with master	2019-06-25 23:46:39 -07:00
Sam Gateau	48f9c33bdd	Merge pull request #15822 from samcake/yellow ... BUGZ-664: Introduce scaling of rendering for forward renderer	2019-06-25 14:27:17 -07:00
Andrew Meadows	20376c9542	Merge pull request #15823 from ctrlaltdavid/DOC-79 ... DOC-79: Entities JSDoc Update	2019-06-25 14:18:13 -07:00
Sam Gateau	768dd051aa	Add sanity check for viewport resolution scale to avoid negative value	2019-06-25 11:54:50 -07:00
Zach Fox	b7a3d82f0f	DEV-170: Increase the speed of the animation when clicking between tabs in Settings	2019-06-25 11:30:25 -07:00
Preston Bezos	1481c7424f	changed ptt muted icon	2019-06-25 11:02:44 -07:00
Preston Bezos	5686f51171	fixed hmd settings buttons spacing	2019-06-25 09:19:30 -07:00
Sam Gateau	b0ebcc745d	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-24 15:36:28 -07:00
Zach Fox	3e2e020731	BUGZ-746: About tab: Better CPU/GPU info reporting; New copied info (including OS version)	2019-06-24 12:48:13 -07:00
Sam Gondelman	e4847cc4ae	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
David Rowe	b2b7a6ae99	Merge branch 'master' into DOC-79	2019-06-22 12:11:22 +12:00
Sam Gateau	7bf2c5fc8e	Simplify the setting name	2019-06-21 16:22:01 -07:00
Sam Gateau	aa160c4d0f	Improving presentation of stats & debug information	2019-06-21 16:17:28 -07:00
Sam Gateau	35d7211aca	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-21 11:38:33 -07:00
dooglifeSF	3d92875eb5	add spine twist during transitions in/out of alt idle to help when talking is overlayed	2019-06-21 10:39:53 -07:00
Sam Gateau	a856fdb3ca	getting rid of the resolution Scale on the display plugin	2019-06-21 10:36:25 -07:00
amer cerkic	67e42148ef	Merge branch 'master' of https://github.com/highfidelity/hifi	2019-06-21 09:43:33 -07:00
Sam Gateau	69bb9ac0b6	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-20 22:23:15 -07:00
Sam Gateau	22cd631a04	Merge And Modifying the Graphics settings and the dev menu	2019-06-20 17:48:36 -07:00
Anthony Thibault	64a77d07e0	Merge pull request #15814 from hyperlogic/bug-fix/twitchy-finger-fix ... Disable handTouch.js to prevent finger twitching	2019-06-20 17:03:39 -07:00
dooglifeSF	e25913f136	fix finger collapse in talks and idles - caused by finger joints bending more than 90 degrees in Y	2019-06-20 16:05:18 -07:00
Anthony J. Thibault	3a6d8dc383	Disable handTouch.js to prevent finger twitching ... This PR disables handTouch.js. handTouch.js allows the fingers to animate on the surface of an object. However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them. We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality. Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range. This can cause the fingers to bend incorrectly for a moment. Also, three new items were added to the Developer > Show Animation Stats panel. * Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls. * Flow: displays if flow is active of disabled. * Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled. https://highfidelity.atlassian.net/browse/BUGZ-154	2019-06-20 15:52:36 -07:00
amer cerkic	1218f7e014	moved audioclient stop to dtor	2019-06-20 15:10:21 -07:00
Andrew Meadows	cd9b450475	re-expose mic and camera to disable crash	2019-06-20 15:03:15 -07:00
Kalila R	500e089e44	Updated version no. to 0.83.0	2019-06-20 16:56:03 -04:00
dooglifeSF	12b7cb0262	merge dooglifeSF master into branch Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-20 09:01:59 -07:00
Sam Gateau	b5e4a47375	Proper allocation of the resource in forward and starting to remove the ui as we have it	2019-06-19 17:33:26 -07:00
Sam Gateau	b2631e89e9	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-19 17:11:20 -07:00
Sam Gateau	8f04eaae1d	Merge branch 'master' of github.com:highfidelity/hifi into wall	2019-06-19 16:53:04 -07:00
Sam Gateau	53094ef70c	One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls	2019-06-19 16:52:33 -07:00
dooglifeSF	3eef23fe98	change base idle more frequently, add more motion to idle02, improve head movements in talks, add head movement to talk_armsdown	2019-06-19 16:19:42 -07:00
jennaingersoll	150ae31a88	Merge pull request #15748 from ctrlaltdavid/DOC-85 ... DOC-85: Revise new MyAvatar signals' JSDoc	2019-06-19 15:16:46 -07:00
RebeccaStankus	30dd667b17	Changed qml import method	2019-06-19 10:40:32 -07:00
RebeccaStankus	feaea12b24	Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles	2019-06-19 10:14:04 -07:00
dooglifeSF	4be42a4b9b	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-19 09:57:04 -07:00
dooglifeSF	255777c82d	bring latest changes to idles, locomotion and animation json into hifi from hifi-animation	2019-06-19 09:49:42 -07:00
Sam Gateau	1ae06f01b0	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-18 17:41:56 -07:00
David Rowe	72fdbc0aa8	Entity information and manipulation	2019-06-19 10:18:48 +12:00
Zach Fox	18f703ee43	BUGZ-732: Enable text selection by mouse in Profile/Display Name field	2019-06-18 14:11:14 -07:00
Zach Fox	9b1c7b39bb	Merge pull request #15790 from zfox23/SUI/aboutTab ... Implement an "About" tab in the Settings app	2019-06-18 13:16:30 -07:00
Zach Fox	f6822f17a9	Add computer description	2019-06-18 12:43:45 -07:00
Zach Fox	bd02a5eafd	Better text formatting	2019-06-18 12:29:52 -07:00
Zach Fox	4670c11397	Tighten up the graphics on level 3	2019-06-18 12:26:03 -07:00
Zach Fox	ec4fc672b6	Better design; Interface version	2019-06-18 12:09:37 -07:00
Sam Gateau	f30eb919c7	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-18 11:24:04 -07:00
Zach Fox	34def0fd6b	DEV-145: About screen for platform info	2019-06-18 11:09:15 -07:00
Anthony Thibault	10dae7e4d9	Merge pull request #15783 from hyperlogic/feature/anim-debug-draw-improvement ... Improvement to Developer > Avatar > Draw Animation	2019-06-18 10:50:46 -07:00
dooglifeSF	ae2c381aaa	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-18 09:42:18 -07:00
dooglifeSF	55524ec815	Set debug text lit time to 20 (again) and move 2 break statements out of comment to fix exception in debug	2019-06-18 09:39:06 -07:00
RebeccaStankus	cd508a5475	Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles	2019-06-18 09:10:41 -07:00
RebeccaStankus	5a49ac9a22	moved files	2019-06-17 16:45:54 -07:00
Zach Fox	32aec78ea2	Merge pull request #15782 from zfox23/SUI/resizeSignal ... BUGZ-699: Make PSFListModel fetch early when making container bigger	2019-06-17 15:27:21 -07:00
Zach Fox	9cb4ad61ee	BUGZ-699: Make PSFListModel fetch early when making container bigger	2019-06-17 15:06:20 -07:00
Anthony J. Thibault	4b5d5062b1	Improvement to Developer > Avatar > Draw Animation ... This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug. Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.	2019-06-17 14:50:19 -07:00
Shannon Romano	7c3147fa2c	Merge pull request #15778 from zfox23/SUI/scrollbars ... DEV-142 & DEV-140: Scrollbars in Your Profile and Settings	2019-06-17 14:38:10 -07:00
Preston Bezos	538b15dd57	caught a couple of edge cases for mic states	2019-06-17 13:20:25 -07:00
Preston Bezos	7879dbf687	changed width of ptt muted icon	2019-06-17 13:13:43 -07:00
Zach Fox	1d2ed1985f	DEV-142 & DEV-140: Scrollbars in Your Profile and Settings	2019-06-17 12:35:45 -07:00
Andrew Meadows	ce96ea5bf8	more correct rebuild OtherAvatar detailed pickable shapes	2019-06-17 11:20:42 -07:00
Preston Bezos	bd78dd96a0	replaced icons with icons that are on the whole pixel so as not to cause blur	2019-06-17 11:05:47 -07:00
dooglifeSF	1c1807a80c	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-17 10:44:11 -07:00
Preston Bezos	a954ef6068	Merge branch 'master' of github.com:highfidelity/hifi into iconChanges	2019-06-17 10:43:43 -07:00
Preston Bezos	d9f1aa73ba	switched top bar icons and changes input device meter to be in icon instead of in bar	2019-06-17 09:12:32 -07:00
dooglifeSF	51b5f6093a	locomotion and idles bug fixes, json updated with correct values, AnimStats.cpp on screen debug text timeout pushed to 20 seconds	2019-06-17 08:58:15 -07:00
David Rowe	351bb3b934	Fix JSDoc naming of some Test API functions	2019-06-15 10:44:55 +12:00
Sam Gateau	c0d64ce4e2	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-13 18:43:34 -07:00
Shannon Romano	491af66a0e	Merge pull request #15767 from sethalves/fix-drawcalls-stat ... BUGZ-686: fix drawcalls stat broken in pr-15721	2019-06-13 17:57:01 -07:00
Shannon Romano	e6ea4839e0	Merge pull request #15770 from zfox23/SUI/autoChangeAvatar3 ... BUGZ-658: Actually write some code that doesn't let the user switch avatar models to Woody	2019-06-13 17:55:59 -07:00
Sam Gateau	4ba34f9a85	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-13 17:42:52 -07:00
Sam Gateau	5288314d02	Drafting ways to rescale in forward	2019-06-13 17:42:32 -07:00
Shannon Romano	d6859a42d9	Merge pull request #15762 from annabrewer/quest-login-keybrd ... BUGZ-531: Quest tablet login missing keyboard	2019-06-13 16:44:49 -07:00
Zach Fox	503fc18d70	Make this slightly more robust	2019-06-13 16:08:29 -07:00
Seth Alves	431ff0d1de	fix drawcalls stat broken in pr-15721	2019-06-13 15:35:08 -07:00
Shannon Romano	b4f708f4ad	Merge pull request #15755 from samcake/nut ... BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now	2019-06-13 14:32:36 -07:00
Shannon Romano	a37ce9f89d	Merge pull request #15754 from AndrewMeadows/fix-crash-bugz512 ... BUGZ-512: avoid MacOS crash on shutdown: destroy WebSurfaces before exit	2019-06-13 12:13:04 -07:00
Zach Fox	fcda85a3d1	Merge pull request #15759 from zfox23/SUI/autoSwitchAvatar2 ... BUGZ-658: Don't let the user switch avatar models to Woody	2019-06-13 10:55:55 -07:00
Zach Fox	431ec0bfd0	Merge pull request #15760 from zfox23/SUI/betterHomeBookmark ... BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome'	2019-06-13 10:49:58 -07:00
Zach Fox	289e948d6b	BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome'	2019-06-13 10:27:18 -07:00
Zach Fox	4ccd7bd808	BUGZ-658: Don't let the user switch avatar models to Woody	2019-06-13 10:17:14 -07:00
luiscuenca	20b17291b4	Reset detailed motion states when the workload zone changes	2019-06-13 09:05:55 -07:00
Sam Gateau	fbab3fcde9	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-12 19:15:25 -07:00
Sam Gateau	b2feb0f920	Add specific caps for the render method deferred from the platform profiler, to prevent bad choice on mac book air	2019-06-12 16:48:36 -07:00
Andrew Meadows	eee52deefe	destroy WebSurfaces on shutdown	2019-06-12 16:07:15 -07:00
Anna	4b30065ad1	fixed keyboard on quest login and cleaned up qml files	2019-06-12 15:17:37 -07:00
Preston Bezos	038747e645	Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering	2019-06-12 14:55:37 -07:00
Preston Bezos	34e9acc0b5	better fix for the toolbar remnant	2019-06-12 14:31:43 -07:00
Zach Fox	6fed581452	DEV-128: Update settings screen with latest design	2019-06-12 14:22:02 -07:00
Zach Fox	fade8f9c04	It works!	2019-06-12 12:47:48 -07:00
Zach Fox	51c2cc793a	Tinkering with toolbar visibility signal - not quite working	2019-06-12 10:26:32 -07:00
Brad Hefta-Gaub	35cdd19456	Merge pull request #15721 from sethalves/quiet-asan-gpu-stats ... BUGZ-623: Quiet asan gpu stats	2019-06-12 09:02:13 -07:00
David Rowe	29079b9221	Miscellaneous JSDoc improvement	2019-06-12 19:15:29 +12:00
David Rowe	93d42917b0	Revise JSDoc for new MyAvatar signals	2019-06-12 19:15:14 +12:00
Shannon Romano	b9e2443451	Merge pull request #15700 from ctrlaltdavid/DOC-63 ... DOC-63: Tablet JSDoc	2019-06-11 16:51:08 -07:00
Shannon Romano	453085f992	Merge pull request #15741 from huffman/feat/set-and-get-bookmarks ... BUGZ-484: Add --setBookmark and getAddress API	2019-06-11 15:31:41 -07:00
jennaingersoll	1935b49538	Merge pull request #15676 from ctrlaltdavid/DOC-33 ... DOC-33: MyAvatar API JSDoc catch-up	2019-06-11 15:05:06 -07:00
Ryan Huffman	a1b7392854	Add --setBookmark and getAddress API	2019-06-11 14:10:09 -07:00
Zach Fox	a88023469b	Merge pull request #15737 from zfox23/SUI/developerMenu ... DEV-122: Add a developer menu in Settings	2019-06-11 13:32:14 -07:00
Zach Fox	7bdd3084e9	DEV-122: Add a developer menu in Settings	2019-06-11 12:56:14 -07:00
Seth Alves	cd1c782aa8	fix warning	2019-06-11 12:54:40 -07:00
Zach Fox	97c4726e1e	Merge pull request #15736 from zfox23/SUI/autoSelectAvatar ... BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory	2019-06-11 11:50:55 -07:00
Zach Fox	9932b1da57	Merge pull request #15734 from zfox23/SUI/recommendedGraphics ... Implement BUGZ-633: Change 'Graphics Preset'	2019-06-11 11:24:52 -07:00
Zach Fox	db2ce822b7	BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory	2019-06-11 10:52:45 -07:00
Zach Fox	2d4ba92eeb	Implement BUGZ-633: Change 'Graphics Preset'	2019-06-11 09:58:01 -07:00
dante ruiz	01fab12942	fixing interface and laucnher script argument	2019-06-11 09:18:20 -07:00
Zach Fox	b62ab2ea82	Merge pull request #15731 from zfox23/SUI/forwardKeyEvents ... Implement BUGZ-226: Forward keypresses made while Top Bar is in focus	2019-06-11 07:52:11 -07:00
Zach Fox	9a926abd76	Implement BUGZ-226: Forward keypresses made while Top Bar is in focus	2019-06-10 20:27:03 -07:00
Andrew Meadows	250a4490d2	Merge pull request #15728 from hyperlogic/bug-fix/adjust-run-fwd-animations ... Adjust run and jog anims to better align head with 1p camera	2019-06-10 17:37:33 -07:00
Anthony J. Thibault	7ce5f7ac0b	Adjust run and jog anims to better align head with 1p camera ... Added adjust forward run and jog animations to better align with first person camera. In some instances, such as looking down, you could sometimes see your body lead your camera. https://highfidelity.atlassian.net/browse/BUGZ-240	2019-06-10 16:27:03 -07:00
Andrew Meadows	dbce976887	fix another crash in MyAvatar::getAvatarEntitiesVariant()	2019-06-10 15:34:18 -07:00
Sabrina Shanman	2b90d841b7	Merge pull request #15722 from sabrina-shanman/crash_no-display-plugin ... (BUGZ-563) Fix crash using null DisplayPlugin in GraphicsEngine	2019-06-10 14:54:11 -07:00
sabrina-shanman	a400cea040	Fix crash when using null DisplayPlugin in GraphicsEngine during shutdown	2019-06-10 14:00:05 -07:00
Shannon Romano	1748d0527f	Merge pull request #15698 from samcake/nut ... BUGZ-544: Refine the LOD manager target rate with the Refreshrate current target	2019-06-10 13:10:56 -07:00
Sam Gateau	c39218c1f4	Addressing the review comment about an if else statement syntax	2019-06-10 11:59:09 -07:00
Anthony Thibault	5ea65c0a5a	Merge pull request #15717 from annabrewer/qml-stackview-push-workaround ... BUGZ-297: QT - Crash when opening a menu that spawns a desktop popup window while in VR (running scripts, settings, etc)	2019-06-10 11:01:10 -07:00
Sam Gateau	32399997b1	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-10 10:52:53 -07:00
Sam Gondelman	53e6e00773	Merge branch 'master' into uber	2019-06-10 10:36:54 -07:00
SamGondelman	37feb7f027	merge with master	2019-06-10 10:29:39 -07:00
Shannon Romano	69094aa8f3	Merge pull request #15715 from kencooke/audio-injecctor-shutdown-crashfix ... BUGZ-399: Fix shutdown crash in AudioInjectorManager::stop()	2019-06-10 10:12:26 -07:00
Anna	fd872009fe	added workaround for bug in Qt StackView push method	2019-06-10 09:25:12 -07:00
Anna	67775c59f1	Merge branch 'master' of github.com:highfidelity/hifi	2019-06-10 08:55:48 -07:00
Shannon Romano	e213fd6b5e	Merge pull request #15712 from amerhifi/master ... case BUGS:560 . wrapping dependencyManager::get<ddeFacetracker>with ifdef	2019-06-07 18:59:34 -07:00
Ken Cooke	9d57f5ac62	Defer DependencyManager::destroy<AudioInjectorManager>() until all ScriptAudioInjectors have been destroyed	2019-06-07 18:35:39 -07:00
Anthony Thibault	d6331d1bf6	Merge pull request #15714 from hyperlogic/bug-fix/settings-on-tablet ... Fix crash using Settings in the Tablet in VR	2019-06-07 18:15:56 -07:00
Anna	0b282b201c	typo fix	2019-06-07 18:01:47 -07:00
Sam Gateau	2d9a7f7c4f	Refined the capping of the LOD Target Rate to be the lower REfreshrate when FOcus-inactive, this prevent the panic attacks of the LOD system on low end hardware	2019-06-07 17:00:37 -07:00
Anthony J. Thibault	00bba828ee	Fix crash using Settings in the Tablet in VR ... This was introduced in Qt5.12.3. There are several issues in their bug tracker about this issue. https://bugreports.qt.io/browse/QTBUG-75516 https://bugreports.qt.io/browse/QTBUG-75335 To workaround this, we call Qt.createComponent() manually, instead of letting StackView do it for us.	2019-06-07 16:41:56 -07:00
PrestonB1123	059d931d17	Merge pull request #15711 from PrestonB1123/removingShortcuts ... DEV-108: Removed ctrl+b and ctrl+n as shortcuts	2019-06-07 16:26:38 -07:00
amer cerkic	b57e4869c8	removed debug info	2019-06-07 16:26:21 -07:00
amer cerkic	da071abd8b	wrapping the dependencyManager::get<> call with ifdef to prevent the log from constantly spitting out that instance does not exist	2019-06-07 16:25:04 -07:00
Preston Bezos	a0753f6393	removed ctrl+b and ctrl+n as shortcuts	2019-06-07 15:41:44 -07:00
Shannon Romano	e4b26656d4	Merge pull request #15703 from amerhifi/master ... case : BUGZ 560: disabling dde initialization due to random crashes while closing down…	2019-06-07 15:15:46 -07:00
amer cerkic	f2c6cb79f7	if formatting	2019-06-07 14:17:49 -07:00
amer cerkic	049ff8e618	fixed last space	2019-06-07 14:11:13 -07:00
amer cerkic	c61f0bcf3e	more vs cleanup	2019-06-07 14:07:06 -07:00
amer cerkic	64534913af	more vs changes udo	2019-06-07 13:59:18 -07:00
amer cerkic	fd7dd7948f	reverted vs spacing changes	2019-06-07 13:41:14 -07:00
amer cerkic	9498e0a462	addressing comment concerning preferences	2019-06-07 12:47:04 -07:00
Preston Bezos	e89f499c1a	this should work	2019-06-07 12:02:15 -07:00
Preston Bezos	4eccb7a124	Revert "made one more change to get rid of ubuntu warning" ... This reverts commit e7255298de.	2019-06-07 12:00:36 -07:00
Preston Bezos	e7255298de	made one more change to get rid of ubuntu warning	2019-06-07 11:59:26 -07:00
Preston Bezos	27de181d0c	Merge branch 'master' of github.com:highfidelity/hifi into logspam	2019-06-07 11:54:48 -07:00
Preston Bezos	ad562b8f91	really need to stop clanging myself	2019-06-07 11:22:11 -07:00
Preston Bezos	e63d98e137	fixed a couple of doc errors and accounted for some edge cases	2019-06-07 11:09:21 -07:00
Preston Bezos	3ab4be6b8d	I got clanged	2019-06-07 10:42:31 -07:00
amerhifi	b1df463f56	disabling dde initialization due to random crashes while closing down the socket connection on mac	2019-06-07 10:16:36 -07:00