948 commits

Author	SHA1	Message	Date
Seth Alves	5c327edd5a	keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts	2015-11-30 14:08:07 -08:00
Seth Alves	89b78986d5	remove some more stray const	2015-11-30 14:01:17 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Seth Alves	facf91faac	minimize diff vs master	2015-11-26 07:13:43 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Brad Davis	5c2b980a45	Fixing avatar facial blendshapes and attachments in recordings	2015-11-23 22:36:07 -08:00
Seth Alves	ba30e01664	include global position in avatar-mixer protocol so server knows where avatars are in world-space	2015-11-23 14:12:49 -08:00
Brad Davis	64ba5b4f14	Cleaning up old recording files	2015-11-23 09:42:34 -08:00
Seth Alves	abfc3e994a	AvatarData::toFrame expects a scaled transform	2015-11-22 07:18:12 -08:00
Seth Alves	4646c0c103	unmangle merge	2015-11-21 10:49:31 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
samcake	0dc551409d	Fixing a comment	2015-11-20 15:22:01 -08:00
samcake	e97e864de7	Getting the animation playback to work	2015-11-20 15:05:17 -08:00
Stephen Birarda	19d3d80ff9	fixes for some incorrect assumptions	2015-11-20 11:03:52 -08:00
Stephen Birarda	22f5d4df6d	change signature of copy return	2015-11-19 16:25:33 -08:00
Stephen Birarda	430cb7876d	remove a couple of read lockers for AvatarHashMap	2015-11-19 16:22:56 -08:00
Stephen Birarda	40397add43	fix for extra adds in AvatarManager	2015-11-19 16:15:21 -08:00
Stephen Birarda	6398a922c6	leverage COW for AvatarHash	2015-11-19 15:43:29 -08:00
Stephen Birarda	2a05ec650b	fix locking in AvatarHashMap/AvatarManager	2015-11-19 14:17:48 -08:00
Brad Hefta-Gaub	ba922290a4	Merge pull request #6407 from jherico/dargo ... Exclude avatar scales out of the permissable range	2015-11-17 18:41:15 -08:00
Brad Davis	4e57c9114c	Avatar has no dependency on audio or recording anymore	2015-11-17 17:13:53 -08:00
Brad Davis	0ad1d08041	Exclude avatar scales out of the permissable range	2015-11-17 16:46:25 -08:00
Brad Davis	900f425f35	Recording fixes	2015-11-17 15:18:31 -08:00
Brad Davis	cb26fc67fc	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
samcake	89e5db11a0	More fixes	2015-11-13 17:41:41 -08:00
samcake	8c21ac144e	Fixing review comments	2015-11-13 16:45:19 -08:00
Sam Gateau	89d120ab3d	Few fixes to make the recorder.js run	2015-11-12 22:24:11 -08:00
samcake	1fd37b51a2	trying to get somewhere....	2015-11-12 17:54:35 -08:00
Brad Davis	ee1545f649	Cleaning up clip and transform	2015-11-12 11:48:47 -08:00
Brad Davis	f521be10fe	Avatar recording work in progress	2015-11-12 00:33:38 -08:00
samcake	d3d5d3a19e	Removing useless code	2015-11-10 12:02:20 -08:00
samcake	2cf2257783	Fix warning	2015-11-10 09:20:43 -08:00
Sam Gateau	06a87012ad	Removing the setJointTranslations which is not helping...	2015-11-09 23:38:51 -08:00
Sam Gateau	b47c5dbff2	Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays	2015-11-09 23:12:04 -08:00
samcake	77e21b7190	Trying to fix the animation recording and playback, but still not good	2015-11-09 18:18:30 -08:00
samcake	2078c753ae	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-09 09:23:59 -08:00
samcake	cbeb56aba4	using the frameInterpolatorCOrrectly	2015-11-06 17:25:50 -08:00
Howard Stearns	314c11e8d4	Make life easier for Sam.	2015-11-06 16:59:46 -08:00
samcake	4dbca68767	Updating the legacy file format to support the joint translation and also fix the replay problem oof the joints going to the moon	2015-11-06 16:24:19 -08:00
samcake	2f9c33dbfb	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-06 09:35:48 -08:00
samcake	46d9a14951	Work in progress, fixing the animation playback	2015-11-06 09:35:20 -08:00
Atlante45	ffafd3194e	Recording audio fixes	2015-11-05 16:46:59 -08:00
Atlante45	07b3597ae3	Fix recording scripts	2015-11-05 14:01:37 -08:00
Seth Alves	fbaa86426c	re-remove the _nextPosition stuff	2015-11-03 16:52:46 -08:00
Seth Alves	60824a1fb0	back out some off-brand changes. add parentChanged call	2015-11-03 16:07:28 -08:00
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Brad Davis	49e7d42c2c	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-30 10:07:40 -07:00
Howard Stearns	96900dab25	Merge pull request #6195 from CrackerHax/master ... Added AvatarList features for creating userlists in AC scripts	2015-10-29 22:11:57 -07:00
Brad Davis	ccbae81dad	Merge branch 'master' into HEAD ... Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-10-29 10:24:38 -07:00
Brad Hefta-Gaub	65eae35433	a little more cleanup	2015-10-27 17:09:43 -07:00