Merge branch 'develop' into metal-hacking

Author: slembcke

cocos2d-ios.xcodeproj/project.pbxproj

@@ -2600,7 +2600,6 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

cocos2d-tests-android/Headless.xcodeproj/project.pbxproj

@@ -1065,7 +1065,6 @@
 		5B89B01819462F5900CD2A5E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				MACOSX_DEPLOYMENT_TARGET = "$(inherited)";
 				OTHER_LDFLAGS = "";

cocos2d-tests-android/Headless/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     package="org.cocos2d.demo" >
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
     <uses-sdk android:targetSdkVersion="14" android:minSdkVersion="9"></uses-sdk>
+    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
     <application
         android:allowBackup="true"
         android:label="Cocos2d"

cocos2d/CCEffectContrast.m

@@ -54,7 +54,8 @@ -(void)buildFragmentFunctions
     CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" initialSnippet:CCEffectDefaultInitialInputSnippet snippet:CCEffectDefaultInputSnippet];
 
     NSString* effectBody = CC_GLSL(
-                                   return vec4(((inputValue.rgb - vec3(0.5)) * vec3(u_contrast) + vec3(0.5)), inputValue.a);
+                                   vec3 offset = vec3(0.5) * inputValue.a;
+                                   return vec4(((inputValue.rgb - offset) * vec3(u_contrast) + offset), inputValue.a);
                                    );
 
     CCEffectFunction* fragmentFunction = [[CCEffectFunction alloc] initWithName:@"contrastEffect" body:effectBody inputs:@[input] returnType:@"vec4"];