From: Alexander Green Date: Thu, 8 Aug 2013 09:39:02 +0000 (-0700) Subject: Merge branch 'master' of https://github.com/sugarcubes/SugarCubes X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=749eb72c6abd63e1f1d1253646e52b3c08954fd4;p=SugarCubes.git Merge branch 'master' of https://github.com/sugarcubes/SugarCubes --- 749eb72c6abd63e1f1d1253646e52b3c08954fd4 diff --cc SugarCubes.pde index 801e293,c0ab104..060a035 --- a/SugarCubes.pde +++ b/SugarCubes.pde @@@ -34,9 -34,10 +34,11 @@@ LXPattern[] patterns(GLucose glucose) new Psychedelia(glucose), new CubeEQ(glucose), new PianoKeyPattern(glucose), + new WarmPlasma(glucose), + new FireTest(glucose), - // Basic test patterns for reference, not art + // Basic test patterns for reference, not art +// new TestCubePattern(glucose), // new TestHuePattern(glucose), // new TestXPattern(glucose), // new TestYPattern(glucose),