LXPattern[] patterns(LX lx) {
return new LXPattern[] {
+<<<<<<< HEAD
+ 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),
+>>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3
// Slee
// new Cathedrals(lx),
new Swarm(lx),
new MidiMusic(lx),
new Pulley(lx),
+<<<<<<< HEAD
+ 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),
new Play (lx),
new Pong (lx),
new Worms(lx),
+>>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3
+
+
// JR
new Gimbal(lx),
// Alex G
+<<<<<<< HEAD
+ // Tim
+ new TimMetronome(glucose),
+ new TimPlanes(glucose),
+ new TimPinwheels(glucose),
+
+ // new TimTrace(glucose),
+ new TimSpheres(glucose),
+=======
// Tim
new TimMetronome(lx),
new TimPlanes(lx),
new TimCubes(lx),
// new TimTrace(lx),
new TimSpheres(lx),
+>>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3
// Jackie
new JackieSquares(lx),
new VSTowers(lx),
// Toby
+<<<<<<< HEAD
+ 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),
// Jack
new Swim(lx),
new Balance(lx),
+>>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3
// Ben
// new Sandbox(lx),