repositories
/
SugarCubes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
df18145
)
changed order, commented out bad anims
author
Alexander Green
<alexandergreen22@gmail.com>
Sat, 16 Nov 2013 00:56:52 +0000
(16:56 -0800)
committer
Alexander Green
<alexandergreen22@gmail.com>
Sat, 16 Nov 2013 00:56:52 +0000
(16:56 -0800)
SugarCubes.pde
patch
|
blob
|
blame
|
history
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index cf54800cf0e44508eead6c77ee7872f287d8872c..a6c4e4105e95a92587c5647262bd24d11dcdc696 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-26,14
+26,13
@@
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
- new SineSphere(glucose),
- new CubeCurl(glucose),
-
+
// Slee
// Slee
- new Cathedrals(glucose),
+ // new Cathedrals(glucose),
+ new Swarm(glucose),
new MidiMusic(glucose),
new Pulley(glucose),
new MidiMusic(glucose),
new Pulley(glucose),
- new Swarm(glucose),
+
new ViolinWave(glucose),
new BouncyBalls(glucose),
new SpaceTime(glucose),
new ViolinWave(glucose),
new BouncyBalls(glucose),
new SpaceTime(glucose),
@@
-55,10
+54,18
@@
LXPattern[] patterns(GLucose glucose) {
new Worms(glucose),
// Alex G
new Worms(glucose),
// Alex G
+ new SineSphere(glucose),
+ //new CubeCurl(glucose),
+ // Tim
+ new TimPlanes(glucose),
+ new TimPinwheels(glucose),
+ new TimRaindrops(glucose),
+ new TimCubes(glucose),
+ // new TimTrace(glucose),
+ new TimSpheres(glucose),
+
- // Shaheen
- new HelixPattern(glucose).setEligible(false),
// Toby
new GlitchPlasma(glucose),
// Toby
new GlitchPlasma(glucose),
@@
-72,20
+79,16
@@
LXPattern[] patterns(GLucose glucose) {
new Swim(glucose),
new Balance(glucose),
new Swim(glucose),
new Balance(glucose),
- // Tim
- new TimPlanes(glucose),
- new TimPinwheels(glucose),
- new TimRaindrops(glucose),
- new TimCubes(glucose),
- // new TimTrace(glucose),
- new TimSpheres(glucose),
-
+
// Ben
// new Sandbox(glucose),
new TowerParams(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
// Ben
// new Sandbox(glucose),
new TowerParams(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
+ // Shaheen
+ //new HelixPattern(glucose).setEligible(false),
+
//JR
new Gimbal(glucose),
//JR
new Gimbal(glucose),