Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
ofGLProgrammableRenderer: fix for crash in desktop GL introduced by optimizations some commits ago
bugfix for project generator adding xib files to iOS projects. files now behave in xcode as exptected. closes #1099
Merge branch 'develop' of github.com:openframeworks/openFrameworks into bugfix-ios-xib
Merge pull request #2181 from openframeworks/bugfix-ios-xib

Bugfix ios xib closes #1099
feature xcode adds warning if return type does not match ( ie if return is forgoton ), closes #843
Merge pull request #2182 from openframeworks/bugfix-xcode-warning-types

feature xcode adds warning if return type does not match ( ie if return is forgoton ), closes #843
fixed window pos not being restored when toggling fullscreen. also fixes the fact that glfwSetWindowPos is inverted for y.
handle audio interruptions in ofxiOSSoundPlayer
properly set the audio category on iOS 5
deprecated warnings for ios and os x projects
change uniform vec4 color -> uniform vec4 drawColor

this changes, within the programmableGL default shaders, the naming for the color uniform and color attributes.

this allows us to use "color" for the shader attribute parameter, and drawColor for the shader uniform parameter.

* "color" is the vertex colour, while
* "drawColor" is set through the  Material colour / the current openFrameworks draw colour value

Also stringifies the OpenGL default shaders for easier legibility.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
fix getModelViewPorjectionMatrix -> getModelViewProjectionMatrix

fixes a typo

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge branch 'develop' of github.com:openframeworks/openFrameworks into bugfix-glfw-fixes
change openFrameworks draw color variable name for programmable GL default shaders to "globalColor"

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge pull request #2188 from tgfrerer/update_programmableGL-shader-attributes

rename programmable GL shader attributes
add missing semicolon ;-)

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
GLFW fixes: setWindowPosition for OS X. Enables 4x sampling as default. Fixes restore window pos afteer fullscreen.
Adds setMultiDisplayFullscreen for fullscreen across multiple windows ( needs win and nix implementation )
Merge branch 'develop' of github.com:openframeworks/openFrameworks into bugfix-glfw-fixes
fix RPi critical compilation issue

this fixes an issue where openFrameworksLib on RPi wouldn't compile due to an #ifdef out-scoping the variable "bpp" in ofGstVideoGrabber:

"variable 'bpp' not declared"

I've pulled out the bpp declaration & initialisation to be outside the #ifdef block, please @arturoc check if that's not completely whacky.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>