triangles
Merge branch 'master' of https://github.com/HalfdanJ/Obscura-RF2013

# By Johan Bichel Lindegaard (14) and vibber (5)
# Via Johan Bichel Lindegaard (5) and others
* 'master' of https://github.com/HalfdanJ/Obscura-RF2013:
  calibrated ranges for lamps
  Rush lamps calibrated
  BasicParticles version 1.0
  BasicParticles working - needs gui
  rush controllerrrrrrr better time handling (speed)
  New controller and some updates to the lampEffects.
  Version 1.0
  Added alphaMask shaders.
  Added a clear function to fluidScene
  First debug view w syphon
  Updated DMX addressing for rush lamps.
  Updated lamp dmx channels for rush lamps.
  Added  more lamps.
  Updated project files for handling moving heads and effects to run on 10.8. Added missing build phase for CoreVideo.
  curlyFur - compiling but only debug output
  Improved performance for fluidScene. Removed Transformer scene. Changed the way contentScenes clear fbos. I is now the inidividual scenes responsibility to clear or not.
  First version of fluid simulator that has ok performance.
  Removed Glutwindow. Fixed an issue with syphon directory not being setup. Started a scene with some optical flow fluid dynamics.
  Readded quicktrails. Has some small issues.