From: Ben Morrow <childoftv@gmail.com>
Date: Sun, 24 Nov 2013 02:03:40 +0000 (-0800)
Subject: Merge branch 'master' of github.com:sugarcubes/SugarCubes
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=cc99cc31a31086ea874ab48c73cd6929200370ba;hp=-c;p=SugarCubes.git

Merge branch 'master' of github.com:sugarcubes/SugarCubes
---

cc99cc31a31086ea874ab48c73cd6929200370ba
diff --combined SugarCubes.pde
index 7bb9e11,5fb5850..389700d
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -25,8 -25,8 +25,8 @@@
  
  LXPattern[] patterns(GLucose glucose) {
    return new LXPattern[] {
-      
-      new SineSphere(glucose),
+     
+     new SineSphere(glucose),
       //new CubeCurl(glucose), 
       
      // Slee
@@@ -43,8 -43,6 +43,8 @@@
      new Blinders(glucose),
      new CrossSections(glucose),
      new Psychedelia(glucose),
 +
 +    new MultipleCubes(glucose),
      
      new Traktor(glucose).setEligible(false),
      new BassPod(glucose).setEligible(false),
@@@ -60,12 -58,15 +60,15 @@@
      // Alex G
       
       // Tim
+     new TimMetronome(glucose),
      new TimPlanes(glucose),
      new TimPinwheels(glucose),
      new TimRaindrops(glucose),
      new TimCubes(glucose),
      // new TimTrace(glucose),
      new TimSpheres(glucose),
+     
+     
  
      // Jackie
      new JackieSquares(glucose),
@@@ -73,6 -74,9 +76,9 @@@
      new JackieDots(glucose),
  
  
+ 
+     // Vincent
+     new VSTowers(glucose),
      
      // Toby
      new GlitchPlasma(glucose),