Andrew Meadows 082b7cf1a9 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction ... Conflicts: interface/src/avatar/Avatar.cpp interface/src/avatar/Avatar.h interface/src/avatar/MyAvatar.cpp		2014-02-06 14:37:19 -08:00
..
Faceshift.cpp	replace uint64_t with quint64 for Qt friendlyness	2014-01-28 12:35:42 -08:00
Faceshift.h	replace uint64_t with quint64 for Qt friendlyness	2014-01-28 12:35:42 -08:00
OculusManager.cpp	merge of windows-build	2014-01-16 09:00:13 -08:00
OculusManager.h	Make sure we can still compile if we don't have the Linux Oculus dependencies.	2013-12-02 12:24:42 -08:00
SixenseManager.cpp	Remove debug cruft.	2014-01-21 10:45:43 -08:00
SixenseManager.h	replace uint64_t with quint64 for Qt friendlyness	2014-01-28 12:35:42 -08:00
Transmitter.cpp	Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar.	2014-01-31 17:42:48 -08:00
Transmitter.h	Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar.	2014-01-31 17:42:48 -08:00
TV3DManager.cpp	fix ordering and includes for oculusmanager and 3dtv	2014-01-13 10:11:08 -08:00
TV3DManager.h	first cut at 3D TV support	2013-12-28 10:07:33 -08:00