Zach Fox 7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2		2018-10-22 13:59:35 -07:00
..
AssociatedTraitValues.h	fix ref to instances vector for instance erase	2018-08-21 11:57:21 -07:00
AvatarData.cpp	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-18 11:12:26 -07:00
AvatarData.h	Reduce the glitches of far away animating avatars	2018-10-05 17:29:25 -07:00
AvatarHashMap.cpp	Remove _pendingAvatars struct	2018-10-12 17:57:48 -07:00
AvatarHashMap.h	Merge pull request #14207 from Atlante45/fix/white-spheres	2018-10-20 12:09:51 -07:00
AvatarLogging.cpp	put avatars and embedded-webserver and entities logging into their own QLoggingCategory	2015-04-06 16:22:54 -07:00
AvatarLogging.h	try again without macro	2015-04-07 09:59:04 -07:00
AvatarTraits.h	suppress traits larger than INT16_MAX bytes	2018-10-05 09:46:55 -07:00
ClientTraitsHandler.cpp	Revert "cycle avatar entity IDs for new avatar mixer"	2018-09-12 12:22:07 -07:00
ClientTraitsHandler.h	Revert "cycle avatar entity IDs for new avatar mixer"	2018-09-12 12:22:07 -07:00
HeadData.cpp	Changes from CR and decreased looking at angle to mitigate freaky eyes	2018-06-29 14:34:17 -07:00
HeadData.h	Changes from CR and decreased looking at angle to mitigate freaky eyes	2018-06-29 14:34:17 -07:00
ScriptAvatarData.cpp	allow agent to create and get avatar entities from script	2018-08-21 10:31:15 -07:00
ScriptAvatarData.h	allow agent to create and get avatar entities from script	2018-08-21 10:31:15 -07:00