5527 commits

Author	SHA1	Message	Date
Wayne Chen	0d83e622ff	Revert "Attempt to add acceleration curve." (#23) ... This reverts commit 9ea476ea89.	2019-04-01 13:47:49 -04:00
Shannon Romano	dbecf1f611	Merge pull request #15292 from thoys/fix/avatarTools/fbxCasing ... Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.	2019-03-29 17:04:37 -07:00
danteruiz	db17f094da	adding entities to fade out list;	2019-03-29 15:23:16 -07:00
Shannon Romano	c4925ddfa0	Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements ... Avatar hero zone improvements	2019-03-29 10:49:06 -07:00
Shannon Romano	a83b90cdc6	Merge pull request #15044 from sethalves/lock-wearables ... case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables	2019-03-29 10:41:21 -07:00
Thijs Wenker	687409b756	ignore case for .fbx file extension in AvatarDoctor	2019-03-29 01:46:57 +01:00
Angus Antley	ab1fb0f376	added js doc info for overrideHandAnimation() and restoreHandAnimation in MyAvatar.h	2019-03-28 17:45:23 -07:00
danteruiz	b9d04c6ebb	adding entity to a faded list	2019-03-28 16:42:29 -07:00
danteruiz	04d9858f02	fixing remaining issues	2019-03-28 11:43:53 -07:00
Angus Antley	d963ec3005	can now override the eye rotation when procedural eye movement is turned off	2019-03-28 11:27:26 -07:00
Anthony Thibault	65507cfe11	Merge pull request #15180 from luiscuenca/flowCppFixes ... Fix Flow touch and scale issues	2019-03-28 11:11:08 -07:00
Oren Hurvitz	32406b8399	Fixed Safe Landing interaction with Local entities. ... Local entities are collisionless, so they shouldn't affect Safe Landing since it specifies that it only wants to find COLLIDABLE entities. However, due to the requirement to support legacy behavior, picks for COLLIDABLE entities *do* intersect Local entities. In order to prevent this, we have to explicitly request only intersections with Domain or Avatar entities. For more information about this, see this Pull Request: https://github.com/highfidelity/hifi/pull/15282	2019-03-28 18:54:14 +01:00
danteruiz	d9b522d10c	remove error file	2019-03-27 16:43:03 -07:00
danteruiz	40d424a01d	avatar fading	2019-03-27 16:42:34 -07:00
Wayne Chen	f3708ba27b	Merge branch 'master' into newAudioMuteStates	2019-03-27 15:49:39 -07:00
Simon Walton	6b21fc1af7	Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements ... Fix jsdoc conflict, also minor clean-up.	2019-03-27 10:54:49 -07:00
Sam Gondelman	0a28090aa4	Merge pull request #15213 from MiladNazeri/Fix/avatarDominantHandChanged ... Updated engine code to not emit if dominant hand isn't actually changed	2019-03-27 10:53:00 -07:00
Andrew Meadows	fb7daa185d	improved physics for grabbed AvatarEntities	2019-03-27 10:12:59 -07:00
Seth Alves	29af3b1612	add a button to Avatar panel to lock or unlock wearables. ... allow grabbing / adjusting others' wearables if they are unlocked.	2019-03-27 10:12:57 -07:00
Shannon Romano	d464415e0b	Merge pull request #15255 from AndrewMeadows/fix-owningAvataID ... Case 21897: fix bug where AvatarEntities vanish after going to serverless and back	2019-03-27 09:11:36 -07:00
Angus Antley	02d9331603	This changes the avatar-animation json so that we have override ... animations for the right and left hand, similar to how we have whole body override animations.	2019-03-26 23:27:54 -07:00
Shannon Romano	1d5f9cc0ec	Merge pull request #15149 from ctrlaltdavid/M21222 ... Case 21222: Agent, Avatar, and MyAvatar JSDoc	2019-03-26 15:43:32 -07:00
Shannon Romano	16d791703d	Merge pull request #15206 from thoys/feat/avatarTools/avatarDoctorWarningURLs ... Case 21353: Avatar Doctor documentation / Video URLs	2019-03-25 14:36:30 -07:00
David Rowe	4a832be8c6	Fix JSDoc post-merge	2019-03-26 10:03:30 +13:00
David Rowe	cf4370ed3a	Merge branch 'master' into M21222	2019-03-26 09:44:48 +13:00
David Rowe	b78ae80ae6	Address review comments and add further examples	2019-03-26 09:40:47 +13:00
Andrew Meadows	cd2dbbb955	fix logic typo	2019-03-25 11:52:52 -07:00
r3tk0n	3ac42e69e3	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-25 11:27:31 -07:00
Simon Walton	d7a1ecdbb3	Expose hero-status to scripts	2019-03-22 17:19:39 -07:00
Andrew Meadows	55b3b5034a	always update OwingAvatarID of AvatarEntities	2019-03-22 15:47:13 -07:00
Wayne Chen	d382893e75	staging avatar inputs for ignore radius	2019-03-22 14:16:28 -07:00
Sam Gondelman	04ecdb463f	Merge pull request #15173 from SamGondelman/audio ... Case 21457, Case 16836, Case 15782: Improve AudioInjector threading	2019-03-21 18:03:58 -07:00
Shannon Romano	212f02598c	Merge pull request #15231 from AndrewMeadows/fix-vanishing-avatar-entities ... Case 21838: fix vanishing avatar entities for 0.82.0	2019-03-21 17:39:11 -07:00
r3tk0n	4301d74df5	Fix flying bug.	2019-03-21 16:53:53 -07:00
r3tk0n	108e8b9994	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-21 15:17:56 -07:00
r3tk0n	7a8dfe0aaf	Fix run speeds.	2019-03-21 15:06:21 -07:00
Andrew Meadows	206792f851	don't queue AvatarEntity messages when not in domain	2019-03-21 15:00:11 -07:00
Shannon Romano	33e73953eb	Merge pull request #15163 from danteruiz/fix-laser-scaling ... Case 21499: Lasers are offset in front of hands after scaling avatar down then relaunching	2019-03-21 13:13:18 -07:00
r3tk0n	543d53ecde	Add ability to toggle strafing.	2019-03-21 13:12:15 -07:00
Andrew Meadows	9d11e44b4b	update AvatarEntity trait when parentID changes	2019-03-20 11:37:16 -07:00
Shannon Romano	4ac25121e0	Merge pull request #15190 from roxanneskelly/Case20393 ... Case20393 - Add item counts to interface categories	2019-03-19 17:53:30 -07:00
milad	6ed4937dc0	Updated engine code to not emit if dominant hand isn't actually changed	2019-03-18 10:12:32 -07:00
Thijs Wenker	b5a45be7b9	avatar doctor documentation urls	2019-03-16 02:09:00 +01:00
SamGondelman	83bac723ef	fix wearable duplication on domain switch	2019-03-15 13:38:25 -07:00
r3tk0n	38fe22e4f7	Fix compiler error for Linux.	2019-03-14 16:27:40 -07:00
luiscuenca	c14b135f2b	Fix flow touch and scale issues	2019-03-13 15:42:04 -07:00
David Rowe	74edea8034	Miscellaneous JSDoc fixes	2019-03-14 10:25:31 +13:00
David Rowe	277ef56f49	Fill in JSDoc for new flow functions	2019-03-14 10:24:19 +13:00
Roxanne Skelly	2dc38df779	Case 20393 - Display item counts in categories dropdown in Marketplace	2019-03-13 10:17:39 -07:00
David Rowe	7445d73857	Merge branch 'master' into M21222 ... # Conflicts: # libraries/avatars/src/AvatarData.h	2019-03-13 16:14:14 +13:00
SamGondelman	609c4ab52e	try to fix audio injector threading issues	2019-03-12 18:41:43 -07:00
danteruiz	6303f61cc3	fix lasers scale issue	2019-03-12 14:26:59 -07:00
r3tk0n	6ce955d915	Fix hand-relative movement after hand dominance notion swap.	2019-03-11 18:19:43 -07:00
r3tk0n	39342b9771	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-11 16:27:05 -07:00
r3tk0n	ce2e0c7b81	Merge branch 'project-freeloco' of https://github.com/r3tk0n/hifi into project-freeloco	2019-03-11 16:25:13 -07:00
r3tk0n	cbd841a14d	Update gearing system.	2019-03-11 16:22:48 -07:00
Shannon Romano	801306364a	Merge pull request #15148 from samcake/rc81-hero ... Case 21639: RC81: Adding Hero support in simulation of avatars	2019-03-11 14:13:49 -07:00
Sam Gateau	3464fe09c1	Applying the hero changes to master soon to be rc81	2019-03-08 18:13:20 -08:00
Anthony Thibault	c36d752b6b	Merge pull request #15141 from luiscuenca/flowAPIExtra ... add getFlowData method to MyAvatar	2019-03-08 17:45:11 -08:00
David Rowe	24c7c8be19	Update JSDoc per merge from master	2019-03-09 12:03:59 +13:00
luiscuenca	df32b61eaf	remove unused variable	2019-03-08 16:01:18 -07:00
luiscuenca	bfcb1a8391	Make methods thread safe	2019-03-08 15:57:25 -07:00
Thijs Wenker	06e5927ee1	CR fixes	2019-03-08 23:07:01 +01:00
luiscuenca	4858f64810	get the colliding joints	2019-03-08 14:36:47 -07:00
luiscuenca	cbe920774f	add getFlowData jsdoc	2019-03-08 12:45:29 -07:00
luiscuenca	cb6f573b35	Merge branch 'master' into flowAPIExtra	2019-03-08 12:43:02 -07:00
luiscuenca	a977bb6dc8	remove unuse variable	2019-03-08 12:39:57 -07:00
David Rowe	4779a6b156	Merge branch 'master' into M21222	2019-03-09 07:57:53 +13:00
luiscuenca	e8da6b5a0c	add getFlowData	2019-03-08 10:36:58 -07:00
Thijs Wenker	f2bca5d6c6	added the multiple root joints warning	2019-03-08 07:32:41 +01:00
Thijs Wenker	c35e4d15ab	- warning grammar / no more texture folder content requirement for No textures assigned warning ... - resolved partial commit issue / Fix UNIX builds by removal of unused warning	2019-03-08 03:36:56 +01:00
Thijs Wenker	d985d1bff0	use Rig instead of Avatar for height calculations	2019-03-08 03:36:56 +01:00
Thijs Wenker	bcd00f98d0	- added more warnings to the avatar doctor ... - read embedded fst texture mappings	2019-03-08 03:36:56 +01:00
David Rowe	0b7cddb886	Fill in and tidy MyAvatar JSDoc	2019-03-08 13:49:10 +13:00
John Conklin II	9a4b95faa2	Merge pull request #15111 from luiscuenca/flowDataOnFst ... Load flow bone data from FST file	2019-03-07 12:48:36 -08:00
SamGondelman	380df059ff	fix shapes app	2019-03-06 18:18:39 -08:00
Roxanne Skelly	a54171d60c	Merge pull request #15104 from roxanneskelly/79hero-master ... merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master	2019-03-06 13:06:45 -08:00
Shannon Romano	3600b98bd0	Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus ... Case 21340: avatar doctor project page status	2019-03-06 12:36:18 -08:00
luiscuenca	dfb434ea09	Fix warning and refactoring	2019-03-06 09:25:49 -07:00
luiscuenca	76609197e2	Read flow data from the fst file	2019-03-05 18:50:53 -07:00
Roxanne Skelly	3ef02085ff	Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'	2019-03-05 15:07:49 -08:00
Shannon Romano	1084e79a2e	Merge pull request #15019 from AndrewMeadows/fix-crash-after-avatar-upload ... Case 21422: fix crash for nullptr deref when looking at recently uploaded avatar in inventory	2019-03-01 09:35:01 -08:00
David Rowe	d73ff2e855	Revise current MyAvatar API JSDoc	2019-02-28 10:40:10 +13:00
r3tk0n	42b62ff2d5	Fix Ubuntu compiler warnings.	2019-02-26 19:16:34 -08:00
r3tk0n	a093fe5c4f	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-26 15:08:57 -08:00
r3tk0n	030211aea8	Fix OSX compiler error, init list in wrong order after merge.	2019-02-26 14:46:04 -08:00
Shannon Romano	2aa622b855	Merge pull request #15014 from sethalves/fix-grab-earthquake ... case 21411: don't allow others' grabs to move locked or ungrabbable things	2019-02-26 09:03:44 -08:00
Andrew Meadows	6e13203fec	avoid nullptr deref	2019-02-25 13:52:46 -08:00
r3tk0n	5d3a778b0b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation	2019-02-25 13:10:47 -08:00
SamGondelman	e102ad073e	allow flying in HMD if you would otherwise fall forever	2019-02-25 11:49:38 -08:00
Seth Alves	db821487d9	don't allow others' grabs to move locked or ungrabbable things	2019-02-25 11:27:10 -08:00
Thijs Wenker	79d0a0a0a8	avatar doctor project status	2019-02-25 19:28:38 +01:00
luiscuenca	3072ca43de	Detailed picking if avatar is not null	2019-02-22 09:24:38 -07:00
Anthony Thibault	8785f733db	Merge pull request #14817 from amantley/animSplineIK ... AnimSplineIK node added to inverse kinematics	2019-02-21 17:13:41 -08:00
Anthony Thibault	e54754c4ce	Merge pull request #14926 from luiscuenca/flowCpp ... Cpp implementation of the Flow script	2019-02-21 17:10:05 -08:00
amantley	3bf5c44f98	fixed build warnings	2019-02-21 16:24:46 -08:00
amantley	5cf8a963cd	make spine2 rotation damping only happen in optimized code. the regular code is already damped	2019-02-21 15:41:16 -08:00
amantley	6323f49f26	changed the define variable to HIFI_USE_OPTIMIZED_IK	2019-02-21 14:36:05 -08:00
r3tk0n	a3c4747290	Add leveled controller-relative movement option.	2019-02-21 11:17:31 -08:00
amantley	afed0b5442	review changes	2019-02-21 11:08:29 -08:00
Angus Antley	b6bc467f4b	added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel	2019-02-21 06:42:55 -08:00
amantley	f8a74efdc2	fixed build errors from jenkins	2019-02-20 17:59:45 -08:00
amantley	27bfe2f0fe	changed name of pre processor variable	2019-02-20 15:14:12 -08:00
luiscuenca	04e57d0dd1	No Rig pointer on Flow class, solve network animations and fixed bug	2019-02-19 17:45:46 -07:00
r3tk0n	ebbf48a11b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-19 12:02:50 -08:00
David Rowe	f58a5db0b0	Reorganize JSDoc inheritance for MyAvatar and Avatar	2019-02-19 09:47:51 +13:00
Angus Antley	748368bfda	mid tweak on the wrist and position coeffs	2019-02-17 23:32:52 -08:00
David Rowe	50a1e07ed2	Stub missing MyAvatar, Avatar, and Agent functions and properties JSDoc	2019-02-18 18:32:49 +13:00
Angus Antley	70764bc3c4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-15 19:24:30 -08:00
amantley	d78f253d24	code to generate pole vector from theta	2019-02-15 17:43:53 -08:00
amantley	36093926d0	added fake android defines for running the new ik on pc	2019-02-15 15:00:39 -08:00
Thijs Wenker	e900d3784b	fixes	2019-02-15 23:58:42 +01:00
Thijs Wenker	74ce98a075	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor	2019-02-15 20:57:20 +01:00
Thijs Wenker	556a55ff16	Better scale and texture checks	2019-02-15 20:55:27 +01:00
amantley	0fcaa695ba	Merge remote-tracking branch 'upstream/master' into animArmIK	2019-02-15 10:35:33 -08:00
amantley	d6dfaacf6f	adding ifdef for android os	2019-02-15 10:35:25 -08:00
luiscuenca	c966f71cb1	More fixes	2019-02-15 10:17:37 -07:00
luiscuenca	98c321c718	Fix warnings	2019-02-15 09:40:49 -07:00
amantley	425413419a	fixed merge conflict in avatar.h	2019-02-15 08:26:54 -08:00
luiscuenca	624a53449f	Merge branch 'master' into flowCpp ... # Solved Conflicts: # interface/src/avatar/MyAvatar.cpp	2019-02-14 18:55:43 -07:00
luiscuenca	88eae0f2ec	Remove test functions	2019-02-14 18:49:49 -07:00
luiscuenca	3e66bce112	set useFlow function	2019-02-14 18:30:37 -07:00
Anthony Thibault	a3407b96b0	Merge branch 'master' into bug-fix/revert-anim-pose-optimization	2019-02-14 16:56:17 -08:00
Sam Gateau	6168001ad4	Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80 ... Case 21159: fixes for more grab bugs	2019-02-14 16:52:03 -08:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -08:00
Bradley Austin Davis	d45d87031d	Merge pull request #14782 from SamGondelman/NOverlaysFinal ... Case 20723, Case 20334: Internally, replace all overlays with local entities	2019-02-14 13:49:47 -08:00
Thijs Wenker	3026fd625a	Avatar Doctor	2019-02-14 18:52:50 +01:00
Shannon Romano	8a07e2b31a	Merge pull request #14895 from ctrlaltdavid/M21132 ... Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs	2019-02-13 10:35:00 -08:00
Shannon Romano	07a92aea95	Merge pull request #14894 from AndrewMeadows/update-collision-group-after-grab ... Case 21093: recompute collision group/mask when Grab ends	2019-02-12 17:31:43 -08:00
Andrew Meadows	ed8481ead9	fix grab bugs	2019-02-12 14:04:56 -08:00
luiscuenca	954cac907d	Other avatars after update and mod timer when active	2019-02-12 15:02:56 -07:00
Andrew Meadows	3ea6241cc9	send update for AvatarEntity on deleteGrab	2019-02-12 12:50:47 -08:00
danteruiz	fdfb9196d3	comments explaining horrible code	2019-02-12 11:45:08 -08:00
luiscuenca	942e9ccdfd	Hand collisions working	2019-02-11 18:21:00 -07:00
danteruiz	a7e28f7a66	fix spatially nestable parent overwrite	2019-02-11 17:04:07 -08:00
danteruiz	50dd865bdc	fix spatially nestable parent overwrite	2019-02-11 16:48:34 -08:00
Andrew Meadows	fab3e5e3fd	remember hash of AvatarEntityItemData	2019-02-11 16:13:56 -08:00
David Rowe	5428bb19dc	Add "Avatar Script" JSDoc API classification	2019-02-12 11:49:49 +13:00
r3tk0n	bdafb99402	Remove unused variable and function to address warnings in Mac and Linux builds.	2019-02-11 14:19:15 -08:00
SamGondelman	d988de4a17	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-11 10:27:12 -08:00
amantley	822ec1c529	working on the wrist tweak, dampened the spine twist	2019-02-08 17:53:23 -08:00
John Conklin II	f9b86725fd	Merge pull request #14816 from SamGondelman/avatar ... Case 20924: Cleaning up Avatar findRayIntersection	2019-02-08 14:40:45 -08:00
Anthony Thibault	d012d07519	Merge pull request #14865 from hyperlogic/feature/anim-optimizations ... Animation System Optimizations	2019-02-08 12:44:10 -08:00
Jeff Clinton	54109deab9	Merge pull request #14825 from SamGondelman/fall ... Case 20829: Always fall when flying is not allowed	2019-02-07 14:39:46 -08:00
SamGondelman	e74ff18bef	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:49:27 -08:00
SamGondelman	25ca52d892	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:48:13 -08:00
Shannon Romano	30a6f25b69	Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor ... case 20048: don't allow MyAvatar to move until physics enabled	2019-02-06 11:52:42 -08:00
Anthony Thibault	569bef50fd	AnimPose operator* optimizations	2019-02-05 14:48:05 -08:00
Andrew Meadows	cbd83f972c	remove unsued variable	2019-02-05 10:17:10 -08:00
Andrew Meadows	e50892b3d2	MyAvatar is unmovable until physics is enabled	2019-02-05 09:00:48 -08:00
luiscuenca	cf8f9fa1b6	Threads created correctly	2019-02-04 11:28:42 -07:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
amantley	61b019d176	added new constructor for cubichermitespline that takes quat and vec3. this means we don't need computeSplineFromTipAndBase to be declared in multiple files	2019-01-31 14:13:51 -08:00
amantley	ffd374e7d4	whitespace	2019-01-31 10:05:08 -08:00
amantley	f68ee4e7ce	merged with master	2019-01-31 09:56:46 -08:00
SamGondelman	2d0c1184e4	only domain zone entities control flying and ghosting	2019-01-30 18:27:17 -08:00
amantley	7a1c1252ff	cleanup	2019-01-30 16:09:10 -08:00
SamGondelman	6cbc0fad7f	fixes	2019-01-30 15:58:15 -08:00
r3tk0n	7e9d35a0fb	Add individual speed settings per control mode.	2019-01-30 15:06:35 -08:00
Seth Alves	30d9fe705e	avoid possible crash	2019-01-30 14:56:50 -08:00
Seth Alves	c6f44234f8	avoid possible crash	2019-01-30 14:56:02 -08:00
amantley	2e1a4545c6	cache the spine2 spline default offset and ratio	2019-01-30 14:47:03 -08:00
Seth Alves	3ab2db96b6	deactivate grab action when grab is released	2019-01-30 14:43:11 -08:00
Seth Alves	0846eb8ec6	attempt to allow position edits in releaseGrab entity-method	2019-01-30 14:43:11 -08:00
SamGondelman	e32a3ba20d	organize new avatar intersection	2019-01-30 13:19:45 -08:00
amantley	fb0ad7768c	removed clear map	2019-01-29 17:31:20 -08:00
amantley	e2a729b68b	got the spline working in myskeleton model, need to clean up	2019-01-29 17:25:25 -08:00
r3tk0n	e1cbb187cd	Clean up comments in MyAvatar.cpp	2019-01-29 16:12:49 -08:00
r3tk0n	d4cf1de4dd	Fix default locomotion scaling.	2019-01-29 12:02:02 -08:00
SamGondelman	0d1e4bed66	merge with master	2019-01-28 18:13:05 -08:00
luiscuenca	a6dce5dd84	Merge branch 'master' into multiSphereAvatar04	2019-01-28 17:48:22 -07:00
luiscuenca	fced9e2814	Review fixes	2019-01-28 17:43:51 -07:00
Shannon Romano	607ce00713	Merge pull request #14766 from AndrewMeadows/grab-it ... case 20701: fixes for grab	2019-01-28 15:57:36 -08:00
r3tk0n	0f45781779	Remove extra qualifier from function signature in MyAvatar.h	2019-01-28 15:52:18 -08:00
r3tk0n	0429280148	Default vs Analog implemented.	2019-01-28 14:06:32 -08:00
luiscuenca	1b75f569b3	fix jsdoc	2019-01-28 15:02:10 -07:00
luiscuenca	2a1f1a4855	Remove debug logging	2019-01-28 12:55:36 -07:00
luiscuenca	cc73649ef8	Merge branch 'master' into multiSphereAvatar04	2019-01-28 11:57:04 -07:00
luiscuenca	49659f0039	Fix error on exit and jointsToFilter param removed	2019-01-28 11:55:53 -07:00
r3tk0n	6552d8d9ee	Add settings for control scheme.	2019-01-28 10:40:31 -08:00
Jamil Akram	bcaad3092b	Merge pull request #14695 from amantley/trumpFix ... Fixed Sinking Trump Avatar Bug: Stops unnecessary vertical re-centering with big-headed avatar	2019-01-28 10:12:55 -08:00
SamGondelman	8f0bd2449b	pointerevents are working!	2019-01-26 21:53:46 -08:00
SamGondelman	abd7d6bddf	some stuff is working!	2019-01-26 01:39:13 -08:00
Shannon Romano	a2b2f3f67c	Merge pull request #14742 from hyperlogic/bug-fix/user-recenter-model-pref ... Settings > Controls > User Recenter Model now saves properly	2019-01-25 17:34:33 -08:00
Shannon Romano	f084021fdf	Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type ... Added HMD Avatar Alignment Type	2019-01-25 17:32:41 -08:00
amantley	91fddf783f	increased the threshold to stop vertical recentering	2019-01-25 16:09:45 -08:00
r3tk0n	338d4c3c18	Lay groundwork for control scheme selection.	2019-01-25 15:14:17 -08:00
amantley	cc4d9e2ae2	Merge remote-tracking branch 'upstream/master' into trumpFix	2019-01-25 15:05:00 -08:00
r3tk0n	35818e9b9d	Add menu items for 'gear' selection.	2019-01-25 14:28:21 -08:00
r3tk0n	9ea476ea89	Attempt to add acceleration curve.	2019-01-25 14:27:54 -08:00
SamGondelman	a2083d949e	IT'S BUILDING (but still wip)	2019-01-25 14:04:52 -08:00
luiscuenca	f54f9e5bfd	Merge branch 'master' into multiSphereAvatar04	2019-01-25 13:54:01 -07:00
luiscuenca	df4be641eb	More fixes	2019-01-25 13:42:18 -07:00
SamGondelman	5ce8f566cc	more overlay wip	2019-01-25 11:10:11 -08:00
Shannon Romano	28edb472fc	Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale ... 20565 Avatar::_collideWithOtherAvatars does not scale	2019-01-25 11:06:36 -08:00
SamGondelman	ca8d64bc05	removing overlays wip	2019-01-24 14:59:45 -08:00
Andrew Meadows	09fe9735fa	plug grab leak, more correct names	2019-01-24 14:57:54 -08:00
Andrew Meadows	ee3fde9df1	unravel spaghetti, prefer std over Qt containers	2019-01-24 14:39:00 -08:00
r3tk0n	a1c24516c2	Fix strafing with controller-relative movement (was wrong local axis for controller).	2019-01-24 14:38:31 -08:00
Andrew Meadows	160bef8f23	cleanup and minor optimizations	2019-01-23 23:18:52 -08:00
luiscuenca	7a0f3ea7ef	Fix error	2019-01-23 18:04:13 -07:00
luiscuenca	a947c894c2	Suggested changes	2019-01-23 17:23:36 -07:00
Anthony Thibault	a7a71e4286	Merge branch 'master' into feature/hmd-avatar-alignment-type	2019-01-23 15:52:20 -08:00
r3tk0n	1e10afe762	Add function for calculating direction in MyAvatar.	2019-01-22 14:14:54 -08:00
Jeff Clinton	3776472550	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats ... cases 20709 and 20715: wear and see mexico hats	2019-01-22 12:58:56 -08:00
raveenajain	2393db5e12	collision logic	2019-01-21 16:24:32 -08:00
r3tk0n	4fa8454216	Add condition for HMD mode to hand-relative code block.	2019-01-21 13:25:06 -08:00
raveenajain	3f2aa56187	feedback changes	2019-01-21 13:24:07 -08:00
raveenajain	379f98b26d	just using change	2019-01-18 18:20:28 -08:00
Anthony Thibault	205e375d36	Settings > Controls > User Recenter Model now saves properly	2019-01-18 16:58:26 -08:00
raveenajain	d2e37d0c90	my and other avater changes, if setting toggled can pass through other avatar	2019-01-18 16:50:44 -08:00
Andrew Meadows	9a854291af	supress spurious not important AvatarEntity updates	2019-01-18 15:36:38 -08:00
r3tk0n	79ff0a5b65	Basic controller-relative (non-leveled) locomotion working.	2019-01-18 14:35:26 -08:00
Antonina Savinova	8c4c488676	Merge pull request #14721 from Atlante45/feat/upstream-limitter ... Limit upstream bandwidth to the Avatar Mixer	2019-01-18 13:32:03 -08:00
r3tk0n	0c20107203	Add Controller menu items for hand/head-relative movement.	2019-01-18 12:46:19 -08:00
Shannon Romano	11b8ae6d44	Merge pull request #14710 from sethalves/mouse-grab-with-traits ... case 15962: case 20481: Mouse grab with traits	2019-01-18 11:56:41 -08:00
luiscuenca	43244193e8	Mesh picking against default pose with transformed ray	2019-01-18 12:46:18 -07:00
Shannon Romano	c764f5182f	Merge pull request #14717 from roxanneskelly/Case20277 ... Case20277 - Ignoring user causes loading orb to appear at /0,0,0	2019-01-17 15:36:31 -08:00
Andrew Meadows	74f9a415d3	move _cauterizationNeedsUpdate back to MyAvatar	2019-01-17 13:58:34 -08:00
luiscuenca	007e3ac577	Fix warning and wrong ID	2019-01-17 14:53:06 -07:00
Seth Alves	4fbc257be0	don't cauterize head-children when they are grabbed	2019-01-17 13:34:36 -08:00
luiscuenca	2158e084d4	Add avatar joints filter to intersection calculation	2019-01-17 14:01:36 -07:00
Adam Smith	f955313afc	Merge pull request #14687 from SamGondelman/cancel ... Case 20580: Trying to fix wearables and avatar app	2019-01-17 11:25:30 -08:00
SamGondelman	9727c8fd38	CR	2019-01-16 14:14:01 -08:00
luiscuenca	67cc5bd7f2	Fix warnings and wrong shapes position for myAvatar	2019-01-16 10:52:34 -07:00
Seth Alves	fd09180776	Merge pull request #14645 from ctrlaltdavid/M19774-d ... Make mouselook directly proportional to right-click mouse	2019-01-16 09:09:38 -08:00
Roxanne Skelly	6cb12daf74	CR Fixes	2019-01-15 17:49:13 -08:00
luiscuenca	a7f143dbce	Merge branch 'master' into multiSphereAvatar04 ... # Resolved Conflicts: # interface/src/avatar/MyAvatar.h # interface/src/avatar/OtherAvatar.cpp	2019-01-15 18:27:04 -07:00
luiscuenca	71e7023a3e	Refactor and optimizations	2019-01-15 18:07:50 -07:00
Seth Alves	b1c34eb9ec	update queryAACube during grab rather than only when grab is released	2019-01-15 16:01:44 -08:00
Clement	8480624797	Limit upstream data to avatar mixer	2019-01-15 14:18:53 -08:00
Roxanne Skelly	6317ceb9b3	Case20277 - Ignoring user causes loading orb to appear at /0,0,0 ... Loading orb was created for all other avatars upon OtherAvatar object creation without checking the ignore list.	2019-01-15 13:34:29 -08:00
Clement	6bd6c45b60	Remove dead IdentityRequest code	2019-01-15 11:40:08 -08:00
SamGondelman	68e15c6c07	fixes from 78	2019-01-14 13:36:21 -08:00
luiscuenca	65896b3b6f	Fix shape LOD	2019-01-13 11:30:39 -07:00
luiscuenca	19701ef333	Fix scale and add rayTest	2019-01-11 15:36:07 -07:00
amantley	8cba72743e	changed the value for the top threshold that triggers a vertical reset, this stops unwanted recentering	2019-01-11 08:46:20 -08:00
Andrew Meadows	16da42723e	use glm::abs() instead of absf()	2019-01-10 10:15:39 -08:00
Andrew Meadows	f7b7db5ab4	fix warning on OSX, use correct format for float literals	2019-01-10 09:14:37 -08:00
Andrew Meadows	9ea6968e35	fix bug where attached AvatarEntities do not update in timely fashion	2019-01-09 17:40:18 -08:00
Andrew Meadows	8206daf1a6	send update when loading AvatarEntity from Settings	2019-01-09 17:28:00 -08:00
Andrew Meadows	e2d6e6f3dc	more correct AvatarEntityData settings when switching domains	2019-01-09 17:28:00 -08:00
Andrew Meadows	27318a3f17	update AvatarEntitData blobs before writing to JSON during recordings	2019-01-09 17:28:00 -08:00
Andrew Meadows	c998ddbb9e	ScriptableAvatar::setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	63ed0a3a98	move blob conversion recipes to EntityItemProperties	2019-01-09 17:28:00 -08:00
Andrew Meadows	855497e604	MyAvatar.updateAvatarEntity(id, data) works in theory	2019-01-09 17:28:00 -08:00
Andrew Meadows	a4be4fb6c0	MyAvatar.setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	329ec84104	MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings	2019-01-09 17:28:00 -08:00
Andrew Meadows	cbcd70aee6	namechanges and comments to help clarify necessary fixes	2019-01-09 17:28:00 -08:00
Andrew Meadows	9f404ef006	Agent bots can manipulate AvatarEntities again	2019-01-09 17:28:00 -08:00
Andrew Meadows	43fc86fe54	restore non-human-readable avatarEntityDataSettings format	2019-01-09 17:27:14 -08:00
Andrew Meadows	dedc14434b	fix compile warnings on windows	2019-01-09 17:27:14 -08:00
Andrew Meadows	320ba9177c	remove cruft	2019-01-09 17:27:14 -08:00
Andrew Meadows	121a591023	delete old AvatarEntities on domain reset on login	2019-01-09 17:27:14 -08:00
Andrew Meadows	1815d71158	fix data corruption bug	2019-01-09 17:27:14 -08:00
Andrew Meadows	6da8c5545e	remove debug code	2019-01-09 17:27:14 -08:00
Andrew Meadows	ce660bee9b	fix compile errors after rebase	2019-01-09 17:27:14 -08:00
Andrew Meadows	61b8d005b5	scripts can edit AvatarEntities again	2019-01-09 17:27:14 -08:00
Andrew Meadows	6c81e8845b	cleanup	2019-01-09 17:27:14 -08:00
Andrew Meadows	fe2ee68b79	add EntityItemProperties::copyFromJSONString()	2019-01-09 17:27:14 -08:00
Andrew Meadows	ec384d7dbb	more correct reload AvatarEntityData from settings	2019-01-09 17:27:14 -08:00
Andrew Meadows	0ed936520d	MyAvatar saving to settings works again	2019-01-09 17:27:14 -08:00
Andrew Meadows	e37b5b52f0	correctly load AvatarEntities from settings redux	2019-01-09 17:27:14 -08:00
Andrew Meadows	026c6301a6	correctly load AvatarEntities from settings	2019-01-09 17:27:14 -08:00
Andrew Meadows	01fc442695	save AvatarEntities settings as strings	2019-01-09 17:27:14 -08:00
luiscuenca	95fca826a5	Add fit AABox for avatar and implement multisphere on shapeManager	2019-01-09 17:49:19 -07:00
Anthony Thibault	5d606981de	Added HMD Avatar Alignment Type ... Adds a new API to set this type, and an option to the Avatar App. * "eye" - Match the user eyes with the avatar eyes. The previous default behavior. If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down. * "head" - Match the user head with the avatar head. The new default behavior. This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.	2019-01-08 18:35:28 -08:00
luiscuenca	39dc25ea92	Merge branch 'master' into multiSphereAvatar04 ... # Conflicts: # interface/src/avatar/OtherAvatar.h # libraries/avatars-renderer/src/avatars-renderer/Avatar.h	2019-01-08 15:41:33 -07:00
luiscuenca	f19201fc92	Other avatar detailed collisions on motion state	2019-01-08 14:09:13 -07:00
Jeff Clinton	75d26dc45f	Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption ... Add menu checkbox to toggle collisions with other avatars	2019-01-07 08:58:09 -08:00
luiscuenca	2a367509cd	Fix warnings	2019-01-04 18:02:18 -07:00
luiscuenca	d630fe9dbd	Add menu checkbox to toggle collisions with other avatars	2019-01-04 16:38:48 -07:00
Thijs Wenker	b0db81b861	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-05 00:01:25 +01:00
Thijs Wenker	94146ab997	CR fixes	2019-01-04 23:59:22 +01:00
Ryan Huffman	7433870c2f	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-04 14:43:46 -08:00
Thijs Wenker	5d40e1e480	- CR/style fixes ... - Moved the old Avatar Packager tool to Developer -> Avatar -> ..	2019-01-04 23:39:04 +01:00
Ryan Huffman	63172ec87b	Fix marketplace item update failing on submitted items	2019-01-04 14:21:10 -08:00
Thijs Wenker	b105607cb2	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-04 21:13:29 +01:00
Ryan Huffman	51ce19e026	Fix modified const var in MarketplaceItemUploader	2019-01-04 12:08:23 -08:00
Ryan Huffman	b680e9c52a	Update avatar packager with CR feedback	2019-01-04 09:59:17 -08:00
Ryan Huffman	f38a469e65	Update avatar packager to force focus on inventory when opened	2019-01-04 09:55:21 -08:00
Jamil Akram	2c247bc3df	Merge pull request #14592 from huffman/fix/myavatar-collisions ... Fix MyAvatar::collisionWithEntity not firing	2019-01-04 09:43:29 -08:00
Ryan Huffman	c2ceeb3d76	Apply AvatarPackager code review cleanup	2019-01-04 09:41:31 -08:00
Anthony Thibault	7e68f539d3	Only use the camera position for lookAt in first person.	2019-01-03 15:27:44 -08:00
Ryan Huffman	93f53cf43d	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 14:18:40 -08:00
Ryan Huffman	7ca7e0f234	Revert unintended changes in avatar packager	2019-01-03 13:45:00 -08:00
Anthony Thibault	fa137f0586	Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation	2019-01-03 13:19:11 -08:00
Thijs Wenker	c95da0a595	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/src/Application.cpp	2019-01-03 22:17:54 +01:00
Thijs Wenker	ecc578c2dd	- error messages ... - style changes	2019-01-03 22:00:22 +01:00
luiscuenca	21a4da4d5f	fix collisions for newly added avatars	2019-01-03 13:36:26 -07:00
Seth Alves	895e8cdba1	fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again	2019-01-03 08:17:52 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
Thijs Wenker	a035a2f639	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 11:09:27 +01:00
David Rowe	14d39d1747	Make mouselook yaw and pitch directly proportional to mouse movement	2019-01-03 15:53:37 +13:00
Anthony Thibault	006bd8f939	Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation	2019-01-02 16:58:10 -08:00
Thijs Wenker	cb91a4bc6d	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-03 00:10:22 +01:00
Ryan Huffman	41effbf862	Remove unused variable in MarketplaceItemUploader.cpp	2019-01-02 15:01:00 -08:00
Ryan Huffman	d29233872e	Remove avatar packager from Android builds	2019-01-02 14:59:47 -08:00
Anthony Thibault	71991c2e2f	Added max angles and isTalking into the lookAtCostFunction	2019-01-02 11:05:01 -08:00
Anthony Thibault	d87bc3e898	Update eye look at interest calculation ... This now takes distance, your facing toward them, and their facing toward you into the interest calculation. Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar. Previously these two separate elements where merged together in a single loop.	2018-12-31 13:37:22 -08:00
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