Permalink
Commits on Oct 17, 2011
  1. Merge pull request #76 from sameeptandon/master

    Sameep Tandon
    Sameep Tandon committed Oct 17, 2011
    merge
  2. no cv needed right now

    Sameep Tandon
    Sameep Tandon committed Oct 17, 2011
  3. Merge branch 'thread_vision'

    Sameep Tandon
    Sameep Tandon committed Oct 17, 2011
  4. Merge branch 'thread_modeling'

    Sameep Tandon
    Sameep Tandon committed Oct 17, 2011
  5. Merge remote branch 'upstream/thread_mp'

    Sameep Tandon
    Sameep Tandon committed Oct 17, 2011
Commits on Oct 11, 2011
  1. Merge pull request #75 from alexlee-gk/thread_modeling

    alexlee-gk
    alexlee-gk committed Oct 11, 2011
    Thread modeling
  2. forgot to modify ControlToVectorXd so that it does the right thing wi…

    Alex
    Alex committed Oct 11, 2011
    …th rotate instead of rotation
  3. Control no longer have absolute position and rotation because that do…

    Alex
    Alex committed Oct 11, 2011
    …esn't make sense. Also, fixed mayor bug of using control->rotation rather than control->rotate
Commits on Oct 4, 2011
  1. Merge pull request #74 from alexlee-gk/thread_modeling

    alexlee-gk
    alexlee-gk committed Oct 4, 2011
    Thread modeling
Commits on Oct 3, 2011
  1. Added getVertices() to ThreadConstrained

    Alex
    Alex committed Oct 3, 2011
  2. Merge pull request #73 from alexlee-gk/thread_modeling

    alexlee-gk
    alexlee-gk committed Oct 3, 2011
    Thread modeling
  3. fixed merge conflicts

    Alex
    Alex committed Oct 3, 2011
  4. Added option for creating one thread in World, as it used to be. Adde…

    Alex
    Alex committed Oct 3, 2011
    …d collision detection for InfinitePlane, but it doesn't work well, so it's disabled right now.
  5. Changed implementation of State/Trajectory Recorder/Reader so that mo…

    Alex
    Alex committed Oct 3, 2011
    …st of the work is done in the respective classes rather than in testThreadDiscrete_pickUp.cpp. Also, partially cleaned up testThreadDiscrete_pickUp.cpp. Now, the extensions for states/trajectories are the following: (world trajectory, .twd), (control trajectory, .tcl), (world state, .swd).
Commits on Sep 23, 2011
  1. Merge pull request #72 from alexlee-gk/mp

    alexlee-gk
    alexlee-gk committed Sep 23, 2011
    update with new color scheme
  2. update with new color scheme

    Alex
    Alex committed Sep 23, 2011
Commits on Sep 16, 2011
  1. Merge pull request #71 from alexlee-gk/mp

    alexlee-gk
    alexlee-gk committed Sep 16, 2011
    added x10 and x10s directories
  2. added x10 and x10s directories

    Alex
    Alex committed Sep 16, 2011
  3. Merge pull request #70 from alexlee-gk/mp

    alexlee-gk
    alexlee-gk committed Sep 16, 2011
    modified z.py for x10 run
  4. modified z.py for x10 run

    Alex
    Alex committed Sep 16, 2011
  5. Merge pull request #69 from sameeptandon/thread_mp

    Sameep Tandon
    Sameep Tandon committed Sep 16, 2011
    adding z
  6. adding z

    Sameep Tandon
    Sameep Tandon committed Sep 16, 2011
  7. Merge pull request #68 from sameeptandon/thread_mp

    Sameep Tandon
    Sameep Tandon committed Sep 16, 2011
    Thread mp
  8. fixing thresh

    Sameep Tandon
    Sameep Tandon committed Sep 16, 2011
  9. merge

    Sameep Tandon
    Sameep Tandon committed Sep 16, 2011
  10. Merge pull request #67 from alexlee-gk/mp

    alexlee-gk
    alexlee-gk committed Sep 16, 2011
    various changes
  11. various changes

    Alex
    Alex committed Sep 16, 2011
  12. Merge pull request #66 from alexlee-gk/mp

    alexlee-gk
    alexlee-gk committed Sep 16, 2011
    uses new smooth path without jitter for w2s w3s w4s
  13. Merge pull request #65 from alexlee-gk/mp

    alexlee-gk
    alexlee-gk committed Sep 16, 2011
    added trajectory x3 and x3s
  14. added trajectory x3 and x3s

    Alex
    Alex committed Sep 16, 2011
  15. Merge pull request #64 from alexlee-gk/mp

    alexlee-gk
    alexlee-gk committed Sep 16, 2011
    changed back to absolute noise and added toy problem trajectories