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

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 2024c40248c6f53743110c2f63c81721e3be7356..2c9ecab95c290689624babc0a7d224167ed8453d 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,9 +25,9 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-     
-     new SineSphere(glucose),
-     //new CubeCurl(glucose), 
+    
+    new SineSphere(glucose),
+    //new CubeCurl(glucose), 
      
     // Slee
     // new Cathedrals(glucose),
@@ -43,6 +43,8 @@ LXPattern[] patterns(GLucose glucose) {
     new Blinders(glucose),
     new CrossSections(glucose),
     new Psychedelia(glucose),
+
+    new MultipleCubes(glucose),
     
     new Traktor(glucose).setEligible(false),
     new BassPod(glucose).setEligible(false),
@@ -58,12 +60,15 @@ LXPattern[] patterns(GLucose glucose) {
     // 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),
@@ -71,6 +76,9 @@ LXPattern[] patterns(GLucose glucose) {
     new JackieDots(glucose),
 
 
+
+    // Vincent
+    new VSTowers(glucose),
     
     // Toby
     new GlitchPlasma(glucose),
@@ -84,6 +92,8 @@ LXPattern[] patterns(GLucose glucose) {
     new Swim(glucose),
     new Balance(glucose),
 
+    // L8on
+    new Life(glucose),
     
     // Ben
     // new Sandbox(glucose),