Tadas Baltrusaitis
0de2379463
Merge branch 'master' into feature/Windows-GUI
...
# Conflicts:
# .gitignore
# exe/FaceLandmarkVid/FaceLandmarkVid.cpp
# exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
# exe/FeatureExtraction/FeatureExtraction.cpp
# lib/local/FaceAnalyser/src/FaceAnalyser.cpp
# lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h
# lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
# matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt
# matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt
# matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt
# matlab_runners/Demos/Read_HOG_file.m
# matlab_runners/Demos/feature_extraction_demo_img_seq.m
# matlab_runners/Feature Point Experiments/results/fps_yt.mat
# matlab_runners/Feature Point Experiments/results/fps_yt.txt
# matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf
# matlab_runners/Feature Point Experiments/results/landmark_detections.mat
# matlab_runners/Gaze Experiments/mpii_1500_errs.mat
# matlab_runners/Head Pose Experiments/results/Pose_OF.mat
# matlab_runners/Head Pose Experiments/results/Pose_OF.txt
2017-10-18 03:01:47 -04:00
Tadas Baltrusaitis
5959176921
Some big changes:
...
- face validator is a retrained CNN now
- starting retiring CLM-Z from OpenFace
2017-08-01 17:11:02 -04:00
Tadas Baltrusaitis
f98ae0747e
Big restructure of the code, moving closer to a new version with a GUI:
...
- Adding a new boost version (1.63)
- Decoupling FaceAnalyser from LandmarkDetector
- FaceAnalyser is much easier to load with a parameters class
- Moving GazeAnalyser as a separate library
- GUI now uses new FaceAnalyser, LandmarkDetector, and GazeAnalyser
2017-05-18 17:04:38 -04:00
Tadas Baltrusaitis
fa76d9051c
Merge branch 'master' into feature/Windows-GUI
...
Conflicts:
matlab_runners/Demos/feature_extraction_demo_vid.m
2017-05-15 13:19:11 -04:00
Tadas Baltrusaitis
305af01326
Auto stash before merge of "develop" and "origin/develop"
...
- Adding new license files
- Replacing images with more suitable CC ones
2017-05-08 21:36:23 -04:00
Tadas Baltrusaitis
bd0cebbef0
Merging newest master branch in.
2017-04-14 17:23:51 -04:00
Chris Watts
dbe677db38
Forgot to add fallback define for CONFIG_DIR in FaceLandmarkImg
2016-12-31 16:52:30 +00:00
Chris Watts
4260f6a20e
Fix AU and triangulation loading for FaceLandmarkImg and FeatureExtraction
2016-12-29 23:40:03 +00:00
Tadas Baltrusaitis
9900e8b0de
Simplifying head pose estimation.
2016-11-23 17:17:26 -05:00
Tadas Baltrusaitis
c23db4b5e8
Fixes to camera loading.
2016-10-04 21:14:41 -04:00
Tadas Baltrusaitis
1b804c95b6
Merge branch 'master' into develop
2016-09-06 10:37:03 -04:00
Tadas Baltrusaitis
4c2e0bd9a0
Getting rid of some warnings.
2016-08-13 17:56:17 -04:00
Tadas Baltrusaitis
a81f1d3223
Merge pull request #39 from Temigo/master
...
Fix install in CMakeLists.txt files
2016-08-04 14:13:33 -04:00
Tadas Baltrusaitis
5416048697
Corrections for output, faster compilation in VS2015, retuning experiments.
2016-08-01 13:39:52 -04:00
Tadas Baltrusaitis
2f667bf23d
Ubuntu case sensitivity fix in travis test, making sure a check is made to see if image output is successful.
2016-08-01 10:14:58 -04:00
Temigo
eedf6ea37e
Fix install in CMakeLists.txt files
2016-08-01 11:34:23 +02:00
Tadas Baltrusaitis
3fc388cdeb
Fixes with -inroot and -outroot
2016-07-31 20:55:29 -04:00
Tadas Baltrusaitis
0445a97b0c
Merge branch 'feature-travis' into develop
2016-07-31 12:11:35 -04:00
Tadas Baltrusaitis
242ce8d130
Making sure failure returns 1 and success 0, adding an initial attempt at AppVeyor CI for Windows.
2016-07-29 13:04:25 -04:00
Tadas Baltrusaitis
f80fbf0b42
Merge branch 'develop'
2016-07-22 13:29:17 -04:00
simonmssu
819e087c98
Update CMakeLists.txt
2016-07-11 16:11:02 -04:00
Tadas Baltrusaitis
146dcd5e5b
More work on AU - WIP
2016-06-14 17:55:16 -04:00
Tadas Baltrusaitis
4a73ece996
Changing project settings to allow for older CPUs without AVX2 instruction set.
2016-06-11 11:57:54 -04:00
unknown
57e58a6949
Master commit of OpenFace.
2016-04-28 15:40:36 -04:00