repositories
/
SugarCubes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3ee7238
383da81
)
Merge pull request #14 from vincentsiao/master
author
Jack Stahl
<jackstah@gmail.com>
Sun, 24 Nov 2013 01:36:03 +0000
(17:36 -0800)
committer
Jack Stahl
<jackstah@gmail.com>
Sun, 24 Nov 2013 01:36:03 +0000
(17:36 -0800)
Asana Thankshackathon / VSTowers
1
2
SugarCubes.pde
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
SugarCubes.pde
index 2024c40248c6f53743110c2f63c81721e3be7356,6651e18affbe50a8b8f5638ce3246c4ee4b66416..88f229a2a4bee26274e86821edcf96aec058a8bc
---
1
/
SugarCubes.pde
---
2
/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@@
-65,12
-65,10
+65,15
@@@
LXPattern[] patterns(GLucose glucose)
// new TimTrace(glucose),
new TimSpheres(glucose),
+ // Jackie
+ new JackieSquares(glucose),
+ new JackieLines(glucose),
+ new JackieDots(glucose),
+
+
+ // Vincent
+ new VSTowers(glucose),
// Toby
new GlitchPlasma(glucose),