Commits · 1c8b0fc2d1059f78f0c68ce0d472d3b4e55ff1c6 · SICV / vitrine

13 Mar, 2016 2 commits
- Merge branch 'generalised-features-and-shell' of gitlab.com:sicv/vitrine into... · 1c8b0fc2
  Michael Murtaugh authored Mar 13, 2016
```
Merge branch 'generalised-features-and-shell' of gitlab.com:sicv/vitrine into generalised-features-and-shell
```
  1c8b0fc2
- catframes and srt code · f1c46a7c
  Michael Murtaugh authored Mar 13, 2016
  
  f1c46a7c
11 Mar, 2016 14 commits
- play(url) with mplayer from vitrine collage pi · efa57768
  Michael Murtaugh authored Mar 11, 2016
  
  efa57768
- Merge branch 'collage-shell-client' into generalised-features-and-shell · 2e22e9d8
  Michael Murtaugh authored Mar 11, 2016
  
  2e22e9d8
- testing make mp4 · 105fbb91
  Michael Murtaugh authored Mar 11, 2016
  
  105fbb91
- commented out camera webm · cc451a93
  Michael Murtaugh authored Mar 11, 2016
  
  cc451a93
- args fix · b6aecb75
  Michael Murtaugh authored Mar 11, 2016
  
  b6aecb75
- Merge branch 'collage-shell-client' of gitlab.com:sicv/vitrine into generalised-features-and-shell · 65e5fe25
  Michael Murtaugh authored Mar 11, 2016
  
  65e5fe25
- Merge branch 'collage-shell-client' into generalised-features-and-shell · 5b013193
  Michael Murtaugh authored Mar 11, 2016
  
  5b013193
- archive with bodies json · ef83deaa
  Michael Murtaugh authored Mar 11, 2016
  
  ef83deaa
- sizes: · 824c43ba
  Michael Murtaugh authored Mar 11, 2016
  
  824c43ba
- waitforfeature, accept based on no of consecutive frames with x features (of any kind) · b2efd8d1
  Michael Murtaugh authored Mar 11, 2016
  
  b2efd8d1
- bug fixes · c6ef2997
  Michael Murtaugh authored Mar 11, 2016
  
  c6ef2997
- separate features in json · cabbffe9
  Michael Murtaugh authored Mar 11, 2016
  
  cabbffe9
- less verbose · 715d09d3
  Michael Murtaugh authored Mar 11, 2016
  
  715d09d3
- new generalized getfeatures and summarize_json · 26094d5e
  Michael Murtaugh authored Mar 11, 2016
  
  26094d5e
05 Mar, 2016 22 commits
- Merge branch 'collage-shell-client' of gitlab.com:sicv/vitrine into collage-shell-client · c2c2d93a
  Michael Murtaugh authored Mar 05, 2016
  
  c2c2d93a
- server with displayimage and figlet · 93a16484
  Michael Murtaugh authored Mar 05, 2016
  
  93a16484
- fullscreen with opts · 821f31e7
  Michael Murtaugh authored Mar 05, 2016
  
  821f31e7
- oops kill vlc · 7a6066d6
  Michael Murtaugh authored Mar 05, 2016
  
  7a6066d6
- kill 9 to play scripts for pi · 49568133
  Michael Murtaugh authored Mar 05, 2016
  
  49568133
- play to use cvlc · 3e93b6f7
  Michael Murtaugh authored Mar 05, 2016
  
  3e93b6f7
- mplayer · 711225f2
  Michael Murtaugh authored Mar 05, 2016
  
  711225f2
- shell · 61270990
  Michael Murtaugh authored Mar 05, 2016
  
  61270990
- shell · 2a89fbea
  Michael Murtaugh authored Mar 05, 2016
  
  2a89fbea
- shell · c4aa1c59
  Michael Murtaugh authored Mar 05, 2016
  
  c4aa1c59
- testing spawn/kill behaviour with cvlc · 243f05b7
  Michael Murtaugh authored Mar 05, 2016
  
  243f05b7
- testing spawn/kill behaviour with cvlc · 88312e45
  Michael Murtaugh authored Mar 05, 2016
  
  88312e45
- testing spawn/kill behaviour with cvlc · fd62faf0
  Michael Murtaugh authored Mar 05, 2016
  
  fd62faf0
- use server/url for remote collage play · 2b738295
  Michael Murtaugh authored Mar 05, 2016
  
  2b738295
- use server/url for remote collage play · 92ec51e7
  Michael Murtaugh authored Mar 05, 2016
  
  92ec51e7
- added settings to collage shell for server address · 7b7f5162
  Michael Murtaugh authored Mar 05, 2016
  
  7b7f5162
- cleanup without upload · 8c5f8746
  Michael Murtaugh authored Mar 05, 2016
  
  8c5f8746
- collage shell · ace8869a
  Michael Murtaugh authored Mar 05, 2016
  
  ace8869a
- creatingcollage loop · 020f6233
  Michael Murtaugh authored Mar 05, 2016
  
  020f6233
- initial thinking, cc cleanup · 8c52c034
  Michael Murtaugh authored Mar 05, 2016
  
  8c52c034
- added xtra jornfolders to ignore · 22b9b307
  Michael Murtaugh authored Mar 05, 2016
  
  22b9b307
- fullbody cascade · a777ac3c
  Michael Murtaugh authored Mar 05, 2016
  
  a777ac3c
27 Feb, 2016 1 commit
- feature film :) · 788b41d2
  Michael Murtaugh authored Feb 27, 2016
  
  788b41d2
26 Feb, 2016 1 commit
- livefaces · 21cf4375
  Michael Murtaugh authored Feb 26, 2016
  
  21cf4375