5527 commits

Author	SHA1	Message	Date
luiscuenca	bd21d0589a	Merge branch 'master' into otherAvatarMotionStates01	2018-12-30 10:55:05 -07:00
luiscuenca	4a8bbd79fe	other avatars motion states	2018-12-30 10:53:28 -07:00
Thijs Wenker	cb33a91a34	- rename functionality ... - avatar packager works in tablet now	2018-12-29 03:31:56 +01:00
Ryan Huffman	24aaeee5fd	Disable back button on avatar upload page	2018-12-27 22:55:54 -08:00
Ryan Huffman	8f70865cf7	Fix marketplace upload finishing before inventory item is valid	2018-12-27 21:02:56 -08:00
Ryan Huffman	c21d037800	Fix marketplace uploader not working with projects larger than 128MB	2018-12-27 17:51:27 -08:00
Ryan Huffman	a79bf783d2	Fix MyAvatar::collisionWithEntity not firing	2018-12-27 15:12:23 -08:00
Thijs Wenker	1a38abe230	- add jointIndexes to new ... - attempt to fix OSX / linux build - ability to actually load a recent project (previously was only able to load the top recent project)	2018-12-27 21:47:10 +01:00
Thijs Wenker	2f32458f72	recent projects	2018-12-27 19:52:56 +01:00
Thijs Wenker	b6359a6cb4	Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager	2018-12-27 14:25:13 +01:00
Ryan Huffman	1da179dc04	Update avatar packager styling	2018-12-27 00:13:45 -08:00
Thijs Wenker	a1ef1b4447	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-24 16:48:40 +01:00
Ryan Huffman	8c56e35f69	Add granular status to avatar upload	2018-12-23 00:13:01 -08:00
Ryan Huffman	b717188ed0	Update avatar project styling	2018-12-22 21:57:09 -08:00
SamGondelman	b5a2642b6a	updated entityscriptinginterface API and related functions ... (cherry picked from commit 6aac596698)	2018-12-22 00:55:10 -05:00
Ryan Huffman	9955de6288	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2018-12-21 11:43:49 -08:00
Ryan Huffman	748135eef9	Fix login-required size and projectFiles warning	2018-12-21 11:43:20 -08:00
Thijs Wenker	ad2d9bc79a	- fst read/write should work ... - images are being copied into the correct directory - scripts are added to fst upon project load - modal overlay fix	2018-12-21 19:34:54 +01:00
Thijs Wenker	ea901aa179	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-21 14:11:57 +01:00
Thijs Wenker	dab4a621a3	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2018-12-21 01:59:11 +01:00
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
Ryan Huffman	556f516be6	Update uploader screen	2018-12-20 16:30:08 -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
Thijs Wenker	79a9c82168	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-20 18:56:33 +01:00
Ryan Huffman	202326dbac	Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager	2018-12-19 12:03:30 -08:00
Ryan Huffman	c2aca64b11	Add start of opening uploaded avatar in inventory	2018-12-19 11:30:21 -08:00
Thijs Wenker	cb74313de8	create projects / style changes	2018-12-19 19:23:24 +01: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
Ryan Huffman	720cd90dc7	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-18 13:17:28 -08:00
Ryan Huffman	ad471387f7	Integrate marketplace upload API	2018-12-18 13:08:55 -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
Ryan Huffman	2269447741	Fix AvatarPackager QML size	2018-12-13 15:27:10 -08:00
Ryan Huffman	78c4c2599e	Add start of marketplace uploading and project file list	2018-12-13 13:27:31 -08:00
Thijs Wenker	96673bb5b9	show project page	2018-12-12 21:15:44 +01:00
Thijs Wenker	c0bd9121fb	open avatar projects	2018-12-12 19:55:14 +01:00
Dante Ruiz	deaf3e8e44	adding option to disable teleportring	2018-12-11 11:06:13 -08:00
Thijs Wenker	3943fe2861	avatar packager initial	2018-12-10 21:29:03 +01: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
amantley	39a16703e4	updated wording for the radio buttons for avatar leaning model	2018-10-23 10:52:14 -07:00
amantley	8cb09c37ee	changed the ui to the settings/controls	2018-10-22 21:26:30 -07:00
luiscuenca	afc76fec72	Added overrideNetworkAnimation and restoreNetworkAnimation methods	2018-10-22 15:20:32 -07:00
SamGondelman	09ea32dcc0	fix fading and highlighting issues	2018-10-22 14:12:43 -07:00
amantley	eb3db9a571	added default to case statement	2018-10-20 16:13:41 -07:00
Luis Cuenca	e1c760b566	Merge branch 'master' into transitAddAnimation	2018-10-20 15:30:23 -07:00
luiscuenca	f8d67d124f	Hold flickering fixed and refactor	2018-10-20 15:22:25 -07:00
amantley	e693275b10	Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix	2018-10-20 13:42:23 -07:00
amantley	5efb889de5	removed unused variables	2018-10-20 13:42:17 -07:00
amantley	dfdc6aee7e	Merge branch 'master' into squattyPottyFix	2018-10-20 13:39:55 -07:00
Brad Hefta-Gaub	23ddb7dea6	Merge pull request #14207 from Atlante45/fix/white-spheres ... Remove pending avatars data structure	2018-10-20 12:09:51 -07:00
amantley	a427ddb235	removed extraneous print statements	2018-10-20 09:16:05 -07:00
amantley	070a517423	changed the recenterModel variables to userRecenterModel	2018-10-19 18:07:03 -07:00
Brad Hefta-Gaub	c6fff83805	Merge pull request #14145 from ctrlaltdavid/M17223 ... JSDoc fixes	2018-10-19 16:16:19 -07:00
amantley	a43985ef64	combo box for recenter model is added	2018-10-19 16:03:53 -07:00
Brad Hefta-Gaub	acc6d3e45c	Merge pull request #14144 from ctrlaltdavid/M17222 ... Fix and fill in JSDoc for MyAvatar flying-related functions	2018-10-19 15:57:04 -07:00
Anthony Thibault	6cc7c861d1	Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest ... Disable user hand controllers if they are too far away or not moving.	2018-10-19 14:02:32 -07:00
Anthony Thibault	ef74014075	Small avatars now have a minimum jump height of 0.25 meters ... This should improve the quality of the jump animation and improve the mobility of small avatars.	2018-10-19 13:55:56 -07:00
amantley	0837f790eb	combo box changes	2018-10-19 07:46:16 -07:00
John Conklin II	4dec304d66	Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth ... Clean up elbow smoothing code	2018-10-18 19:16:32 -07:00
luiscuenca	bb5c042f16	Blend network animation	2018-10-18 17:51:20 -07:00
John Conklin II	18df79a8a6	Merge pull request #14211 from amantley/crazylegs ... Bug Fix for Crazy Legs when you sit on the floor (Manuscript 17045).	2018-10-18 17:48:26 -07:00
Anthony Thibault	3e68a1d5a5	Merge branch 'master' into feature/acceleration-limit-filter	2018-10-18 16:51:57 -07:00
amantley	b9a2f19d30	made all the suggested corrections except the dropdown qml.	2018-10-18 16:39:50 -07:00
amantley	12b03b0e07	tinkering with lerping the spine2 position in avatar space	2018-10-18 10:52:13 -07:00
amantley	8f4fafe4d0	put some smoothing on the spine2 rotation in myskeletonmodel.cpp	2018-10-18 08:44:01 -07:00
amantley	83ec346cc5	changed the hand azimuth computation to be in spine2 space. this stops you from having a reversed direction when you sit down with hmd lean off and the hands are behind the origin in the z direction.	2018-10-17 16:42:29 -07:00
Sam Gondelman	e3543cf098	Merge branch 'master' into scriptvec3	2018-10-17 13:10:29 -07:00
amantley	cd7af8b605	changed the name of sumuserheightsensorspace to averageuserheightSensorSpace	2018-10-17 08:51:40 -07:00
amantley	baeccebfb9	changed the transition times to make the sit longer and the stand shorter	2018-10-16 17:45:55 -07:00
Anthony Thibault	27c495406e	Disable user hand controllers if they are too far away or not moving.	2018-10-16 17:24:47 -07:00
amantley	1764531822	removed hand azimuth changes, that fixed azimuth when hands go behind origin of MyAvatar, these changes will be in a separate pr	2018-10-16 16:31:55 -07:00
amantley	cf7dc49499	removed a commment and changed the sanity check to be a const instead of a magic number	2018-10-16 16:04:31 -07:00
amantley	952b112271	changed the transition times to make them shorter sit == 3sec stand == 1sec, also added failsafe for when the average height is above 5ft. this can recover from a missed transition to standing.	2018-10-16 15:10:26 -07:00
luiscuenca	078baa86e4	Sitting abort post transit animation	2018-10-16 13:16:01 -07:00
David Rowe	353938193e	Add return value	2018-10-17 08:03:56 +13:00
luiscuenca	7da5fa9ea7	Transit animations won't play, they just get sent over the network	2018-10-16 11:33:58 -07:00
amantley	7d7fe8c089	removed some cruft	2018-10-15 18:12:27 -07:00
amantley	49b869c5e3	got rid of velocity count, now use 'away' to trigger when to start computing the sit stand state	2018-10-15 18:02:50 -07:00
amantley	9ec999e15e	added condition for start up in oculus that gets the correct starting height	2018-10-15 16:43:03 -07:00
amantley	ae3ae9ce9a	put in condition for away mode so that when you take the hmd off and put it back on the initial guess to your state is made again.	2018-10-15 09:52:34 -07:00
amantley	8e272d6dd2	added the correction code for when you are misslabeled as sitting while you are standing. It will now handle a sit down correctly. Also made the first approximation of state based on the average user height. This should use the user input of their height associated with their account	2018-10-15 08:43:25 -07:00
luiscuenca	ad09007bd8	Fix flickering holded entity, renames and refactors	2018-10-13 16:32:51 -07:00
Clement	3bfc5011f5	Remove _pendingAvatars struct	2018-10-12 17:57:48 -07:00
amantley	05d3becd40	changed cg hips computation so that it is not computed when hmdleanrecenter is turned off	2018-10-12 17:03:34 -07:00
amantley	90c9e578c8	when you unlock the transitions you now start in stand state	2018-10-12 16:47:53 -07:00
amantley	ee830cdcb0	cleaned white space	2018-10-12 16:05:31 -07:00
amantley	7dd156ccdd	made the threshold for the spine angle larger to make auto transitions more robust	2018-10-12 15:00:15 -07:00
luiscuenca	52ed6cb6e9	Abort settle animation if already moving	2018-10-12 11:35:51 -07:00
David Rowe	2bd5605d8c	Fix AvatarManager.getPalData() returning data for just a single avatar ... And fix up JSDoc.	2018-10-12 17:32:27 +13:00
amantley	67afc86222	cleanup	2018-10-11 18:39:44 -07:00
Clement	1bcbda7ad6	Prevent race on internal client traits members	2018-10-11 16:16:24 -07:00
amantley	f73d974ad7	added a lock state so you can lock sit or stand state, also made the ... hand azimuth relative to the spine2 location in avatar space. This stops the arms from behaving badly when the hands are in front of the chest but behind the root position of the avatar	2018-10-11 15:14:33 -07:00
luiscuenca	de1b6e717f	Cancel animation on chained trasits	2018-10-11 11:35:56 -07:00
luiscuenca	2f10327ad3	Fix last anim value	2018-10-11 10:57:39 -07:00
luiscuenca	1adac78828	fix errors and set new anim parameters	2018-10-11 10:45:35 -07:00
amantley	5faf26abd1	turned off shoulder rotation when we don't have hmd lean recentering on. this temporarily fixes the behavior of the shoulders in this mode. todo: use the spine2 position to determine azimuth of hands, then they will work in all conditions	2018-10-11 10:38:59 -07:00
unknown	82918a5c31	Add animation support	2018-10-10 12:31:16 -07:00
Anthony Thibault	0283c9fbdc	Added CriticallyDampedSpringPoseHelper to help smooth out hips.	2018-10-09 10:51:02 -07:00
amantley	c4187f0d60	Merge remote-tracking branch 'upstream/master' into squattyPottyFix	2018-10-08 17:07:55 -07:00
unknown	3c25e6d5a8	Increase the linear velocity step when the avatar is small to avoid freezing	2018-10-08 14:40:54 -07:00
Alexander Ivash	19c3f1516f	relax 'isWearable' conditions to treat entities like 'ghost.json' as wearables	2018-10-09 00:17:19 +03:00
unknown	1172e29d95	Clean up elbow smoothing code	2018-10-08 13:21:47 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
amantley	3517905435	added getter and setter for sitstandstatechange bool	2018-10-05 16:22:30 -07:00
amantley	96872f8412	moved all the state update for sit and stand to myavatar::update() also ... made it so that sit horizontal reset is handled in non-cg recentering. to do: revisit what should be sent for desired body in prephysics update call	2018-10-05 14:55:43 -07:00
Andrew Meadows	c3478dc018	remove expired avatarEntities from their avatars	2018-10-05 13:48:35 -07:00
amantley	ad46b71966	before moving the step state counting to myavatar::update()	2018-10-05 13:04:14 -07:00
David Rowe	2ba8dc37d0	Miscellanous JSDoc fixes for issues noticed in passing	2018-10-05 16:57:29 +13:00
David Rowe	539c280281	Fill in missing JSDoc stubs in AvatarList and AvatarManager	2018-10-05 15:13:13 +13:00
amantley	cbe638bfdb	added flag for vertical recentering that is state change, snap, versus ... the usual .5 second recentering	2018-10-04 18:17:27 -07:00
David Rowe	ea8e02a84a	Fix and fill in JSDoc for MyAvatar flying-related functions	2018-10-05 14:05:33 +13:00
amantley	635300c6d5	changed pre physics to use cg for desired body when in cg mode	2018-10-04 18:05:05 -07:00
amantley	82f8c67436	put the mode in sensor space for cg	2018-10-04 15:37:01 -07:00
amantley	acce675efc	added snap for recentering with sit stand state change. using average height with tipping point for thresholds	2018-10-04 14:53:51 -07:00
amantley	809ca0e512	vive hmd input is implemented. not using mode	2018-10-03 18:05:30 -07:00
Sam Gondelman	4e96c3297b	Merge branch 'master' into scriptvec3	2018-10-03 17:14:15 -07:00
luiscuenca	a05e493e06	Long distance avatars should not be new	2018-10-03 17:09:51 -07:00
luiscuenca	bb98457d09	Fix avatars transit on domain enter	2018-10-03 16:23:09 -07:00
John Conklin II	4805d3564a	Merge pull request #14075 from ctrlaltdavid/M18586 ... Teleport with play area	2018-10-03 11:02:33 -07:00
amantley	8a0fbc3fe9	changed the height to use the mode . to do fix sensor space bug.	2018-10-02 17:47:56 -07:00
John Conklin II	898ba20f1c	Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast ... Fix for bad static_pointer_cast on exit.	2018-10-02 11:31:47 -07:00
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
amantley	f0676d796c	added constants and tipping point for running average. this should be replaced by the mode	2018-10-01 17:57:00 -07:00
John Conklin II	8ad5ca5a67	Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix ... Fix avatar warp into floor when navigating to a saved bookmark	2018-10-01 16:36:31 -07:00
Brad Hefta-Gaub	6290b56383	Merge pull request #14079 from luiscuenca/simpleAvatarTransit ... Simple avatar transit	2018-10-01 16:24:46 -07:00
amantley	90feeffa9d	cleaning up. putting squat fix in vertical recenter	2018-10-01 14:21:00 -07:00
amantley	1a0e2c6ea1	clean up for pr	2018-10-01 08:30:51 -07:00
amantley	9e40045927	added criteria to stop false positive for sit down	2018-09-30 17:13:34 -07:00
amantley	bdd6befef9	Merge remote-tracking branch 'upstream/master' into squattyPottyFix	2018-09-29 15:39:36 -07:00
amantley	884ad66a14	added sensor space detection of height of the user in MyAvatar.cpp 1.2 * average sensor space height changes to standing. .833 sensorspace height changes to sitting. there is also a manual override in the avatar app settings now	2018-09-28 17:18:24 -07:00
Anthony Thibault	58df72af60	Merge branch 'master' into bug-fix/bad-avatar-pointer-static-cast	2018-09-28 16:32:12 -07:00
David Rowe	1c4bde3e84	Fix build warnings	2018-09-28 18:38:38 +12:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
David Rowe	f2c13f193c	Don't jump in HMD mode unless option is set	2018-09-28 16:05:20 +12:00
luiscuenca	195df9e0ec	compute feet position offset in situ	2018-09-27 17:18:43 -07:00
amantley	42cb8a7ef0	avatar app changes	2018-09-27 16:59:54 -07:00
amantley	52355e53f1	adding the menu item to the avatar app for the sit state.	2018-09-27 16:44:55 -07:00
luiscuenca	bbe836ee88	Remove smooth teleport and set/get API methods	2018-09-27 10:38:45 -07:00
David Rowe	6ae206677d	Add Settings > Controls option for displaying play area	2018-09-27 14:55:53 +12:00
amantley	fa9abf0fff	added the floor at 0.0 in sensor space for oculus. to do: vive	2018-09-26 18:08:00 -07:00
John Conklin II	7701cfd9c8	Merge pull request #14084 from luiscuenca/appearOnFloorFix ... Fix avatars loading below the ground bug	2018-09-26 16:00:53 -07:00
John Conklin II	70c7ffcc71	Merge pull request #14069 from AndrewMeadows/avatar-collisions-002 ... fix MyAvatar-vs-OtherAvatar collisions	2018-09-26 15:21:18 -07:00
John Conklin II	0de433c7c7	Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master ... fix for deadlock in other avatar entity removal from tree	2018-09-26 09:58:26 -07:00
amantley	4f9de1be1c	Merge remote-tracking branch 'upstream/master' into squattyPottyFix	2018-09-26 08:38:30 -07:00
luiscuenca	754653b093	Fix warnings	2018-09-25 17:31:18 -07:00
luiscuenca	82b08f1a93	Wait until skeleton is loaded to locate the avatar	2018-09-25 16:21:05 -07:00
amantley	ad6bbc7ff6	latest squatty changes	2018-09-25 11:22:44 -07:00
luiscuenca	1e34d3aa35	Remove not needed code	2018-09-25 09:22:33 -07:00
luiscuenca	af2935187b	Fix warnings	2018-09-25 08:32:43 -07:00
luiscuenca	0676f25e31	Save transit preferences	2018-09-25 07:42:28 -07:00
luiscuenca	80daf35e77	Animation and particles clean up	2018-09-25 07:17:26 -07:00
luiscuenca	3e2ee119f0	API to configure animation and particle effect	2018-09-25 06:03:29 -07:00
Andrew Meadows	a3f946dee1	activate OtherAvarar in physics sim on position change	2018-09-24 16:27:37 -07:00
Andrew Meadows	c1d65f5118	update avatar shape after it loads	2018-09-24 12:07:08 -07:00
Anthony Thibault	b467267e40	Fix for bad static_pointer_cast on exit. ... Identified by Address Sanatizer on Linux. On exit ~Applicaiton calls AvatarManager::deleteAllAvatars. This iterates over all avatars remaining in the _avatarHash. Typically this includes the MyAvatar instance. In this case the previous code would attempt to static cast an AvatarData pointer to an instance of OtherAvatar. This might be harmless, but could also lead hard to diagnose issues such as memory corruption.	2018-09-24 11:47:05 -07:00
luiscuenca	012cd207b3	No data sent during basic transit	2018-09-24 11:39:10 -07:00
Stephen Birarda	b31837168d	fix bad lock, optimize some operations, clarify comment	2018-09-24 11:27:20 -07:00
luiscuenca	82b14b6e9b	Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport	2018-09-22 05:47:05 -07:00
luiscuenca	01f87a0645	lerp myavatar	2018-09-22 05:34:17 -07:00
Seth Alves	86e502637e	Make Settings thread safe	2018-09-21 15:46:35 -07:00
luiscuenca	a7a128f1f1	Particle effect and ease movement	2018-09-20 18:37:42 -07:00
luiscuenca	cad8425c7b	Time-based frames, max distance and setting animation from script	2018-09-19 16:43:45 -07:00
Stephen Birarda	3a7785d10f	fix for deadlock in other avatar entity removal	2018-09-18 17:52:24 -07:00
amantley	42e248ef84	maded more changes to support sitting state to do: add option for stuck pose reset	2018-09-18 17:37:44 -07:00
luiscuenca	96e8b060eb	Enable transit animations	2018-09-18 12:42:37 -07:00
amantley	96da9b7e54	cleaned up code for squatty fix	2018-09-18 10:31:19 -07:00
amantley	14fb7e1d44	removed redundant code	2018-09-17 17:53:08 -07:00
amantley	ff0d938d37	initial changes to stop the squatty potty from happening when users are sitting down in vr mode	2018-09-17 16:53:15 -07:00
luiscuenca	f339bbdd7f	Fix bug while walking	2018-09-17 13:29:04 -07:00
luiscuenca	ff319ebd95	Bypass position updates from mixer	2018-09-17 09:47:22 -07:00
John Conklin II	65ef04ae75	Merge pull request #13937 from luiscuenca/stt_teleport_wip ... Safe Teleport Target	2018-09-14 15:11:18 -07:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00
luiscuenca	c5669ef1f5	better property names	2018-09-13 15:22:18 -07:00
luiscuenca	6a9a898b62	make updateCollisionCapsule private	2018-09-13 15:07:34 -07:00
luiscuenca	ceccc6d6ec	make getCollisionCapsule thread safe	2018-09-13 14:49:35 -07:00
John Conklin II	b675e6cc6b	Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling ... Performance improvements for Avatar Mixer	2018-09-13 13:43:18 -07:00
luiscuenca	b517808bc2	Fix smaller size avatar capsule and land on detailed mesh	2018-09-12 21:24:19 -07:00
Stephen Birarda	b1f44d2ad7	perform avatar entity cleanup in AvatarManager::handleRemovedAvatar	2018-09-12 12:30:15 -07:00
luiscuenca	b9fbcce403	init frames per meter	2018-09-12 10:15:00 -07:00
luiscuenca	4d381b9d04	Smooth other avatars positions	2018-09-12 10:01:41 -07:00
John Conklin II	f67deb9f65	Merge pull request #13938 from wayne-chen/interstitalMerged ... Interstitial Page with 404 Redirect	2018-09-12 08:39:52 -07:00
Brad Hefta-Gaub	d319bea2ac	Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb ... Avatar loading orb now indicates loading status	2018-09-11 18:01:40 -07:00
Wayne Chen	63ad85215b	Merge branch 'master' into interstitalMerged	2018-09-11 17:17:33 -07:00
Anthony Thibault	23ed314250	Fix for missing return warning	2018-09-11 14:50:50 -07:00
Dante Ruiz	b665dbe13e	finished requested changes	2018-09-11 14:18:12 -07:00
Anthony Thibault	bc5d9a46a2	Avatar loading orb now indicates status ... white - no url has been received yet for this avatar purple - a url has been received for this avatar but it's content is still downloading/loading blue - (only visible breifly) content has succesfully loaded red - (only visible briefly) content has failed to download.	2018-09-11 13:12:46 -07:00
luiscuenca	fedea6e84d	Comply with review comments	2018-09-11 12:23:25 -07:00
Simon Walton	d12376187c	Merge branch 'master' into avatar-mixer-scaling	2018-09-10 10:15:49 -07:00
luiscuenca	a9f676354b	Only invisible pointers and scale fix	2018-09-10 08:54:53 -07:00
Stephen Birarda	adac872a11	clear other avatars in agent on avatar mixer disconnect	2018-09-07 15:04:14 -07:00
luiscuenca	d09391faa5	Fix invisible error	2018-09-07 12:17:40 -07:00
luiscuenca	02065518cb	Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip	2018-09-07 11:57:48 -07:00
John Conklin II	405e2da91e	Merge pull request #13949 from sabrina-shanman/stt_parenting_scale ... Scale Collision Pick to match parent	2018-09-07 11:54:02 -07:00
Simon Walton	741d4ba998	Merge branch 'master' into avatar-mixer-scaling	2018-09-07 09:30:39 -07:00
SamGondelman	ed7f993c0d	avatar mixer and manager perf improvements and cleanup	2018-09-06 16:57:20 -07:00
amantley	90a51e6181	added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area	2018-09-06 13:12:48 -07:00
sabrina-shanman	727b62144f	Fix MyAvatarHeadTransformNode not using avatar scale	2018-09-06 12:03:13 -07:00
Dante Ruiz	200f6d540a	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-09-06 09:59:51 -07:00
amantley	6fb335429d	starting to re-implement the walking state detection for smoothwalking	2018-09-05 17:55:27 -07:00
luiscuenca	abb632afda	Update capsule when scale/load and teleport without safe landing	2018-09-05 16:51:34 -07:00
amantley	73e628bb8d	merge with master fixes	2018-09-05 14:42:49 -07:00
Anthony Thibault	584d39744f	Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode ... HMD mode bug fix for avatars with no eyes	2018-09-05 10:57:21 -07:00
Andrew Meadows	4a1bd98584	Merge pull request #13914 from SamGondelman/avatarmanager ... Miscellaneous low-level performance improvements	2018-09-05 10:12:05 -07:00
Simon Walton	262dbaf5ed	Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling	2018-09-04 15:27:41 -07:00
Simon Walton	695fabf4f5	Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling	2018-09-04 15:27:18 -07:00
Simon Walton	6ae2ca1576	Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling ... Merge of Samuel's change to use simple sort instead of priority queue	2018-09-04 15:26:26 -07:00
Anthony Thibault	b21fa1037f	Code review feedback and bug fixes for calibraiton matrices	2018-09-04 11:55:52 -07:00
SamGondelman	ade58a52cc	reserve priority sort util vectors	2018-09-04 11:21:43 -07:00
Anthony Thibault	3a034fdf66	HMD mode bug fix for avatars with no eyes ... Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing. Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes. This is more accurate for characters that don't quite have human proportions.	2018-09-04 10:13:57 -07:00
Sam Gondelman	7cdc7dcc66	Merge pull request #13873 from sabrina-shanman/stt_parenting ... Collision Pick Parenting	2018-08-31 14:43:55 -07:00
SamGondelman	d01b438cb3	CR	2018-08-31 11:25:17 -07:00
SamGondelman	5f08ed5027	misc perf improvements	2018-08-30 16:55:15 -07:00
Anthony Thibault	78d7c321b8	Merge pull request #13796 from amantley/noNeckFix ... Avatar without Neck Joint bug 14620	2018-08-30 14:52:44 -07:00
John Conklin II	8fa4a2855e	Merge pull request #13641 from amantley/rotateFilterChange ... Hand Azimuth Controls Shoulder Rotation	2018-08-30 13:59:00 -07:00
John Conklin II	bf0ab865bb	Merge pull request #13903 from birarda/bug/av-entity-delete-master ... send MyAvatar avatar entity updates through entity tree	2018-08-30 10:25:31 -07:00
Dante Ruiz	8c77820e30	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-30 09:45:41 -07:00
Stephen Birarda	aaf5f593c5	send MyAvatar avatar entity updates through entity tree	2018-08-29 16:30:24 -07:00
Angus Antley	9fb0f8b7c0	added condition to prevent overwriting tracker input with estimated orientation for spine2 joint	2018-08-30 00:25:53 +01:00
sabrina-shanman	0981f08b22	Do not propagate avatar scale in AvatarHeadTransformNode	2018-08-29 14:48:27 -07:00
Angus Antley	f7d0cdda02	added a check for whether the head to shoulder azimuth is greater than 100 degrees. If so unflip the chest azimuth	2018-08-29 20:44:21 +01:00
Angus Antley	ee33f5dc97	normalize the hip hand vector in getSpine2RotationRigSpace, made computeHandAzimuth a const function that returns a vec2	2018-08-29 01:57:49 +01:00
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -07:00
amantley	3c792a04c1	fixed roll rotation added to azimuth in MySkeletonModel.cpp	2018-08-28 11:25:42 -07:00
amantley	89b508251e	added some comment to explain rig to avatar transform	2018-08-27 17:57:50 -07:00
amantley	055f03878e	made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now	2018-08-27 14:44:27 -07:00
danteruiz	e2cd695dfb	PR code clean up	2018-08-27 11:01:29 -07:00
amantley	8406fb2359	Merge remote-tracking branch 'upstream/master' into steppingReboot	2018-08-24 16:48:26 -07:00
amantley	dd8a00983c	Merge remote-tracking branch 'upstream/master' into rotateFilterChange	2018-08-24 16:29:20 -07:00
amantley	2bec867863	added the sanity check to see if the shoulders have flipped	2018-08-24 16:29:08 -07:00
Dante Ruiz	af19849a75	fixing merge conflict	2018-08-24 15:48:42 -07:00
sabrina-shanman	3167d3c0c7	Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head	2018-08-24 15:47:52 -07:00
SamGondelman	70f4d0c634	Merge remote-tracking branch 'upstream/master' into perf	2018-08-24 14:04:37 -07:00
SamGondelman	3d048c77ba	Merge remote-tracking branch 'upstream/master' into recurse	2018-08-24 11:39:05 -07:00
amantley	a60ab863a3	demo version of the head and hands determining the rotate function	2018-08-24 11:06:36 -07:00
Angus Antley	25610c7587	got the hands turning the shoulders, needs error checking	2018-08-24 11:04:36 +01:00
Angus Antley	44a6c7df5f	added hook to myskeleton model to update spine2, need to get the rotation from myavatar then we have spine rot	2018-08-24 07:17:17 +01:00
amantley	0e0561bb24	latest rotate code	2018-08-23 17:59:18 -07:00
Dante Ruiz	11ab6dd0b5	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-23 13:20:09 -07:00
Andrew Meadows	8f2141b592	fix compile error	2018-08-23 12:59:28 -07:00
Andrew Meadows	f5cae61b43	fix typo causing compile failure	2018-08-23 12:59:28 -07:00
Andrew Meadows	87223946ad	add/remove avatars according to workload region	2018-08-23 12:59:28 -07:00
Andrew Meadows	3ecabb6583	cleanup after removing spaghetti	2018-08-23 12:59:28 -07:00
Andrew Meadows	99aafb1f95	move code from Avatar to OtherAvatar	2018-08-23 12:59:28 -07:00
Andrew Meadows	615b8addd0	fix order of includes	2018-08-23 12:59:28 -07:00
Andrew Meadows	598a227f1a	use OtherAvatar instead of Avatar in AvatarMotionState	2018-08-23 12:59:28 -07:00
Andrew Meadows	3c01433e12	stub for avatars changing workload regions	2018-08-23 12:59:28 -07:00
Andrew Meadows	21adbf49c0	remove cruft	2018-08-23 12:59:28 -07:00
Andrew Meadows	15665b25e8	give OtherAvatars a proxy in workload	2018-08-23 12:59:28 -07:00
John Conklin II	1320a34a18	Merge pull request #13841 from luiscuenca/noAttachmentsToJSON ... Don't include old attachment data on new avatar recordings	2018-08-23 10:51:33 -07:00
Dante Ruiz	54258a8707	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-23 09:53:20 -07:00
Angus Antley	30ef544c6d	starting the c++ version of shoulder rotation	2018-08-23 15:57:14 +01:00
SamGondelman	c474f38860	force coarse picking, sort avatars	2018-08-22 18:07:16 -07:00
SamGondelman	5c0b12abf6	ordered ray/parabola intersection code	2018-08-22 16:29:17 -07:00
Wayne Chen	9518b8cdaf	rearrangement	2018-08-22 15:46:02 -07:00
Wayne Chen	c32cc1ead2	adding implementation	2018-08-22 15:42:15 -07:00
Dante Ruiz	f5441b2721	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-22 15:28:42 -07:00
luiscuenca	b3d127c953	Fix flickering	2018-08-22 14:31:34 -07:00
amantley	9dfaf32b72	fixed the step animation but it still needs work	2018-08-22 14:12:19 -07:00
amantley	2dd812935f	Merge remote-tracking branch 'upstream/master' into rotateFilterChange	2018-08-22 12:57:16 -07:00
amantley	1e3ca6f902	added quicker follow code and added head to rotate calculation	2018-08-22 12:57:06 -07:00
amantley	456b8bf2a9	tweaked the animvars callback to update the spine2 position	2018-08-22 09:36:52 -07:00
luiscuenca	5f4903f884	Record entities	2018-08-22 08:53:51 -07:00
amantley	1fabc77244	latest update to stop lurching, and allow leaning, and stop perma leans	2018-08-21 12:34:05 -07:00
Stephen Birarda	1723f3d3d8	don't use entity tree to clear all avatar entities	2018-08-21 12:21:29 -07:00
Stephen Birarda	a177e49877	Revert "send attachment clears through setAvatarEntityData" ... This reverts commit 25876bca63.	2018-08-21 12:18:11 -07:00
Stephen Birarda	25876bca63	send attachment clears through setAvatarEntityData	2018-08-21 10:32:05 -07:00
Stephen Birarda	f0ba61ff05	add missing local ID, reset client processed trait versions	2018-08-21 10:32:05 -07:00
Stephen Birarda	e33f349d53	fix flagging for avatar entity update/delete	2018-08-21 10:32:05 -07:00
Stephen Birarda	ea7c0e923a	make client traits handler a unique ptr in AvatarData	2018-08-21 10:31:15 -07:00
Stephen Birarda	a0df68f32f	move skeleton model URL emit to AvatarData	2018-08-21 10:31:14 -07:00
Stephen Birarda	a80d19a44a	remove skeleton from identity, handle in clients	2018-08-21 10:31:14 -07:00
Stephen Birarda	ac835650b7	add skeleton trait sending to Agent, queuing in AvatarMixer	2018-08-21 10:31:14 -07:00
Stephen Birarda	486557e28a	initial trait packet sending on skeleton URL change	2018-08-21 10:31:14 -07:00
Dante Ruiz	db3d3d3d93	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-21 09:56:59 -07:00
amantley	2dcdd60750	added new AvatarConstants and more frequent horizontal recentering to deal with lurching walk in large tracked volumes	2018-08-20 17:32:52 -07:00
SamGondelman	9ab1fc0500	Merge remote-tracking branch 'upstream/master' into perf	2018-08-20 17:04:42 -07:00
amantley	baa17395f0	Merge remote-tracking branch 'upstream/master' into rotateFilterChange	2018-08-20 16:47:21 -07:00
amantley	94026fb4dd	added activate(rotation) to prephysics update	2018-08-20 16:47:14 -07:00
SamGondelman	05ff99a1d2	working on blendshapes	2018-08-20 11:40:25 -07:00
amantley	471bb28545	Merge remote-tracking branch 'upstream/master' into steppingReboot	2018-08-20 09:50:45 -07:00
Andrew Meadows	90429f07cb	don't forget to use enqueue the Transaction	2018-08-16 14:38:32 -07:00
John Conklin II	1edf1b4337	Merge pull request #13555 from SamGondelman/destroy ... Trying to fix dependency shutdown	2018-08-16 13:14:58 -07:00
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
Seth Alves	0a5c96ecc1	Merge pull request #13792 from luiscuenca/attachmentsAPImgr ... Attachments API returns avatar entities	2018-08-13 14:21:13 -07:00
amantley	c2612af7a8	changed the spine stretch limit, will check the scale implications next	2018-08-10 17:10:33 -07:00
luiscuenca	dd93055d89	Convert and load attachments when rig is ready	2018-08-10 16:15:30 -07:00
Sam Gateau	d5c5bd714f	Merge pull request #13785 from AndrewMeadows/no-update-fading-avatars ... don't call Avatar::simulate() on fading avatars	2018-08-10 15:44:07 -07:00
John Conklin II	644ff1eafa	Merge pull request #13655 from amantley/animationBlendChanges ... New Default Strafe Animations Plus Animation Tuning Support	2018-08-10 15:03:30 -07:00
Wayne Chen	769e7eab03	removing domainLimitedScale property and changing read property of scale	2018-08-09 17:38:58 -07:00
amantley	c8a31bc59f	created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3	2018-08-09 17:38:57 -07:00
Wayne Chen	d533e3b341	adding domainLimitedScale property	2018-08-09 17:29:13 -07:00
amantley	f26d6b8c3d	cleaned up code and changed the forward offset for the default eyes when there is no neck bone	2018-08-09 12:15:35 -07:00
luiscuenca	9ca0ee05dc	Fix wanings	2018-08-09 12:13:03 -07:00
amantley	a3f2fd1f23	removed some print statements and added the code to use the head parent when the neck is missing, this allows for cauterization	2018-08-09 11:33:27 -07:00
luiscuenca	8c121a531d	Turn attachments into avatar entities	2018-08-09 10:35:15 -07:00
Andrew Meadows	8153e660bf	don't simulate/animateScaleChanges for fading avatars	2018-08-09 08:54:28 -07:00
amantley	c774dd7f5b	debugging to solve the no-neck crazy scale problem	2018-08-08 17:52:22 -07:00
Andrew Meadows	9b0dcb45ba	don't update fading avatars	2018-08-08 14:00:44 -07:00
r3tk0n	32165dff40	Fixed rotations in MyAvatar::goToFeetLocation()	2018-08-07 14:31:48 -07:00
amantley	1353406254	more whitespace	2018-08-07 12:56:28 -07:00
amantley	84619e7adc	cleaned up to match coding standards	2018-08-07 10:40:11 -07:00
MuteTab	b590ff793a	New function for changing location in domains such that the AVatar's leg-length is taken into account.	2018-08-06 20:26:44 -07:00
amantley	1ad6b041cd	updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed	2018-08-06 18:36:32 -07:00
SamGondelman	e3756a6dae	Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy	2018-08-06 11:21:51 -07:00
SamGondelman	9806bce403	weak pointers to nodeList	2018-08-06 11:21:32 -07:00
Sam Gondelman	2edefe3209	Merge branch 'master' into destroy	2018-08-06 09:51:14 -07:00
amantley	08889b627a	Merge remote-tracking branch 'upstream/master' into animationBlendChanges	2018-08-06 09:16:53 -07:00
Dante Ruiz	cca76f7022	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-06 08:02:03 -07:00
John Conklin II	00a8b73814	Merge pull request #13751 from danteruiz/fix-flying ... fix flying	2018-08-03 19:27:47 -07:00
Dante Ruiz	f30b552e19	fix-flying	2018-08-03 15:50:11 -07:00
Sam Gateau	aac4ff0b7e	Merge pull request #13749 from samcake/punk ... Fix the other avatars not being removed when Avatar mixer reset	2018-08-03 15:37:13 -07:00
Dante Ruiz	683b42e35b	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-03 09:59:35 -07:00
Sam Gateau	da252a70c1	Same as https://github.com/highfidelity/hifi/pull/13747	2018-08-03 09:22:29 -07:00
Dante Ruiz	048196ec6f	disble sending avatar and audio packets during interstitial mode	2018-08-02 11:39:06 -07:00
amantley	bd88d5f15b	merging with ik leg fix code in master	2018-08-02 09:48:04 -07:00
amantley	6b2c67e5bd	more doug support	2018-08-01 18:22:51 -07:00
SamGondelman	1ba28de5b6	try to fix nodelist not getting destroyed	2018-08-01 17:52:27 -07:00
Andrew Meadows	e336c9276d	first set shape THEN use it	2018-08-01 17:39:57 -07:00
SamGondelman	8a9c27ed92	Merge remote-tracking branch 'upstream/master' into destroy	2018-08-01 16:07:48 -07:00
Andrew Meadows	bd6f00e707	eliminate angular dynamics of other-avatars	2018-08-01 11:58:52 -07:00
Andrew Meadows	c939699879	ignore other-avatar angularVelocity in physics simulation	2018-08-01 11:22:58 -07:00
amantley	02dd2f4f28	added velocity scaling for forward and back	2018-07-31 18:26:44 -07:00
John Conklin II	16940cc9b7	Merge pull request #13716 from r3tk0n/17170-flying-crash ... Remove deprecated flying setting from MyAvatar.cpp saveData()	2018-07-31 09:48:01 -07:00
John Conklin II	bd2ab38bfe	Merge pull request #13701 from ElderOrb/FB16702 ... FB16702 - Avatar App does not save Animation JSON Override URL	2018-07-30 14:51:32 -07:00
r3tk0n	63de16bac5	Remove deprecated flying setting from MyAvatar.cpp saveData()	2018-07-30 11:40:15 -07:00
Sam Gondelman	8201997a16	Merge pull request #13660 from SamGondelman/parabolic ... Parabolic Picking + Pointers	2018-07-30 10:49:02 -07:00
John Conklin II	021e09d083	Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash ... fix a crash when grabbing a non-dynamic entity with an overlay child	2018-07-27 12:49:14 -07:00
John Conklin II	d4cbbfe4c1	Merge pull request #13692 from amantley/leanBackSittingFix ... Fix For Unnatural Hips Behaviour When Sitting In HMD	2018-07-27 12:30:31 -07:00
Seth Alves	91d509f5a4	fix a crash when grabbing a non-dynamic entity with an overlay child	2018-07-27 10:35:26 -07:00
Seth Alves	41af82a7f6	Merge pull request #13702 from r3tk0n/17016-flying-settings ... 17016 flying settings	2018-07-27 10:07:13 -07:00
Alexander Ivash	29f7cab7df	FB16702 - Avatar App does not save Animation JSON Override URL ... note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'	2018-07-27 02:08:44 +03:00
r3tk0n	f3d0d9b4a0	Clean up garbage comments.	2018-07-26 15:37:42 -07:00
r3tk0n	f8c611b1d0	Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp	2018-07-26 15:35:12 -07:00
amantley	12cb212dc7	used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards	2018-07-26 12:05:17 -07:00
Anthony Thibault	6c92949aed	Merge pull request #13672 from luiscuenca/fixElbowPoleVector ... Redesign and enable hand's Pole Vectors for elbow simulation	2018-07-26 11:51:33 -07:00
amantley	37540c79b3	removed print statement and added const upper leg fraction	2018-07-25 10:51:19 -07:00
amantley	c5599623f7	added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting	2018-07-25 10:29:29 -07:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
luiscuenca	e7d70a832d	Pole Vectors always calculated when arms are crossed	2018-07-24 08:58:17 -07:00
John Conklin II	2ac9463830	Merge pull request #13653 from ElderOrb/fake-wearables-fix ... FB16870: Avatar Wearables showing incorrect number	2018-07-23 15:55:11 -07:00
luiscuenca	2adb334034	unused code deleted	2018-07-23 14:25:30 -07:00
luiscuenca	9d2d7c3aa4	Redesign and enable hand's Pole Vectors for elbow simulation	2018-07-23 13:16:11 -07:00
Alexander Ivash	33c858774b	fix coding standard compliance	2018-07-23 21:01:43 +03:00
r3tk0n	bc91affa70	Bring this PR inline with RC70.1 PR.	2018-07-20 15:13:44 -07:00
SamGondelman	763e6465a2	followNormal, fixin stuff	2018-07-20 10:41:24 -07:00
Alexander Ivash	849c91d8f6	remove not necessary EntityTreeRenderer from removeAvatarEntities's condition	2018-07-20 19:32:58 +03:00
Alexander Ivash	fb8640de47	FB16870: Avatar Wearables showing incorrect number	2018-07-20 02:51:17 +03:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
MuteTab	dfcf47e8ee	Removed useless comment.	2018-07-19 14:44:32 -07:00
MuteTab	8d65e14193	Remove one change, turned out to be unnecessary.	2018-07-19 14:43:46 -07:00
MuteTab	3080539b63	Make getFlyingEnabled() always true when in desktop.	2018-07-19 14:40:20 -07:00
amantley	5ec7ab3a7d	removed the other way of computing the average lookat which used a ring buffer	2018-07-18 17:20:47 -07:00
amantley	a8c4f4e650	removed extra whitespace	2018-07-18 17:10:09 -07:00
amantley	7cc724a27b	added properties to allow the toggling of the debug draw the look at vector, and the reset moving average look at on step detection	2018-07-18 17:08:04 -07:00
amantley	ef2d3c9f16	Merge remote-tracking branch 'upstream/master' into rotateFilterChange ... synching with master	2018-07-18 09:00:18 -07:00
Qliemillar	080d664341	Merge pull request #13619 from luiscuenca/handTouchDisabler ... Allow creators to disable hand touch from javascript	2018-07-18 08:16:37 -06:00
amantley	33f9acde67	latest	2018-07-17 17:42:11 -07:00
luiscuenca	e3594fe1b7	mutex added	2018-07-17 17:23:03 -07:00
luiscuenca	ba884f8a94	Forgotten coment	2018-07-17 16:42:59 -07:00
luiscuenca	6225435385	some ortographic fixes	2018-07-17 16:38:34 -07:00
luiscuenca	fcb7614f7e	Format and fixes	2018-07-17 16:34:30 -07:00
SamGondelman	845ddda695	parabola-overlay and -avatar intersection, handle case where acceleration == 0	2018-07-17 12:41:03 -07:00
Qliemillar	d498d6bb3d	Merge pull request #13617 from amantley/rotateRecenter ... Reduce Frequent Flipping of Avatar Facing Direction By Resetting _headControllerFacingMovingAverage	2018-07-17 08:57:24 -06:00
luiscuenca	82a3b73de8	Added disable hand touch for entityID	2018-07-17 07:06:48 -07:00
luiscuenca	84dac94379	Allow creator to disable hand touch	2018-07-16 17:03:50 -07:00
amantley	abb2c7ef14	Added reset of the _headControllerFacingMovingAverage in MyAvatar.cpp prePhysicsUpdate(). This stops some of the flipping back and forth that has been happening with rotational recenter.	2018-07-16 11:29:49 -07:00
Zach Fox	ac2351e49f	Make JSDoc happy	2018-07-16 11:00:27 -07:00
Zach Fox	4daa0c6537	CR feedback	2018-07-13 12:47:45 -07:00
Zach Fox	92756d81ad	Implement MS16562: Massive PAL speedup!	2018-07-12 15:05:31 -07:00
Anthony Thibault	1d33f51ca4	Merge pull request #13528 from amantley/integratedStepping ... Step Detection From Head and Hands Tracking	2018-07-10 09:59:22 -07:00
John Conklin II	81f5631ce9	Merge pull request #13386 from ElderOrb/FB13949 ... AvatarApp	2018-07-09 15:20:18 -07:00
amantley	cb421fd5b0	fixed build errors for mac and linux	2018-07-09 15:09:45 -07:00
amantley	55ae08c071	Merge remote-tracking branch 'upstream/master' into integratedStepping	2018-07-09 13:55:59 -07:00
amantley	b2d77ef51a	bracket spacing	2018-07-09 13:54:18 -07:00
amantley	7ed8f17b57	tweaked posterior threshold and head velocity threshold	2018-07-09 13:49:21 -07:00
amantley	a3417cace9	implemented code review changes. 1. checking for divide by zero before glm::normalize. 2. clearing the ring buffer on reset. 3. renaming _standingHeightMode to _currentStandingHeight	2018-07-09 11:58:02 -07:00
John Conklin II	e6801c303a	Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request ... Implement AvatarRequestIdentity and use if interface gets unknown avatar data	2018-07-09 10:07:19 -07:00
amantley	defd6f88e6	started changes suggested by code review, ie mode computation	2018-07-06 18:17:13 -07:00
Simon Walton	607a898c32	Transmit a maximum number of identity requests before giving up	2018-07-06 15:16:13 -07:00
Alexander Ivash	aaa2e3f6a8	fix issue with duplicated wearables on switching between bookmarks / cancelling 'adjust wearables'	2018-07-06 21:00:56 +03:00
Alexander Ivash	7fa09aef8f	slightly update jsdoc with functions description	2018-07-06 21:00:55 +03:00
Alexander Ivash	dbcc654af1	remove comments	2018-07-06 21:00:55 +03:00
Alexander Ivash	3ac44376b2	bind Settings page to a backend	2018-07-06 21:00:53 +03:00
Alexander Ivash	b6769f9678	avatar selection & wearables adjustments work-on-progress	2018-07-06 21:00:52 +03:00
Alexander Ivash	5007c259bb	query real avatar favorites (but use fake urls for now)	2018-07-06 21:00:52 +03:00
Dante Ruiz	533164e1e4	some more fixes	2018-07-06 08:55:20 -07:00
Simon Walton	f77b2903a1	Minor tweaks	2018-07-05 17:13:27 -07:00
SamGondelman	7954865141	trying to fix dependency shutdown	2018-07-05 14:34:37 -07:00
amantley	0ebc7fc29e	fixed the mode computation so that it can keep track of all long term height frequencies. This makes it unnecessary to reset the mode, because it will revert back to the highest frequency	2018-07-05 13:41:06 -07:00
Anthony Thibault	c840670a54	Merge pull request #13519 from hyperlogic/bug-fix/stable-pole-vector-smoothing ... Bug fix for unexpected avatar knee shifts for users wearing Vive Trackers.	2018-07-03 21:50:57 -07:00
amantley	6460c9e861	fixed case for 0.0 as the filter length	2018-07-03 17:11:19 -07:00
Simon Walton	ec67b8ad56	Address reviewer comments	2018-07-03 15:31:34 -07:00
amantley	4995b57712	removed print statements and fixed rotation threshold update code	2018-07-03 14:31:36 -07:00
amantley	59dfe80940	Merge remote-tracking branch 'upstream/master' into integratedStepping	2018-07-03 11:47:09 -07:00
amantley	9e5763ea5c	adding the recentering back into the non hmd lean code	2018-07-03 11:46:59 -07:00
amantley	3424f412aa	Merge pull request #13437 from amantley/lurchfix ... Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)	2018-07-03 19:38:01 +01:00
amantley	f216316b55	removed some comments and whitespace	2018-07-02 18:19:31 -07:00
amantley	47110d080f	removed clang induced changes to MyAvatar.cpp	2018-07-02 17:06:16 -07:00
amantley	7f5f762208	fixing merge conflict	2018-07-02 15:54:21 -07:00
amantley	096d0d2827	reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update	2018-07-02 15:43:57 -07:00
Anthony J. Thibault	fff4348a0f	Bug fix for poleVector smoothing ... Needs to occur in sensor space rather then avatar space.	2018-06-29 17:54:21 -07:00
amantley	44d9edec3c	added the properties for filter length and rotation threshold to MyAvatar class This will help us test the right combo for head based turning	2018-06-29 14:42:23 -07:00
amantley	c9c222a253	added the failsafe code to the stepping	2018-06-29 11:33:42 -07:00
amantley	15a17ae32a	finished the step detection, need to finish the failsafe	2018-06-28 18:36:13 -07:00
John Conklin II	0a0e1668d5	Merge pull request #13478 from amantley/glowingOrbMaster ... The client should render "something" for an avatar even if mesh or identity is not available	2018-06-28 12:12:16 -07:00
amantley	3e6d54e83c	added all the parts for the step conditional to do: failsafe	2018-06-28 11:56:46 -07:00
John Conklin II	138342ba91	Merge pull request #13485 from zfox23/MS16257_clearOverlay ... Implement MS16257: Remove 'clear overlay when moving' setting and code	2018-06-28 09:31:04 -07:00
Angus Antley	2307c8e24a	more work on the mode threshold	2018-06-28 15:40:42 +01:00
amantley	621ca7d2b4	more work on the mode function	2018-06-27 18:46:24 -07:00
amantley	61a935dbb5	added the first pass at mode computation	2018-06-27 18:02:11 -07:00
John Conklin II	0cb8b4dfa1	Merge pull request #13471 from danteruiz/disable-flying-by-default ... Disable flying by default	2018-06-27 16:04:16 -07:00
amantley	205cd44a49	removed override keyword from OtherAvatar and MyAvatar destructors, also ... added the virtual keyword to the createOrb virtual method in OtherAvatar	2018-06-27 14:31:39 -07:00
amantley	7b49ae4950	added the within threshold of height function and to do: the mode computation	2018-06-27 14:23:24 -07:00
Zach Fox	cfc8c0fb09	Implement MS16257: Remove 'clear overlay when moving' setting and code	2018-06-27 14:07:04 -07:00
John Conklin II	b9439d1e6b	Merge pull request #13384 from ctrlaltdavid/21892 ... Fix entity detaching from head joint not becoming visible	2018-06-27 12:32:52 -07:00
amantley	99ff5f9140	made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly	2018-06-27 11:59:53 -07:00
amantley	1804422df0	remove orb in the otherAvatar destructor, and check ... _otherAvatarOrbMeshPlaceholder pointer before updating the position	2018-06-27 11:15:42 -07:00
amantley	3893b7e339	added the head angular velocity check	2018-06-27 10:37:54 -07:00
amantley	8cf59783d1	removed white space	2018-06-27 09:20:46 -07:00
amantley	be6fadbc2d	Merge remote-tracking branch 'upstream/master' into integratedStepping	2018-06-27 09:16:43 -07:00
Angus Antley	eba4a27329	added newline to the end of AvatarManager.cpp	2018-06-27 05:59:53 +01:00
amantley	39edc21423	spaced comment fixed	2018-06-26 17:47:36 -07:00
amantley	8b13905d6c	final final final coding standards	2018-06-26 17:43:45 -07:00
amantley	a89c2ea734	removed crust	2018-06-26 16:40:51 -07:00
amantley	46c70d948f	Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn	2018-06-26 15:11:58 -07:00
Dante Ruiz	3cf36bed55	making small adjustments	2018-06-26 14:57:15 -07:00
Dante Ruiz	1fec900ba6	disable flying by default	2018-06-26 13:31:59 -07:00
amantley	fa1a9d04e0	everything working before trying to move otheravatar to interface	2018-06-26 13:18:26 -07:00
Angus Antley	b8dea4b869	adding changes to add the orb when an avatar is processed by the avatar mixer ... and when a new model is being loaded for an avatar. The orb is removed when the geometry has loaded.	2018-06-26 06:27:18 +01:00
Andrew Meadows	756f34761f	don't build AvatarMotionStates until physics enabled	2018-06-25 10:37:54 -07:00
David Rowe	af3861def8	Code review	2018-06-25 16:33:05 +12:00
David Rowe	40fb627504	Merge branch 'master' into 21892	2018-06-25 16:04:44 +12:00
Simon Walton	0dca842102	Add avatar identity requests to analytics	2018-06-22 17:06:33 -07:00
Simon Walton	269d803812	New approach to tracking no-identity duration	2018-06-22 16:42:37 -07:00
John Conklin II	b7069fff71	Merge pull request #13382 from SamGondelman/particleFix ... Fix Particle Entities	2018-06-22 13:27:11 -07:00
Simon Walton	e5b35b1cd9	Clang doesn't support digit separators yet	2018-06-22 12:01:00 -07:00
Sam Gondelman	44a7d04b2a	Merge pull request #13426 from SamGondelman/avatarPriority ... Highest loading priorities for avatars and attachments	2018-06-22 11:22:10 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
amantley	3027f8242c	added the conditional for leaving the base of support to pre physics update in MyAvatar.cpp	2018-06-21 17:23:03 -07:00
Simon Walton	6796af4b6a	Move sendAvatarIdentityRequest() to a more logical location	2018-06-21 15:00:51 -07:00
amantley	e4ca6c6303	added the fixes for the lurch that happens when driving or flying	2018-06-21 11:22:26 -07:00
amantley	8fc04776f9	starting to implement the step detection code in MyAvatar.cpp	2018-06-21 10:59:07 -07:00
Simon Walton	d789c4573b	Add couple of comments	2018-06-20 17:44:58 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
SamGondelman	8014f61243	loading priorities for avatars and attachments	2018-06-20 12:29:28 -07:00
Simon Walton	d638bdd986	First pass at requesting ID for unknown data ... Keep list of AvatarData that was created from a data packet without a matching ID. If items get old enough send an ID request and remove them.	2018-06-20 12:21:39 -07:00
sabrina-shanman	a8b2da14cf	Format numeric constant in strafe crash commit to match coding standards	2018-06-20 08:45:12 -07:00
sabrina-shanman	45fdf3d68f	Fix crash when walking sideways	2018-06-19 17:23:00 -07:00
Andrew Meadows	085130e3c9	avatars collide again again	2018-06-18 13:17:32 -07:00
David Rowe	be4b929301	Fix cauterization when reparent entity to a different joint	2018-06-16 16:31:06 +12:00
David Rowe	4dd6ba1d18	Fix Mac crash	2018-06-16 16:29:45 +12:00
David Rowe	249f72758e	Fix entity detaching from head joint not becoming visible	2018-06-15 16:36:16 +12:00
John Conklin II	0ba97fa83b	Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags ... Scripted Blendshapes and Procedural Face Movement Flags	2018-06-13 10:32:59 -07:00
Clement	920263ef49	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-06-12 17:00:25 -07:00
Andrew Meadows	d31ee52d79	revert PR-13162 from RC68	2018-06-12 03:51:55 -07:00
Anthony J. Thibault	042f902d2e	Merge branch 'master' into scriptedBlendshapesFaceFlags	2018-06-11 17:13:30 -07:00
Anthony J. Thibault	f773aef053	Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68	2018-06-11 11:06:21 -07:00
Anthony J. Thibault	b8379045a8	Fix MyAvatar::isReadyForPhysics() in serverless domains.	2018-06-11 09:53:34 -07:00
Sam Gondelman	be28097279	Merge pull request #13339 from SamGondelman/avatarHash ... Possibly fix avatarHash crash	2018-06-11 09:39:40 -07:00
Anthony Thibault	044d142635	Merge pull request #13133 from amantley/nativeCGCode ... Center of Gravity Leaning	2018-06-08 17:53:55 -07:00
SamGondelman	a7d75b121f	fix avatarHash crash	2018-06-08 11:20:41 -07:00
amantley	913d78841d	Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes ... synching with upstream master	2018-06-07 16:20:11 -07:00
Anthony J. Thibault	608575cf17	Large avatars should instantly shrink when entering small height domains ... Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.	2018-06-07 15:31:40 -07:00
amantley	836c3da858	cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement	2018-06-07 15:11:57 -07:00
amantley	97831e61f0	removed stray comments	2018-06-07 12:54:46 -07:00
Sam Gateau	a1899e80c0	Merge pull request #13290 from AndrewMeadows/update-queryAACube ... update server-side bounding box more correctly for grabbed things	2018-06-06 11:46:09 -07:00
amantley	f21431ca88	added check for the actual face tracker in MyHead.cpp to prevent crash	2018-06-05 16:33:28 -07:00
Anthony J. Thibault	b5a3b25adc	Tuned hip smoothing times.	2018-06-05 16:07:54 -07:00
Anthony J. Thibault	993d035d37	Smooth out fly to idle transition, to prevent hip thrusting and pops.	2018-06-05 15:45:19 -07:00
amantley	5132466ca0	kept the transient coeff. and sending the blendshapes accross the ... network. and removed procedural updates to face from myhead.cpp	2018-06-05 13:32:45 -07:00
Anthony J. Thibault	558711f906	Smooth hips transition between idle and fly. ... Also, take dt into account for the critically damped spring lerp calculation.	2018-06-04 16:57:41 -07:00
amantley	61592cdada	completed first try at all changes for scripted blendshapes	2018-06-04 16:37:47 -07:00
David Rowe	b5028a9626	Merge branch 'master' into 21880 ... # Conflicts: # interface./src/scripting/WindowScriptingInterface.h	2018-06-05 09:13:54 +12:00
Anthony J. Thibault	c3d1daf855	Merge branch 'master' into nativeCGCode	2018-06-04 09:32:38 -07:00
Andrew Meadows	9ae19714b5	also update queryAACube for children of worn entities	2018-06-01 16:38:57 -07:00
amantley	01848fafe0	made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present	2018-06-01 11:37:11 -07:00
amantley	3bda5bf6a0	added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h	2018-05-31 17:58:37 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
amantley	7cc5e96f2d	Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes ... merging hifi master to update the branch	2018-05-31 10:35:31 -07:00
Sam Gateau	513acc529e	INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine	2018-05-30 23:31:54 -07:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
samcake	873cabe284	Cleaning the code	2018-05-29 17:46:25 -07:00
David Rowe	0db440931e	Miscellaneous JSDoc fixes	2018-05-30 10:02:30 +12:00
samcake	82503a9e64	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-29 08:59:37 -07:00
Sam Gateau	678effdb48	Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey	2018-05-26 23:28:59 -07:00
Sam Gateau	aa49595a23	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-24 18:19:55 -07:00
NissimHadar	d01482bf68	Now looks for an actual change in the boom length (vs a change has been requested).	2018-05-24 17:44:39 -07:00
NissimHadar	9ed8c04097	Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode	2018-05-24 17:40:21 -07:00
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c ... JSDoc fixes	2018-05-24 16:44:55 -07:00
samcake	44a8d880fa	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-24 14:31:53 -07:00
Andrew Meadows	31dd59d212	double bits in collision groups	2018-05-24 11:28:52 -07:00
Sam Gateau	13d02011f3	There and back again...	2018-05-24 00:53:29 -07:00
samcake	5bede45c85	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-23 11:26:07 -07:00
NissimHadar	e07e716d40	Fixed stupid gcc warning.	2018-05-23 07:35:25 -07:00
NissimHadar	06203d44d8	Correct Camera.mode command.	2018-05-22 17:08:28 -07:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
samcake	3aaa01788c	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-18 17:42:30 -07:00
samcake	36a08fdd84	Friday night end of the day, last compilation.... almost	2018-05-18 17:41:28 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
samcake	aa18aaa7b1	Maybe	2018-05-17 18:06:46 -07:00
David Rowe	6db4dd8673	Merge branch 'master' into 21872-b ... # Conflicts: # interface/src/ui/Snapshot.h	2018-05-17 20:11:14 +12:00
samcake	735db27919	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-16 17:18:23 -07:00
John Conklin II	8d437892cb	Merge pull request #13175 from luiscuenca/fixAvatarDisappearing ... Fix hips position when flying	2018-05-16 12:37:07 -07:00
Dante Ruiz	e676348c4f	fixing some menu reog bugs	2018-05-16 10:40:28 -07:00
luiscuenca	7b48dc2370	normalize vector	2018-05-16 10:17:38 -07:00
David Rowe	f629022b8c	AvatarList API JSDoc stubs	2018-05-16 10:16:13 +12:00
David Rowe	fdeb0e3305	Avatar API JSDoc stubs	2018-05-16 09:20:54 +12:00
luiscuenca	4b09f1dc30	Fix vector transformation when calculating flying hip position	2018-05-15 14:19:17 -07:00
Andrew Meadows	c5773cbe84	restore 'virtual' keyword for overrides	2018-05-15 13:59:22 -07:00
Thijs Wenker	8b4298514e	send out one last blendshape update when setting MyAvatar.hasScriptedBlendshapes to false	2018-05-15 21:39:17 +02:00
Thijs Wenker	bfe210da75	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-05-15 16:48:51 +02:00
Anthony J. Thibault	ec638d9d91	Avatar can now look straight down without spinning 180. ... Also, come code clean up and removal of unnecessary Y_180 flips.	2018-05-14 13:48:04 -07:00
Andrew Meadows	a30e06d594	don't blend avatar position when far from target	2018-05-14 09:58:16 -07:00
Anthony J. Thibault	1cc7eb635f	Fix ubuntu warning by removing cancelOutRollAndPitch2()	2018-05-14 09:13:26 -07:00
Anthony J. Thibault	274ac98bd6	Merge branch 'master' into nativeCGCode	2018-05-14 09:12:08 -07:00
vladest	0a67fc3b36	Merge conflicts	2018-05-12 11:24:35 +02:00
Andrew Meadows	6de175e794	avatars collide again	2018-05-11 17:01:48 -07:00
John Conklin II	5cd225e4de	Merge pull request #12947 from jherico/feature/splash2 ... Additional work on splash screen	2018-05-11 11:26:37 -07:00
amantley	20c960c0da	removed white space in MyAvatar.cpp	2018-05-09 15:00:20 -07:00
amantley	eff84de99f	added more straight forward computation of the hips rotation inMyAvatar.cpp contributed by AJT	2018-05-09 14:55:10 -07:00
amantley	50f225777a	removed debug code from cg code in MyAvatar.cpp	2018-05-09 11:31:19 -07:00
amantley	a7955b642a	removed the follow hips code from pre physics update	2018-05-09 11:27:04 -07:00
amantley	77aedc1512	changed lerp to saferLerp in cg code	2018-05-09 11:14:13 -07:00
amantley	8000bcd272	cleaned up cg code ie computeNewHipsRotation	2018-05-08 18:12:53 -07:00
amantley	6051f4b8ff	Merge remote-tracking branch 'origin/nativeCGCode' into nativeCGCode ... synching the branch with the remote repo	2018-05-08 10:55:14 -07:00
amantley	544967ef3b	added test function to cancel out roll and pitch	2018-05-08 10:55:10 -07:00
amantley	bbf8c73572	code review changes to declare functions static	2018-05-08 10:52:28 -07:00
amantley	3a10cacec0	1.added the swing twist code to update the follow rotation in MyAvatar.cpp ... 2.added step.js and cg_lean.js to the developer folder 3.added menu item for toggling the hips following between head and hips 4.added new function to return true if the root of MyAvatar is translating to be under the head. Used to smooth the path of the hips 5.added computeCounterBalance to MyAvatar.h and cpp 6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp 7.added head yaw into the calculation of the hip rotation for the center of gravity. This is already was happening in the deriveBodyFromHMD code that is default 8.Changed Constants in Avatar constants for the base of support 9.fixed the over rotation of the shoulders 10.fixed scaling problem in cg computation 11.added room for going up on the toes without stretching	2018-05-07 17:41:35 -07:00
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
Clément Brisset	39e2a78b1a	Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist ... Multifrustum queries punchlist	2018-05-04 15:50:44 -07:00
John Conklin II	c7bc479c60	Merge pull request #13094 from hyperlogic/bug-fix/case-14639 ... Fix for crash deep in QML after useFullAvatarURL	2018-05-04 11:33:28 -07:00
Clement	27c471ee97	Move all wire frustums to conical frustums	2018-05-03 18:19:29 -07:00
Stephen Birarda	21396287a4	Merge pull request #12990 from Atlante45/fix/spec-cam-av ... Add support for multifrustum avatar queries	2018-05-03 18:18:51 -07:00
Anthony J. Thibault	fc9bd7f905	Fix for crash deep in QML after useFullAvatarURL ... Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL(). This prevents the error case where a QEventLoop is entered during QML execution.	2018-05-03 14:06:06 -07:00
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d ... List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
Seth Alves	b68d9ecd68	Merge pull request #12985 from druiz17/attachments-disappearing ... fixing avatr attachments not being visible when coming out of first person	2018-05-02 18:50:41 -07:00
John Conklin II	7a5fce4315	Merge pull request #12991 from luiscuenca/avatarScript ... Avatar Scripts	2018-05-02 12:23:13 -07:00
luiscuenca	689fbd2da0	added requested changes	2018-05-02 11:09:17 -07:00
Clement	538f24162f	Define ViewFrustums type alias	2018-05-01 18:03:21 -07:00
Clement	21213e81f4	Multiview support for priority queue	2018-05-01 18:03:21 -07:00
luiscuenca	2ac7fcadd2	load scripts once on rigReady	2018-05-01 09:37:01 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
Thijs Wenker	9e086dda3c	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-30 17:32:49 +02:00
vladest	be22f49c32	Merge branch 'master' into menu-updates	2018-04-28 20:22:28 +02:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
Anthony J. Thibault	c6b12307aa	Added custom jsdoc tags to High Fidelity ... There are 4 new jsdoc tags: * @hifi-interface - indicates that this namespace or class is available in Interface Scripts. * @hifi-assignment-client - indicates that this namespace or class is available in Assignment Client Scripts. * @hifi-client-entity - indicates that this namespace or class is available in Client Entity Scripts. * @hifi-server-entity - indicates that this namespace or class is avaialbe in Server Entity Scripts. These tags should appear just after the @class or @namespace tag. For example: /**jsdoc * Your avatar is your in-world representation of you. The <code>MyAvatar</code> API is used to manipulate the avatar. * For example, you can customize the avatar's appearance, run custom avatar animations, * change the avatar's position within the domain, or manage the avatar's collisions with other objects. * * @namespace MyAvatar * * @hifi-interface * @hifi-client-entity *	2018-04-26 14:13:42 -07:00
Thijs Wenker	20b9e44844	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-26 22:37:15 +02:00
vladest	3296ae0db8	Merge branch 'master' into menu-updates	2018-04-26 22:21:40 +02:00
David Rowe	08dc9b133f	Docs to JSDoc review	2018-04-26 21:10:28 +12:00
luiscuenca	12f578c93c	More fixes	2018-04-25 19:46:31 -07:00
luiscuenca	e0770f06b1	Add scripts to Model Packager	2018-04-25 19:35:26 -07:00
Thijs Wenker	bbd31d590b	defaults	2018-04-26 03:12:44 +02:00
Thijs Wenker	8b7a07577c	Merge branch 'master' of git@github.com:highfidelity/hifi.git into feat/hasScriptedBlendshapes	2018-04-26 03:09:44 +02:00
MiladNazeri	0f87e53902	Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate ... Docs/docs to js docs update	2018-04-25 12:26:19 -07:00
Thijs Wenker	484e20ea55	JSDOC - change bool type to boolean, to match JS type	2018-04-25 19:01:18 +02:00
Thijs Wenker	192e48a376	style fix + JSDocs	2018-04-25 13:47:00 +02:00
milad nazeri	4c736b2d62	Fixed defaults	2018-04-24 21:38:48 -07:00
David Rowe	cae9447ac5	Doc review	2018-04-25 15:09:47 +12:00
luiscuenca	165c3214a7	Avatar Scripts	2018-04-24 18:43:53 -07:00
Dante Ruiz	29fce488e4	make some changes	2018-04-24 14:00:52 -07:00
Dante Ruiz	b2925c5843	fixing attachments not being visible when coming out of first person	2018-04-24 13:32:30 -07:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
Thijs Wenker	b0187ecfd3	add MyAvatar.hasAudioEnabledFaceMovement API property which is enabled by default	2018-04-24 19:24:23 +02:00
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
David Rowe	98f43b6a70	Interim JSDoc for MyAvatar - stubs for remainder	2018-04-24 10:47:33 +12:00
David Rowe	719062dd9f	Interim JSDoc for MyAvatar - first pass	2018-04-24 09:10:59 +12:00
milad nazeri	4ac06fe99f	Updating previous jsdocs	2018-04-22 22:22:33 -07:00
milad nazeri	e9b9c05b5d	removed cruft	2018-04-22 08:51:47 -07:00
vladest	6d53512c6c	Merge	2018-04-15 15:24:16 +02:00
Thijs Wenker	2e396fd1b9	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-12 23:36:27 +02:00
John Conklin II	7bcaa12c50	Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix ... Typo corrected: getAnimatationRoles to getAnimationRoles	2018-04-12 10:32:09 -07:00
Thijs Wenker	a0f6afb53d	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-03 16:45:11 +02:00
John Conklin II	74ca98dc81	Merge pull request #12727 from amantley/triggerRecenterBehaviour ... Trigger Avatar Recenter Behaviour	2018-04-02 14:42:21 -07:00
John Conklin II	796bd069b2	Merge pull request #12659 from alexiamandeville/script_charcontroller ... Updating char controller	2018-04-02 13:24:15 -07:00
amantley	3f44b88d2d	added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class	2018-03-29 10:09:51 -07:00
amantley	90d87c5b5d	changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety	2018-03-28 14:00:36 -07:00
amantley	4b1f974561	fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h	2018-03-28 11:57:48 -07:00
amantley	95f1d0e4fa	added get and set functions for the activate recenter variables	2018-03-28 10:33:00 -07:00
Thijs Wenker	3184aa51b1	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-03-28 19:15:13 +02:00
amantley	9f3b82a417	added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly	2018-03-27 18:21:14 -07:00
Thijs Wenker	7309f9d82c	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-03-23 17:51:43 +01:00
Dante Ruiz	f36a916fb6	revert comment change	2018-03-22 17:44:17 -07:00
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Flame Soulis	9d9b08803c	Corrected getAnimatationRoles to getAnimationRoles	2018-03-19 01:17:46 -04:00
samcake	a896e9872c	adressing the avatar vissibility switch	2018-03-14 17:09:23 -07:00
Dante Ruiz	00fa5cfd06	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-13 10:08:00 -07:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 ... Entities API JSDoc	2018-03-12 14:40:09 -07:00
Alexia Mandeville	c5b8a2d06e	Revert "Increasing speed on mousescroll - zooming in/out of avatar" ... This reverts commit 748507f1e3.	2018-03-12 13:18:02 -07:00
Alexia Mandeville	6ddb91e593	Revert "Updating default mouse pitch/yaw input to be more stabilized" ... This reverts commit 2598be16f8.	2018-03-12 13:17:48 -07:00
Alexia Mandeville	748507f1e3	Increasing speed on mousescroll - zooming in/out of avatar	2018-03-10 22:20:00 -08:00
Alexia Mandeville	2598be16f8	Updating default mouse pitch/yaw input to be more stabilized	2018-03-10 21:46:20 -08:00
samcake	10447bf10e	Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there	2018-03-09 13:04:04 -08:00
Dante Ruiz	c949b44f0c	conforming to coding standards	2018-03-09 10:42:19 -08:00
Dante Ruiz	cfa85b5137	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-09 09:37:08 -08:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
NissimHadar	d1b87b3116	Added missing avatar shadows.	2018-03-08 12:14:42 -08:00
Dante Ruiz	297273de08	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-07 13:09:47 -08:00
Dante Ruiz	a70509233e	making small changes	2018-03-07 08:25:27 -08:00
David Rowe	eeb7f5ca8d	Doc review	2018-03-07 17:29:39 +13:00
Thijs Wenker	90b77030d5	MyAvatar.hasScriptedBlendshapes property	2018-03-07 02:55:47 +01:00
Thijs Wenker	866bec0b34	rule -> role	2018-03-07 02:36:07 +01:00
Dante Ruiz	69af12fbc7	chaning speeds	2018-03-06 15:47:01 -08:00
Dante Ruiz	fe363e7f2a	changing keybaord mapping	2018-03-06 14:16:25 -08:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
David Rowe	1fb02d15d7	Entities actions JSDoc	2018-02-27 14:12:20 +13:00
John Conklin II	6316f33282	Merge pull request #12485 from dback2/avatarMotors ... Add dynamic mode for scripted avatar motor	2018-02-26 11:03:30 -08:00
John Conklin II	3201d2ba21	Merge pull request #12407 from NissimHadar/shadowControlsOffZvork ... Shadow control for zones, models and shapes	2018-02-26 10:13:40 -08:00
David Back	283b5724ba	CR changes	2018-02-23 15:02:51 -08:00
David Back	da391564a8	CR changes	2018-02-23 15:01:29 -08:00
David Back	a418129bea	simplify to just changing timescales	2018-02-23 15:00:23 -08:00
David Back	083e461eb0	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors	2018-02-22 17:20:49 -08:00
David Back	902672f85e	add dynamic mode for scripted avatar motor	2018-02-22 17:20:36 -08:00
Nissim Hadar	bf4ba07b72	Added parameters to canCastShadow - still sucks.	2018-02-21 12:36:34 -08:00
Zach Fox	74655bde49	Fix skeletonmodelURLchanged signal	2018-02-21 12:12:20 -08:00
Nissim Hadar	4c1f22f84e	Models and Avatar cast shadows (box doesn't, yet).	2018-02-16 14:01:33 -08:00
Nissim Hadar	194c7f4101	WIP - for review.	2018-02-16 09:28:15 -08:00
Bradley Austin Davis	33690e09b7	Merge pull request #12399 from samcake/blue ... Introducing group culling to avoid the avatar model to be partially culled	2018-02-14 15:38:52 -08:00
samcake	1d3ae1b187	Work in progress to get the render items beeing tagged correctly for groupCulled	2018-02-13 17:50:01 -08:00
Dante Ruiz	45f09dde96	address tony's requests	2018-02-13 10:32:15 -08:00
Dante Ruiz	1a25332575	fix indenting	2018-02-12 10:59:25 -08:00
Dante Ruiz	3c84318918	fixing merge conflict	2018-02-12 10:57:55 -08:00
Dante Ruiz	d381beb213	cleaning up code	2018-02-12 10:53:42 -08:00
Dante Ruiz	5325b22b01	working on lambdas	2018-02-09 16:46:11 -08:00
Dante Ruiz	b3a3d92131	Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update	2018-02-09 10:31:43 -08:00
Dante Ruiz	beb41495d5	save avatarUrl when setting new skeletonModelUrl	2018-02-09 09:35:24 -08:00
Seth Alves	3e913cfcfe	AvatarActionHold has positional and rotational targets	2018-02-07 10:45:13 -08:00
Dante Ruiz	e87067f93d	fix variable naming and edge case	2018-02-05 15:31:37 -08:00
Dante Ruiz	d593e7107c	fix merge conflict	2018-02-02 13:29:31 -08:00
Seth Alves	861497e907	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-02-02 08:56:18 -08:00
Seth Alves	14d5029f4d	only update cauterization of child entities when something relevant changes	2018-02-02 08:56:11 -08:00
Anthony J. Thibault	b23f98b311	Removal of hips offset shifting from AnimInverseKinematics node ... With the addition of the hips IK target, the hips offset shifting code is no longer necessary. This PR should not effect any behavior, but it removes this unused code from the animation system.	2018-01-31 17:56:33 -08:00
Seth Alves	64a46bf5df	merge from upstream	2018-01-31 10:43:41 -08:00
Bradley Austin Davis	b97c938544	Merge pull request #12216 from thoys/feat/js-script-console-auto-complete ... JS scripting console auto-complete	2018-01-31 10:39:51 -08:00
MiladNazeri	3585bead96	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes ... Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
Dante Ruiz	264aa7f4d2	Merge pull request #12191 from druiz17/entity-attachment-bookmark ... Bookmark avatar entities	2018-01-29 12:55:35 -08:00
Seth Alves	98e0e663e7	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-01-29 12:36:37 -08:00
Dante Ruiz	a670a0b9a2	Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark	2018-01-29 11:25:26 -08:00
Seth Alves	17ec79f182	add breaks in case statements that used to have returns	2018-01-26 10:36:16 -08:00
Sam Gateau	51dac04374	Introducing the tag in lieu of the vsisiblity mask	2018-01-26 02:59:43 -08:00
Seth Alves	b6f7d2eb89	print warnings if head position contains not-a-number	2018-01-25 15:15:59 -08:00
Thijs Wenker	45487a1e45	Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete ... # Conflicts: # interface/CMakeLists.txt	2018-01-25 22:51:35 +01:00
Dante Ruiz	2cbcc28bd4	only call init animGraph once	2018-01-24 10:44:04 -08:00
Seth Alves	1cbc2e31cf	merge from upstream	2018-01-23 15:21:03 -08:00
Dante Ruiz	071f7d54d9	Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update	2018-01-23 14:44:26 -08:00
Dante Ruiz	6a03557801	don't override sensorToWorldMatrix	2018-01-23 14:44:10 -08:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
Brad Davis	8ae0b09ea2	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
Thijs Wenker	e8955fcd32	Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete	2018-01-22 23:37:24 +01:00
Thijs Wenker	f4e6606c8d	fix MyAvatar JS API typo	2018-01-22 19:01:13 +01:00
Seth Alves	31c007d167	more backwards logic, added withViewVisibilityMask call in ItemKey	2018-01-18 14:15:30 -08:00
Seth Alves	fb974b0b9c	attempt to straighten out use of view-visibility masks	2018-01-18 10:09:23 -08:00
Anthony J. Thibault	c5efcf5d6a	Bug fix for cocked head after playing an input recording. ... I thought this was the cause of the Manuscript case 11454 but apparently not.	2018-01-18 09:21:15 -08:00
Seth Alves	76ef3d7c7d	pull from upstream	2018-01-18 07:01:50 -08:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
Dante Ruiz	eadd3b48bd	bookmark avatar-entities-done	2018-01-17 15:42:07 -08:00
Dante Ruiz	8f22c719b3	Merge pull request #12099 from sethalves/run ... allow avatar walk-speed to be set from javascript	2018-01-17 13:53:13 -08:00
Seth Alves	33c586de60	Merge pull request #12188 from hyperlogic/feature/small-anim-refactor ... Remove dangerous "Use Anim Pre and Post Rotations" menu item	2018-01-17 13:41:51 -08:00
Bradley Austin Davis	9f6c2c3cdd	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 11:44:00 -08:00
Dante Ruiz	ebb09f4271	Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark	2018-01-17 11:04:46 -08:00
Dante Ruiz	3abb3d6fcc	trying to add offset	2018-01-17 11:04:32 -08:00
Seth Alves	1e847cf32e	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-17 08:08:13 -08:00
Seth Alves	d3084dc0df	defang	2018-01-17 07:11:27 -08:00
Anthony J. Thibault	51ea2632c0	Remove Avatar UseAnimPreAndPostRotations option. ... This should always be true and can lead to hard to diagnose bugs if it is ever set to false.	2018-01-16 17:27:19 -08:00
Dante Ruiz	7707e68234	bookmarks add back avatar-entities	2018-01-16 15:37:03 -08:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Brad Davis	7579451c24	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
Seth Alves	e7a3d98ae5	don't draw head-descendent entities when in 1st-person camera mode	2018-01-11 19:34:54 -08:00
Dante Ruiz	96a97b5938	added model transform override	2018-01-11 16:41:45 -08:00
Seth Alves	c09f644612	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-11 09:09:11 -08:00
Seth Alves	aefd294bf2	Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera ... Improve stability for HMD third person avatars	2018-01-10 17:46:47 -08:00
Brad Davis	560fd38547	Merge remote-tracking branch 'upstream/master' into android	2018-01-10 17:31:50 -08:00
Brad Davis	97593bc4d8	Fixing compiled resource access	2018-01-10 17:18:12 -08:00
Anthony J. Thibault	ae997928c1	Bug fix to prevent wrists entering the avatar's torso. ... This was inadvertently disabled in PR #11978.	2018-01-10 11:51:44 -08:00
Dante Ruiz	c4253f3b3b	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-09 15:31:38 -08:00
Anthony J. Thibault	e28f13c1db	Merge branch 'master' into bug-fix/better-third-person-camera	2018-01-09 10:34:04 -08:00
Seth Alves	d0ddbc0092	fix warning	2018-01-08 16:52:07 -08:00
Seth Alves	8ed72dd276	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-08 15:53:21 -08:00
Seth Alves	ad389e5072	make avatar walk-speed adjustable from js. add a tablet button to control walking vs running	2018-01-08 15:27:41 -08:00
Anthony Thibault	f4c38b91b3	Merge pull request #12071 from luiscuenca/handTouch ... Touch feeling for near grab	2018-01-08 12:50:30 -08:00
Seth Alves	1c94c9c11d	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-08 12:27:42 -08:00
Seth Alves	f1c03b2d40	adjust RENDER_HEAD_CUTOFF_DISTANCE so that I don't see my head when I run	2018-01-08 12:27:35 -08:00
Anthony J. Thibault	61edd83987	Improve stability for HMD third person avatars ... Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person. The reason the hack existed was to make third person camera less nauseating for users. However this had a major drawbacks. It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera. To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.	2018-01-08 11:26:29 -08:00
John Conklin II	d660bbf6e5	Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit ... Bug fix for sit script.	2018-01-08 09:59:17 -08:00
Seth Alves	f6fed444b0	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-08 07:49:09 -08:00
Howard Stearns	724db93389	Merge pull request #12002 from howard-stearns/consistent-goToUser ... Consistent go to user	2018-01-07 11:07:39 -08:00
luiscuenca	8a7c68829d	Optimizations, cleanings and globals	2018-01-07 11:56:30 -07:00
Anthony J. Thibault	243dcb88ee	Bug fix for sit script.	2018-01-05 16:20:44 -08:00
luiscuenca	4f6a804fd1	Fix magic numbers	2018-01-05 16:27:48 -07:00
Seth Alves	3cd0ec3336	default run speed is faster, advanced movement on by default	2018-01-05 13:20:41 -08:00
luiscuenca	ef0164c272	Fix tabs	2018-01-04 11:43:51 -07:00
luiscuenca	28d9409bf0	Fix default hand poses	2018-01-04 11:37:37 -07:00
Dante Ruiz	6fa3446c57	joints are being relayed to children	2018-01-02 13:54:13 -08:00
luiscuenca	49bd62ca29	Touch feeling for near grab	2017-12-29 14:04:36 -07:00
Stephen Birarda	e3cbfd92a0	Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back	2017-12-22 15:48:04 -08:00
Stephen Birarda	7bf0cc2f63	cleanup other ref returns of shared pointers from sortables	2017-12-21 15:39:14 -08:00
humbletim	a146b778f7	support additional .extraInfo for ray intersections	2017-12-21 12:35:13 -05:00
howard-stearns	d730b7b87b	consistent goToUser behavior in PAL, and be able to go to flying user.	2017-12-15 17:00:54 -08:00
Anthony Thibault	f3fcac8e58	Merge pull request #11903 from Delanir/IPD8258 ... 8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet	2017-12-15 15:37:27 -08:00
Anthony J. Thibault	c4a7f4843a	Much more stable hips IK target. ... Target is now estimated in sensor space from the head, which is very deterministic and not prone to feedback from the IK system. Previous the hip was estimated from accumulated IK error deltas, which was not stable, as the error would tend to accumulate if the IK targets could not be reached.	2017-12-13 11:12:32 -08:00
Daniela Fontes	46583a90be	Change abs to fabsf and other corrections requested.	2017-12-09 00:14:36 +00:00