Commits

Branch selector

 master

User selector

All users

All time

Commit History

Commits on Apr 3, 2012

• updated readme

  feste

  committed
  7d4cd31

  Copy full SHA for 7d4cd31

• a little formatting

  feste

  committed
  ea5b126

  Copy full SHA for ea5b126

• updated readme

  feste

  committed
  f3a51fa

  Copy full SHA for f3a51fa

• for alexis to pilot

  feste

  committed
  7798eab

  Copy full SHA for 7798eab

Commits on Mar 2, 2012

• final probably

  feste

  committed
  43c90b0

  Copy full SHA for 43c90b0

Commits on Feb 29, 2012

• code works. just need correct velocity and better instructions

  feste

  committed
  45d16b2

  Copy full SHA for 45d16b2

Commits on Feb 9, 2012

• documentation, also changed the output file a little

  feste

  committed
  e8a3405

  Copy full SHA for e8a3405

• some documentation

  feste

  committed
  f8a6b4c

  Copy full SHA for f8a6b4c

• more cleanup

  feste

  committed
  e5a4481

  Copy full SHA for e5a4481

• cleaning up directory

  feste

  committed
  df148f7

  Copy full SHA for df148f7

• experiment skeleton is done. we just need to get the correct velocity and size parameters and add in appropriate questions and instructions.

  feste

  committed
  7c79174

  Copy full SHA for 7c79174

Commits on Feb 3, 2012

• changed output a bit

  feste

  committed
  e7b9772

  Copy full SHA for e7b9772

• a little clearer

  feste

  committed
  79b541d

  Copy full SHA for 79b541d

• superballs can run multiple trials. lol

  feste

  committed
  0953a87

  Copy full SHA for 0953a87

Commits on Jan 27, 2012

• new parameters and conditions

  

  Erin

  committed
  f79c2a1

  Copy full SHA for f79c2a1

Commits on Jan 19, 2012

• added a to-do list in the comments - feel free to add stuff

  

  Erin

  committed
  aff1659

  Copy full SHA for aff1659

• fixed the error brendan found

  

  Erin

  committed
  86fbb1c

  Copy full SHA for 86fbb1c

Commits on Jan 18, 2012

• made the balls stop

  

  Erin

  committed
  aa2e57b

  Copy full SHA for aa2e57b

• colors and conditions

  

  Erin

  committed
  ef1ce0d

  Copy full SHA for ef1ce0d

Commits on Jan 13, 2012

• one ball hits another ball -- yay\!

  

  Erin

  committed
  8f66227

  Copy full SHA for 8f66227

Commits on Dec 26, 2011

• added tutorial stuff

  

  Erin

  committed
  e60a8d3

  Copy full SHA for e60a8d3

Commits on Dec 9, 2011

• danny wrote a reference for us for using git

  

  Erin

  committed
  7e06c68

  Copy full SHA for 7e06c68

Commits on Nov 22, 2011

• Merge branch 'master' of bitbucket.org:feste/phling

  migagnon

  committed
  0af668e

  Copy full SHA for 0af668e

• hahaha

  migagnon

  committed
  8bc7df0

  Copy full SHA for 8bc7df0

• messed up secretfile

  

  Erin Bennett

  committed
  bb4d48b

  Copy full SHA for bb4d48b

• Changed file name

  

  Dustin Chacón

  committed
  607fd24

  Copy full SHA for 607fd24

• Merge branch 'master' of https://bitbucket.org/feste/phling

  

  Dustin Chacón

  committed
  87cadb3

  Copy full SHA for 87cadb3

• Merge branch 'rachel'

  

  Rachel Dudley

  authored and

  Rachel Dudley

  committed
  4bf4c75

  Copy full SHA for 4bf4c75

• testing

  

  alexis wellwood

  committed
  8d52248

  Copy full SHA for 8d52248

• Merge branch 'master' of https://bitbucket.org/feste/phling

  

  Dustin Chacón

  committed
  d33b10f

  Copy full SHA for d33b10f

• red is nice

  

  alexis wellwood

  committed
  73d7816

  Copy full SHA for 73d7816

• Merge branch 'dustin'

  

  Dustin Chacón

  committed
  b3309f3

  Copy full SHA for b3309f3

• Secret file DON'T OPENgit add secretfilejustfordustin.m

  

  Dustin Chacón

  committed
  7d86b12

  Copy full SHA for 7d86b12

• i added a line to this blank program

  

  Rachel Dudley

  authored and

  Rachel Dudley

  committed
  b5db1c1

  Copy full SHA for b5db1c1

• yay a motherfucking pretty picture

  

  alexis wellwood

  committed
  92505f8

  Copy full SHA for 92505f8