From: Toby Segaran <tobys@tobys-macbookpro2.local>
Date: Mon, 12 Aug 2013 00:51:00 +0000 (-0700)
Subject: Merge branch 'master' into tobysegaran
X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=commitdiff_plain;h=54521a391e9fac72b19c35ed1f20e055c79f2bb1

Merge branch 'master' into tobysegaran

Conflicts:
	SugarCubes.pde
---

54521a391e9fac72b19c35ed1f20e055c79f2bb1
diff --cc SugarCubes.pde
index ca6a1c8,a7210f3..bb55e6f
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -34,19 -36,18 +36,19 @@@ LXPattern[] patterns(GLucose glucose) 
      new Psychedelia(glucose),
      new CubeEQ(glucose),
      new PianoKeyPattern(glucose),
 -    new WarmPlasma(glucose),
 -    // new FireTest(glucose),
 -    // new SineSphere(glucose),
 +    new GlitchPlasma(glucose),
 +    new FireEffect(glucose),
 +    new StripBounce(glucose),
 +    new SoundCubes(glucose),
-     //new SineSphere(glucose),
      
      // Basic test patterns for reference, not art    
- //    new TestCubePattern(glucose),
- //    new TestHuePattern(glucose),
- //    new TestXPattern(glucose),
- //    new TestYPattern(glucose),
- //    new TestZPattern(glucose),
- //    new TestProjectionPattern(glucose),
+     new TestCubePattern(glucose),
+     new TestTowerPattern(glucose),
+     new TestProjectionPattern(glucose),
+     // new TestHuePattern(glucose),
+     // new TestXPattern(glucose),
+     // new TestYPattern(glucose),
+     // new TestZPattern(glucose),
  
    };
  }