Merge branch 'master' of https://github.com/blackberry/GamePlay into next

Conflicts:
	gameplay/src/ScriptController.h
	gameplay/src/lua/lua_AnimationValue.cpp
	gameplay/src/lua/lua_Global.cpp
	gameplay/src/lua/lua_Joint.cpp
	gameplay/src/lua/lua_Material.cpp
	gameplay/src/lua/lua_Node.cpp

gameplay/src/PlatformAndroid.cpp

@@ -93,7 +93,7 @@ static EGLenum checkErrorEGL(const char* msg)
 static bool initEGL()
 {
     // Hard-coded to 32-bit/OpenGL ES 2.0.
-    const EGLint eglConfigAttrs[] =
+    EGLint eglConfigAttrs[] =
     {
         EGL_RED_SIZE,           8,
         EGL_GREEN_SIZE,         8,
@@ -135,11 +135,22 @@ static bool initEGL()
             goto error;
         }
     
-        if (eglChooseConfig(__eglDisplay, eglConfigAttrs, &__eglConfig, 1, &eglConfigCount) != EGL_TRUE || eglConfigCount == 0)
+        if (eglChooseConfig(__eglDisplay, eglConfigAttrs, &__eglConfig, 1, &eglConfigCount) != EGL_TRUE)
         {
             checkErrorEGL("eglChooseConfig");
             goto error;
         }
+        
+        if (eglConfigCount == 0)
+        {
+            // try 16 bit depth buffer instead
+            eglConfigAttrs[9] = 16;
+            if (eglChooseConfig(__eglDisplay, eglConfigAttrs, &__eglConfig, 1, &eglConfigCount) != EGL_TRUE || eglConfigCount == 0)
+            {
+                checkErrorEGL("eglChooseConfig");
+                goto error;
+            }
+        }
     
         __eglContext = eglCreateContext(__eglDisplay, __eglConfig, EGL_NO_CONTEXT, eglContextAttrs);
         if (__eglContext == EGL_NO_CONTEXT)

gameplay/src/ScriptController.cpp

@@ -1058,4 +1058,4 @@ template<> std::string ScriptController::executeFunction<std::string>(const char
     SCRIPT_EXECUTE_FUNCTION_PARAM_LIST(std::string, luaL_checkstring);
 }
 
-}
+}