Commit Graph

6 Commits

Author SHA1 Message Date
Tadas Baltrusaitis 4192e85a8f Some refinements for the multi face tracking support and cmake fixes. 2018-02-24 09:19:13 +00:00
Tadas Baltrusaitis b224fcdfc9 Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI
# Conflicts:
#	.gitignore
#	exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
#	lib/local/FaceAnalyser/FaceAnalyser.vcxproj
#	lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h
#	lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
#	matlab_runners/Demos/feature_extraction_demo_vid.m
#	matlab_runners/Demos/gaze_extraction_demo_vid.m
2017-12-29 16:27:00 +00:00
Tadas Baltrusaitis 4707b0a687 Some more script fixes. 2017-11-07 07:25:44 +00:00
Tadas Baltrusaitis 9900e8b0de Simplifying head pose estimation. 2016-11-23 17:17:26 -05:00
Tadas Baltrusaitis 51ae195124 A number of small fixes, renamings and corrections. 2016-07-31 16:31:17 -04:00
unknown 57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00