Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: richarddavis/CyberhapSpringSim
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: richarddavis/CyberhapSpringSim
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: playground
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 9 commits
  • 36 files changed
  • 2 contributors

Commits on Aug 19, 2015

  1. Creating a branch to play around with box2d. Eventual goal is to crea… 

    …te masses that can be dragged onto the springs.
    @richarddavis
    richarddavis committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    12471f4 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2015

  1. Renamed some classes to make things more sensible.

    @richarddavis
    richarddavis committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    dfb9da5 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2015

  1. Made some small changes to the code.

    @richarddavis
    richarddavis committed Oct 2, 2015
    Configuration menu
    Copy the full SHA
    b11f62f View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2015

  1. Working my way towards the goal. Added a SpringInterface so I can ite… 

    …rate over Springs and SerialSprings.
    @richarddavis
    richarddavis committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    17a59dd View commit details
    Browse the repository at this point in the history

  2. Got a serial spring working by connecting two springs with a revolute… 

    … joint. Mouse controlled.
    @richarddavis
    richarddavis committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    56793ce View commit details
    Browse the repository at this point in the history

  3. The serial spring simulation is more realistic.

    @richarddavis
    richarddavis committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    1e637f6 View commit details
    Browse the repository at this point in the history

  4. Added in parallel spring configuration.

    @richarddavis
    richarddavis committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    47d37aa View commit details
    Browse the repository at this point in the history

  5. Added in combo (serial and parallel) configuration.

    @richarddavis
    richarddavis committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    4873eb2 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2015

  1. forced commit

    @gminaker
    gminaker committed Nov 25, 2015
    Configuration menu
    Copy the full SHA
    8674599 View commit details
    Browse the repository at this point in the history
Loading