Skip to content
Open
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
05fa033
Trivial external engine to create example.
dwhswenson Feb 4, 2015
604cee7
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Mar 19, 2015
8e50086
Little Makefile for the test external engine
dwhswenson Mar 19, 2015
1511664
Start on the external_engine.py
dwhswenson Mar 19, 2015
f25fdfa
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Mar 29, 2015
8d1597e
Skeleton of tests for external engine
dwhswenson Mar 29, 2015
c653573
More organization work on external_engine
dwhswenson Mar 30, 2015
4efb9ba
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Mar 31, 2015
0ddfff2
Engine starts and stops correctly.
dwhswenson Apr 1, 2015
938a89e
Start some docs on external_engine
dwhswenson Apr 2, 2015
1ecbd35
Draft read_frame_from_file
dwhswenson Apr 2, 2015
9ee153d
Working read_file_from_frame and tests
dwhswenson Apr 2, 2015
c975d6c
External engine passes its test suite.
dwhswenson Apr 2, 2015
699086e
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Apr 3, 2015
e5863f9
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Apr 8, 2015
dede53b
More docs on dynamics engine API
dwhswenson Apr 24, 2015
f988b00
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Apr 24, 2015
10de799
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson May 28, 2015
f498d96
returned psutils to reqs
dwhswenson May 28, 2015
e2ff3e2
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Jun 23, 2015
11eba04
Fixes for long-ago changes in other PRs
dwhswenson Jun 23, 2015
59ac806
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Nov 2, 2015
f9d7dc9
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Apr 11, 2016
7cfa0e8
Add psutil to conda recipe
dwhswenson Apr 11, 2016
b8610cc
Move external engine into engines/
dwhswenson Apr 11, 2016
f6ac4cc
Fixes for external engine with new dynamics engine
dwhswenson Apr 11, 2016
86563ed
External toy engine now has velocities & positions
dwhswenson Apr 22, 2016
fab66f8
Implement write_frame_to_file for toy external
dwhswenson Apr 22, 2016
3648deb
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson May 4, 2016
abbb439
Draft of shooting move test
dwhswenson May 4, 2016
d9b6f1a
Shooting-based test of external engine
dwhswenson May 4, 2016
a7796c7
Automatic sleep optimization works beautifully!
dwhswenson May 11, 2016
360f749
Move ext_eng tests to tests/ dir, restructure eng/
dwhswenson May 13, 2016
d165a9e
Remove test comments
dwhswenson May 13, 2016
8376503
Fix test to be not zombie, instead of running
dwhswenson May 13, 2016
d031c57
More docs. Coverage exclusions.
dwhswenson May 13, 2016
2886eff
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Jun 17, 2016
0816b57
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Jul 7, 2016
ec4178c
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Aug 1, 2016
f9e974d
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Aug 2, 2016
7bb4828
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Aug 3, 2016
e66fbce
Seems to fix the problem.... weird
dwhswenson Aug 3, 2016
7d1fab1
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Aug 7, 2016
670ffcd
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Sep 1, 2016
9ab6509
Fix external engine test for removed generate_fwd
dwhswenson Sep 1, 2016
95fb9a5
Start to CVFileEngine
dwhswenson Sep 1, 2016
6cc6c07
Draft of CVFileEngine
dwhswenson Sep 2, 2016
c566afa
Further setup of cv_file_engine
dwhswenson Sep 3, 2016
add9d26
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Sep 13, 2016
d730b1b
Finally fixed weirdness in CV engine example
dwhswenson Sep 18, 2016
cd09d7e
Merge remote-tracking branch 'upstream/master' into cv_external_engine
dwhswenson Sep 18, 2016
65fbfcf
Move CV engine examples down a directory
dwhswenson Sep 21, 2016
95746fa
Merge remote-tracking branch 'upstream/master' into cv_external_engine
dwhswenson Sep 21, 2016
b94e247
Merge remote-tracking branch 'upstream/master' into cv_external_engine
dwhswenson Sep 24, 2016
9ec757f
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Sep 30, 2016
a49a885
Seems to fix local tests
dwhswenson Oct 2, 2016
030d89d
Merge remote-tracking branch 'upstream/master' into external_engine
dwhswenson Oct 3, 2016
a571355
Merge branch 'external_engine' into cv_external_engine
dwhswenson Oct 3, 2016
de19c8b
start tests for cv_file_engine
dwhswenson Oct 5, 2016
bc61bd7
Test for write_frame_to_file.
dwhswenson Oct 11, 2016
5d9f418
Merge remote-tracking branch 'upstream/master' into cv_external_engine
dwhswenson Oct 11, 2016
c46eb84
Merge remote-tracking branch 'upstream/master' into cv_external_engine
dwhswenson Nov 2, 2016
ead3bb2
Finish tests of cv_file_engine
dwhswenson Nov 5, 2016
452adcf
Merge remote-tracking branch 'upstream/master' into cv_external_engine
dwhswenson Nov 6, 2016
3cdb299
Add cv_file/__init__.py
dwhswenson Nov 6, 2016
61ca06e
Merge remote-tracking branch 'upstream/master' into cv_external_engine
dwhswenson Dec 2, 2016
4a941cf
Merge remote-tracking branch 'upstream/master' into cv_external_engine
dwhswenson Jan 17, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into external_engine
  • Loading branch information
dwhswenson committed Mar 31, 2015
commit 4efb9ba979c0ae6d7f2db7d2cb203ac5a3c5051e

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.