deleted weird remnants of merge but still broken

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 0afeefecc75bb85893e0dbee8f3ca367dd9178cb..227a75c6e2eea61bff55ce771048f492b93eeab9 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -26,6 +26,16 @@
 LXPattern[] patterns(LX lx) {
   return new LXPattern[] {        
 
+
+    new SineSphere(glucose),
+    //new CubeCurl(glucose), 
+     // DanH
+    new Noise(glucose),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
+
+
     new SineSphere(lx),
     //new CubeCurl(lx), 
      
@@ -35,6 +45,32 @@ LXPattern[] patterns(LX lx) {
     new MidiMusic(lx),
     new Pulley(lx),
     
+
+    new ViolinWave(glucose),
+    new BouncyBalls(glucose),
+    new SpaceTime(glucose),
+    new ShiftingPlane(glucose),
+    new AskewPlanes(glucose),
+    new Blinders(glucose),
+    new CrossSections(glucose),
+    new Psychedelia(glucose),
+     new TimRaindrops(glucose),
+    new TimCubes(glucose),
+    new MultipleCubes(glucose),
+    
+    new Traktor(glucose).setEligible(false),
+    new BassPod(glucose).setEligible(false),
+    new CubeEQ(glucose).setEligible(false),
+    new PianoKeyPattern(glucose).setEligible(false),
+    
+     new StripBounce(glucose),
+
+       // AntonK
+       //new AKPong(glucose),
+    new Swim(glucose),
+    new Balance(glucose),
+    
+
     new ViolinWave(lx),
     new BouncyBalls(lx),
     new SpaceTime(lx),
@@ -60,11 +96,22 @@ LXPattern[] patterns(LX lx) {
     new Pong (lx),
     new Worms(lx),
 
+    
+    
     // JR
     new Gimbal(lx),
     
     // Alex G
      
+
+     // Tim
+    new TimMetronome(glucose),
+    new TimPlanes(glucose),
+    new TimPinwheels(glucose),
+    
+    // new TimTrace(glucose),
+    new TimSpheres(glucose),
+
     // Tim
     new TimMetronome(lx),
     new TimPlanes(lx),
@@ -88,6 +135,16 @@ LXPattern[] patterns(LX lx) {
     new VSTowers(lx),
     
     // Toby
+
+    new GlitchPlasma(glucose),
+    new FireEffect(glucose).setEligible(false),
+   
+    new SoundRain(glucose).setEligible(false),
+    new SoundSpikes(glucose).setEligible(false),
+    new FaceSync(glucose),
+
+    // Jack
+
     new GlitchPlasma(lx),
     new FireEffect(lx).setEligible(false),
     new StripBounce(lx),
@@ -97,9 +154,7 @@ LXPattern[] patterns(LX lx) {
 
     // Jack
     new Swim(lx),
-    new Balance(lx),
-    
-    // Ben
+    new Balance(lx),    // Ben
     // new Sandbox(lx),
     new TowerParams(lx),
     new DriveableCrossSections(lx),