From: greena1re Date: Thu, 27 Feb 2014 10:39:34 +0000 (-0800) Subject: deleted weird remnants of merge but still broken X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=4a6fef0116ebcb73dc3b2bffd87225bab8bd693d;p=SugarCubes.git deleted weird remnants of merge but still broken --- diff --git a/SugarCubes.pde b/SugarCubes.pde index 3dc9791..227a75c 100644 --- a/SugarCubes.pde +++ b/SugarCubes.pde @@ -26,7 +26,7 @@ LXPattern[] patterns(LX lx) { return new LXPattern[] { -<<<<<<< HEAD + new SineSphere(glucose), //new CubeCurl(glucose), // DanH @@ -35,18 +35,17 @@ LXPattern[] patterns(LX lx) { 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), @@ -71,7 +70,7 @@ LXPattern[] patterns(LX lx) { new Swim(glucose), new Balance(glucose), -======= + new ViolinWave(lx), new BouncyBalls(lx), new SpaceTime(lx), @@ -96,7 +95,6 @@ LXPattern[] patterns(LX lx) { new Play (lx), new Pong (lx), new Worms(lx), ->>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3 @@ -105,7 +103,7 @@ LXPattern[] patterns(LX lx) { // Alex G -<<<<<<< HEAD + // Tim new TimMetronome(glucose), new TimPlanes(glucose), @@ -113,7 +111,7 @@ LXPattern[] patterns(LX lx) { // new TimTrace(glucose), new TimSpheres(glucose), -======= + // Tim new TimMetronome(lx), new TimPlanes(lx), @@ -122,7 +120,6 @@ LXPattern[] patterns(LX lx) { new TimCubes(lx), // new TimTrace(lx), new TimSpheres(lx), ->>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3 // Jackie new JackieSquares(lx), @@ -138,7 +135,7 @@ LXPattern[] patterns(LX lx) { new VSTowers(lx), // Toby -<<<<<<< HEAD + new GlitchPlasma(glucose), new FireEffect(glucose).setEligible(false), @@ -147,7 +144,7 @@ LXPattern[] patterns(LX lx) { new FaceSync(glucose), // Jack -======= + new GlitchPlasma(lx), new FireEffect(lx).setEligible(false), new StripBounce(lx), @@ -157,10 +154,7 @@ LXPattern[] patterns(LX lx) { // Jack new Swim(lx), - new Balance(lx), ->>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3 - - // Ben + new Balance(lx), // Ben // new Sandbox(lx), new TowerParams(lx), new DriveableCrossSections(lx),