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
..
CCNF_patch_expert.cpp	Auto stash before merge of "develop" and "origin/develop"	2017-05-08 21:36:23 -04:00
LandmarkDetectionValidator.cpp	Script fixes, and confidence correction where it should be (not in the executable scripts), starting work on capture in utilities	2017-11-08 09:02:50 +00:00
LandmarkDetectorFunc.cpp	Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI	2017-12-29 16:27:00 +00:00
LandmarkDetectorModel.cpp	Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI	2017-12-29 16:27:00 +00:00
LandmarkDetectorParameters.cpp	Making sure all modules do eye tracking by default. More work on FaceLandmarkImg simplification.	2017-11-16 09:00:47 +00:00
LandmarkDetectorUtils.cpp	Removing no longer needed functions.	2017-12-23 10:13:07 +00:00
Patch_experts.cpp	Some big changes:	2017-08-01 17:11:02 -04:00
PAW.cpp	Big restructure of the code, moving closer to a new version with a GUI:	2017-05-18 17:04:38 -04:00
PDM.cpp	Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI	2017-12-29 16:27:00 +00:00
stdafx.cpp	Auto stash before merge of "develop" and "origin/develop"	2017-05-08 21:36:23 -04:00
SVR_patch_expert.cpp	- some cleanup with depth	2017-10-21 12:15:22 +01:00