overte-Armored-Dragon/interface/src/avatar
David Rowe c20cd40275 Merge branch 'master' into 20601
Conflicts:
	interface/src/avatar/Head.cpp
2015-07-02 09:51:47 -07:00
..
Avatar.cpp Fix rendering of look-at avatar sphere 2015-07-01 22:45:13 -07:00
Avatar.h hydra hand spheres and lasers are rendering again 2015-07-01 15:04:19 -07:00
AvatarActionHold.cpp git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point 2015-06-17 11:22:10 -07:00
AvatarActionHold.h add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07:00
AvatarManager.cpp fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
AvatarManager.h unhook motionstate before removing avatar 2015-06-22 15:40:26 -07:00
AvatarMotionState.cpp move collision group consts to shared lib 2015-06-03 14:13:51 -07:00
AvatarMotionState.h basic support for collision groups 2015-06-03 11:40:48 -07:00
FaceModel.cpp Fix gazing at avatar (when no head tracking or HMD) 2015-07-01 18:31:16 -07:00
FaceModel.h move Model and AnimationHandle to libraries 2014-12-16 14:04:39 -08:00
Hand.cpp hydra hand spheres and lasers are rendering again 2015-07-01 15:04:19 -07:00
Hand.h hydra hand spheres and lasers are rendering again 2015-07-01 15:04:19 -07:00
Head.cpp Merge branch 'master' into 20601 2015-07-02 09:51:47 -07:00
Head.h Add mouth as third gaze target in addition to left and right eyes 2015-07-01 21:22:30 -07:00
ModelReferential.cpp EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
ModelReferential.h EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
MyAvatar.cpp Merge branch 'master' into 20601 2015-07-02 09:51:47 -07:00
MyAvatar.h Merge branch 'master' into 20601 2015-07-02 09:51:47 -07:00
SkeletonModel.cpp hydra lasers are now rendering again 2015-07-01 15:12:37 -07:00
SkeletonModel.h hydra lasers are now rendering again 2015-07-01 15:12:37 -07:00