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

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

Conflicts:
	SugarCubes.pde
---

129886e5fc5c351eb3ddb534f49b5f5e413bda97
diff --combined SugarCubes.pde
index c1d74a0,389700d..2c9ecab
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -27,7 -27,7 +27,7 @@@ LXPattern[] patterns(GLucose glucose) 
    return new LXPattern[] {
      
      new SineSphere(glucose),
 -     //new CubeCurl(glucose), 
 +    //new CubeCurl(glucose), 
       
      // Slee
      // new Cathedrals(glucose),
@@@ -43,6 -43,8 +43,8 @@@
      new Blinders(glucose),
      new CrossSections(glucose),
      new Psychedelia(glucose),
+ 
+     new MultipleCubes(glucose),
      
      new Traktor(glucose).setEligible(false),
      new BassPod(glucose).setEligible(false),
@@@ -58,14 -60,25 +60,25 @@@
      // 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),
+     new JackieLines(glucose),
+     new JackieDots(glucose),
+ 
  
  
+     // Vincent
+     new VSTowers(glucose),
      
      // Toby
      new GlitchPlasma(glucose),
@@@ -79,8 -92,6 +92,8 @@@
      new Swim(glucose),
      new Balance(glucose),
  
 +    // L8on
 +    new Life(glucose),
      
      // Ben
      // new Sandbox(glucose),