Commit Graph

9 Commits

Author SHA1 Message Date
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
Unknown 1b13794a47 Ability to run the full experiment suite in unix 2017-01-04 17:32:38 -05:00
Tadas Baltrusaitis 41fc0bd43c Unifying input and output of GUI and command line versions. 2016-12-09 15:07:31 -05:00
Tadas Baltrusaitis 99191fd3c9 Simplification of Recording in WPF through a separate file and data binding (WIP). 2016-12-08 16:14:06 -05:00
Tadas Baltrusaitis 0befd5f756 Allowing to control the size of aligned output image 2016-12-05 17:28:39 -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