Commits

Branch selector

 study1

User selector

All users

All time

Commit History

Commits on Oct 23, 2015

• spring visualization now included

  gminaker

  committed
  025528c

  Copy full SHA for 025528c

• first working version with two-way communication between hapkit

  gminaker

  committed
  be253a1

  Copy full SHA for be253a1

Commits on Oct 17, 2015

• added color to hand image to indicate which is under current control by hapkit

  gminaker

  committed
  9336ac7

  Copy full SHA for 9336ac7

• First working version of being able to select a spring, control by hapkit

  gminaker

  committed
  1254043

  Copy full SHA for 1254043

• resolving lag issue - don't create a new mousejoint repeatedly, just update target.

  gminaker

  committed
  5c2c2e7

  Copy full SHA for 5c2c2e7

• not functional: trying to integrate hapkit and replace the mouse update and mouse joints with data from the hapkit instead.

  gminaker

  committed
  3fd8bd6

  Copy full SHA for 3fd8bd6

• first working version with serial comms. still room for improvement

  gminaker

  committed
  68274b8

  Copy full SHA for 68274b8

Commits on Oct 2, 2015

• Made some small changes to the code.

  richarddavis

  committed
  b11f62f

  Copy full SHA for b11f62f

Commits on Aug 20, 2015

• Renamed some classes to make things more sensible.

  richarddavis

  committed
  dfb9da5

  Copy full SHA for dfb9da5

Commits on Aug 19, 2015

• Creating a branch to play around with box2d. Eventual goal is to create masses that can be dragged onto the springs.

  richarddavis

  committed
  12471f4

  Copy full SHA for 12471f4

Commits on Aug 17, 2015

• Merge branch 'master' of https://github.com/richarddavis/CyberhapSpringSim

  richarddavis

  committed
  a942e0b

  Copy full SHA for a942e0b

• Printing force on active spring.

  richarddavis

  committed
  c068b04

  Copy full SHA for c068b04

• Merge branch 'master' of https://github.com/richarddavis/CyberhapSpringSim

  gminaker

  committed
  2d52c31

  Copy full SHA for 2d52c31

• changes prior to pull

  gminaker

  committed
  efef87e

  Copy full SHA for efef87e

• Changed scale so the forces are within hapkit ranges.

  richarddavis

  committed
  867812e

  Copy full SHA for 867812e

• Added force calculations to the spring class.

  richarddavis

  committed
  4368e39

  Copy full SHA for 4368e39

• Restrained spring motion to a single degree of freedom. Made all springs interactive.

  richarddavis

  committed
  5e08416

  Copy full SHA for 5e08416

Commits on Aug 16, 2015

• Fixed merge conflict.

  richarddavis

  committed
  b914d56

  Copy full SHA for b914d56

• Merge conflicts

  gminaker

  committed
  422205f

  Copy full SHA for 422205f

• Small tweaks to the Hand class.

  richarddavis

  committed
  f59e5cb

  Copy full SHA for f59e5cb

• Merge branch 'master' of https://github.com/richarddavis/CyberhapSpringSim

  gminaker

  committed
  ba8ba6a

  Copy full SHA for ba8ba6a

• commit before pull

  gminaker

  committed
  c8f329e

  Copy full SHA for c8f329e

• Merge branch 'master' of https://github.com/richarddavis/CyberhapSpringSim

  richarddavis

  committed
  a7adc55

  Copy full SHA for a7adc55

• Got mouse interacting with springs.

  richarddavis

  committed
  7d495e8

  Copy full SHA for 7d495e8

• Merge branch 'master' of https://github.com/richarddavis/CyberhapSpringSim

  gminaker

  committed
  289fe53

  Copy full SHA for 289fe53

• Merge branch 'master' of https://github.com/richarddavis/CyberhapSpringSim

  gminaker

  committed
  48011fd

  Copy full SHA for 48011fd

• Mouse joint added to code but not imparting forces correctly.

  richarddavis

  committed
  617cea6

  Copy full SHA for 617cea6

• stashing old work

  gminaker

  committed
  939ce5d

  Copy full SHA for 939ce5d

• Reimplimented the spring using distance joint.

  richarddavis

  committed
  e199e52

  Copy full SHA for e199e52

Commits on Aug 15, 2015

• Small changes to Hand class.

  richarddavis

  committed
  7f0f809

  Copy full SHA for 7f0f809

• Fixed serial port error.

  richarddavis

  committed
  0968329

  Copy full SHA for 0968329

• Merge branch 'master' of https://github.com/richarddavis/CyberhapSpringSim

  gminaker

  committed
  8c19126

  Copy full SHA for 8c19126

• Changes to implement spring functionality

  gminaker

  committed
  a4196e2

  Copy full SHA for a4196e2

• Added positions setters to hand class.

  richarddavis

  committed
  724826b

  Copy full SHA for 724826b

Commits on Aug 14, 2015

• Merged conflicts.

  richarddavis

  committed
  163d0a8

  Copy full SHA for 163d0a8

Pagination

Previous

Next