From: Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
Date: Tue, 20 Aug 2013 19:36:43 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/jackstah/SugarCubes into jackstah-master
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=6f486736347dd4c851672ce6b0ec32f5d0618cdb;hp=-c;p=SugarCubes.git

Merge branch 'master' of https://github.com/jackstah/SugarCubes into jackstah-master

Conflicts:
	SugarCubes.pde
---

6f486736347dd4c851672ce6b0ec32f5d0618cdb
diff --combined SugarCubes.pde
index b232f18,401a2fb..67c230d
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -25,53 -25,54 +25,54 @@@
  
  LXPattern[] patterns(GLucose glucose) {
    return new LXPattern[] {
+ 
      new ShiftingPlane(glucose),
      new AskewPlanes(glucose),
      new Swarm(glucose),
      new SpaceTime(glucose),
 +    new HelixPattern(glucose).setEligible(false),
      new Pong(glucose),
      new Noise(glucose),
      new Blinders(glucose),
      new CrossSections(glucose),
      new Psychedelia(glucose),
 -    new CubeEQ(glucose),
 -    new PianoKeyPattern(glucose),
 +    new CubeEQ(glucose).setEligible(false),
 +    new PianoKeyPattern(glucose).setEligible(false),
      new GlitchPlasma(glucose),
 -    new FireEffect(glucose),
 +    new FireEffect(glucose).setEligible(false),
      new StripBounce(glucose),
 -    new SoundRain(glucose),
 -    new SoundSpikes(glucose),
 +    new SoundRain(glucose).setEligible(false),
 +    new SoundSpikes(glucose).setEligible(false),
      new FaceSync(glucose),
  
      // Jack
      new Swim(glucose),
-     // new Breathe(glucose),
+     new Breathe(glucose),
  
      new TimPlanes(glucose),
      new TimPinwheels(glucose),
      new TimRaindrops(glucose),
      new TimCubes(glucose),
 -    //new TimTrace(glucose),
 +    // new TimTrace(glucose),
      new TimSpheres(glucose),
  
 -    //Ben
 +    // Ben
      new DriveableCrossSections(glucose),
      new GranimTestPattern2(glucose),
 -    
 -    //Sam
 +     
 +    // Sam
      new JazzRainbow(glucose),
 -
 +    
      // Basic test patterns for reference, not art    
      new TestCubePattern(glucose),
      new TestTowerPattern(glucose),
      new TestProjectionPattern(glucose),
 +    new TestStripPattern(glucose),
      // new TestHuePattern(glucose),
      // new TestXPattern(glucose),
      // new TestYPattern(glucose),
      // new TestZPattern(glucose),
  
 -    //slow for now, relegated to the bottom until faster!
 -    new HelixPattern(glucose),
    };
  }