342 commits

Author	SHA1	Message	Date
Angus Antley	11bb448f9f	merged luis code with the fbx having the jointOffsets now	2018-11-09 00:46:32 -08:00
Angus Antley	e36ab9efd6	cleaned up for merge with luis	2018-11-09 00:44:52 -08:00
amantley	2cd3575e32	merged with master with hfm file changes	2018-11-08 17:31:49 -08:00
luiscuenca	2586811e76	Merge with master	2018-11-08 18:05:19 -07: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
luiscuenca	8310dd0cba	Delete leftovers	2018-11-05 15:10:09 -07:00
luiscuenca	bcde01621d	set offsets on FBXGeometry	2018-11-05 14:25:52 -07:00
sabrina-shanman	30eb360f62	Convert remaining HFMModels called model to hfmModel, and rename some missed local variables	2018-11-05 12:07:17 -08:00
amantley	d231a35dfa	changes to get spine2 and neck to work almost there	2018-11-05 08:35:01 -08:00
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
Anthony Thibault	5c78a463de	Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix ... Extra joints on soft entities keep their local transform	2018-11-01 09:29:16 -07:00
luiscuenca	c070bce2ec	Read joint rotation offsets from .fst	2018-10-31 08:39:35 -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
luiscuenca	b8cd5045c7	Extra joints on soft entities keep their local transform	2018-10-24 12:54:09 -07:00
SamGondelman	a3c42363cc	please for the love of god	2018-10-24 12:43:01 -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
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
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
amantley	cce2f295a1	fixed conflict in myskeletonmodel.cpp	2018-10-22 17:49:30 -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
John Conklin II	9c841db9fb	Merge pull request #14184 from SamGondelman/blendshape ... Move blendshape buffers to render thread	2018-10-19 11:55:44 -07:00
luiscuenca	bb5c042f16	Blend network animation	2018-10-18 17:51:20 -07:00
SamGondelman	47c6825aea	CR	2018-10-18 11:08:53 -07:00
luiscuenca	078baa86e4	Sitting abort post transit animation	2018-10-16 13:16:01 -07:00
luiscuenca	ad09007bd8	Fix flickering holded entity, renames and refactors	2018-10-13 16:32:51 -07:00
luiscuenca	52ed6cb6e9	Abort settle animation if already moving	2018-10-12 11:35:51 -07:00
luiscuenca	de1b6e717f	Cancel animation on chained trasits	2018-10-11 11:35:56 -07:00
luiscuenca	1adac78828	fix errors and set new anim parameters	2018-10-11 10:45:35 -07:00
SamGondelman	327c2f4e3d	move blendshape buffers to render thread	2018-10-10 15:32:53 -07:00
unknown	82918a5c31	Add animation support	2018-10-10 12:31:16 -07:00
Seth Alves	de8ae9156c	fix build on clang 7	2018-10-09 12:25:01 -07:00
amantley	c4187f0d60	Merge remote-tracking branch 'upstream/master' into squattyPottyFix	2018-10-08 17:07:55 -07:00
John Conklin II	afe6d97b00	Merge pull request #14100 from danteruiz/soft-entities-updates ... update soft entities and fix deadlock from qml.	2018-10-04 13:33:34 -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
amantley	52355e53f1	adding the menu item to the avatar app for the sit state.	2018-09-27 16:44:55 -07:00
Dante Ruiz	c1c853790b	update soft entities and fix deadlock	2018-09-27 14:53: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
luiscuenca	012cd207b3	No data sent during basic transit	2018-09-24 11:39:10 -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
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
luiscuenca	96e8b060eb	Enable transit animations	2018-09-18 12:42:37 -07:00
luiscuenca	b39391ca7a	From first frame	2018-09-17 13:53:57 -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