4795 commits

Author	SHA1	Message	Date
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
Shannon Romano	b6d1607acd	Merge pull request #14547 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities	2018-12-20 19:10:22 +00:00
Jeff Clinton	16e3914cd7	Merge pull request #14598 from amantley/ripOutCruft ... Fix for Camera-perspective-is-off-in-first-person-view, master branch	2018-12-18 17:15:58 -08:00
amantley	3e1beb2dca	removed white space and stray semi colon	2018-12-17 15:05:51 -08:00
Wayne Chen	28fd1380df	adding target scale and default avatar to login state	2018-12-17 13:37:28 -08:00
Angus Antley	77fa4e7d13	took out the unnecessary hfm.jointindex code	2018-12-16 17:29:16 -08:00
Dante Ruiz	deaf3e8e44	adding option to disable teleportring	2018-12-11 11:06:13 -08:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Jeff Clinton	b9156d68e5	Merge pull request #14508 from amantley/restingHandsBug ... removed the code that turns off inactive hands in MyAvatar.cpp	2018-12-06 09:42:34 -08:00
amantley	88a9a96346	removed the code that turns off inactive hands in MyAvatar.cpp	2018-11-30 10:08:05 -08:00
Clement	181f2b4263	Fix Agent crash on shutdown	2018-11-28 18:40:52 -08:00
Clement	7192aed131	Rework audio data memory ownership model	2018-11-14 14:45:18 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
Jeff Clinton	2afc8c505d	Merge pull request #14344 from ElderOrb/FB19348 ... FB19348 - Interface doesn't save changes to avatar animation text field	2018-11-13 14:29:25 -08:00
Brad Hefta-Gaub	b5e432bcb1	Merge pull request #14265 from amantley/needToSquat ... Bug fix for Users unable to Squat	2018-11-13 12:01:06 -08:00
Brad Hefta-Gaub	47cd6b332c	Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode ... Bug fix for head trackers in desktop mode	2018-11-13 11:49:24 -08:00
Jeff Clinton	ab8ba2daad	Merge pull request #14230 from amantley/shoulderSpaceFix ... Hand Azimuth improvement	2018-11-12 16:00:26 -08:00
amantley	f2f4a55c19	removed cruft	2018-11-12 15:07:14 -08:00
Jamil Akram	6511b60aa4	Merge pull request #14264 from ctrlaltdavid/M19085 ... Fix AvatarManager.getPalData() returning data for just a single avatar	2018-11-12 12:27:58 -08:00
John Conklin II	33da88f174	Merge pull request #14351 from luiscuenca/tweakTransitAnimations ... Tweak transit animations	2018-11-12 10:39:56 -08:00
Jeff Clinton	12b833d121	Merge pull request #14167 from ElderOrb/FB18859 ... Make material entities to be presented in avatarapp	2018-11-09 15:32:27 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
luiscuenca	6ed6e30df3	Tweak transit animation	2018-11-05 19:14:40 -07:00
luiscuenca	f9b6d3dc6f	Merge addTransitAPI branch	2018-11-05 19:02:35 -07:00
Anthony Thibault	ac8869eb61	Bug fix for head trackers in desktop mode ... Sitting and standing modes work even in desktop mode. We were inadvertently checking for HMD Mode instead of if the head was valid. * A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode. * The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level. * Sitting mode, walking mode and recentering flags are now visible in the AnimStats.	2018-11-05 16:21:19 -08:00
John Conklin II	4d74f7a0da	Merge pull request #14338 from sabrina-shanman/hfm_geo2model ... (case 19302) Rename HFMGeometry to HFMModel and adjust related variables	2018-11-05 15:00:06 -08:00
Alexander Ivash	3bc274dd10	FB19348 - Interface doesn't save changes to avatar animation text field	2018-11-04 23:11:59 +05:30
Brad Hefta-Gaub	d0181283dd	Merge pull request #14308 from sabrina-shanman/fbx2hfm ... (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-11-02 16:44:31 -07:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
sabrina-shanman	becee7f010	Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-10-30 17:28:42 -07:00
amantley	53650850da	first change to check if the hips are going through the floor : todo --> in rig disable animation when we are in experimental mode	2018-10-30 14:31:33 -07:00
luiscuenca	e49e9cdc56	Set avatar client sooner	2018-10-29 07:25:22 -07:00
luiscuenca	056fe338e1	Apply transit logic if avatar instance is client side	2018-10-27 07:15:31 -07:00
Jeff Clinton	eb383b1d09	Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter ... Quality Improvements to Avatars driven by Vive Trackers	2018-10-25 08:51:59 -07:00
Jeff Clinton	67fe43ebb1	Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars ... Small avatars now have a minimum jump height of 0.25 meters	2018-10-24 17:08:28 -07:00
amantley	7fe53d4399	removed extra const float value	2018-10-24 16:32:18 -07:00
amantley	370801bd85	removed _spine2position variable and added handling for when there is no spine2 joint. In that case the head will do the recentering rotation and the shoulders will not move with the hand azimuth	2018-10-24 16:23:05 -07:00
Luis Cuenca	fac9188dfb	Merge pull request #14187 from luiscuenca/transitAddAnimation ... Add animations to Avatar Transit	2018-10-24 10:51:21 -07:00
amantley	5063d0b527	changed handAzimuth to non const function	2018-10-23 16:51:56 -07:00
amantley	56deb500bb	Merge remote-tracking branch 'upstream/master' into shoulderSpaceFix	2018-10-23 16:36:52 -07:00
David Rowe	e879c5a32d	Merge branch 'master' into M19085 ... # Conflicts: # interface/src/avatar/AvatarManager.h	2018-10-24 12:16:38 +13:00
amantley	36466a4a9f	Merge remote-tracking branch 'upstream/master' into needToSquat	2018-10-23 16:07:23 -07:00
amantley	e9dae8ebeb	added force stand option for avatar lean behavior, you can now squat to your hearts content	2018-10-23 16:07:18 -07:00
John Conklin II	e21e7d30d7	Merge pull request #14126 from amantley/squattyPottyFix ... Sit State for the seated user in HMD: Squatty Potty Fix	2018-10-23 15:20:49 -07:00
Stephen Birarda	b789fa96f8	Merge pull request #14192 from Atlante45/fix/traits-race ... Prevent race on internal client traits members	2018-10-23 14:53:11 -07:00
amantley	2df9d6c5e9	addressed missing changes for luis	2018-10-23 13:37:56 -07:00
amantley	9bc92cb2a3	removed leftover triggers	2018-10-23 12:29:04 -07:00
luiscuenca	fa67e1b269	Remove logs and magic numbers	2018-10-23 11:51:15 -07:00