[cocos2d/cocos2d-swift] 7aa516: Add internet permission to cocos2d-tests-android's...

[GitHub]

Branch: refs/heads/develop
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 7aa516e9c5c36cfc05114b7562b73b37e56b1d17
https://github.com/cocos2d/cocos2d-swift/commit/7aa516e9c5c36cfc05114b7562b73b37e56b1d17
Author: Breckin Loggins <blog...@apportable.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths:
M cocos2d-tests-android/Headless/src/main/AndroidManifest.xml

Log Message:
-----------
Add internet permission to cocos2d-tests-android's Android manifest to allow remote debugging on all devices


Commit: 3fe1f5fdab9579f06afca73aeb06aa801127c712
https://github.com/cocos2d/cocos2d-swift/commit/3fe1f5fdab9579f06afca73aeb06aa801127c712
Author: Breckin Loggins <blog...@apportable.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj

Log Message:
-----------
Correct file type entry for cocos2dJava.jar


Commit: 4db7ab8dd5a589c56cb8becaf6855fa67bf4ca70
https://github.com/cocos2d/cocos2d-swift/commit/4db7ab8dd5a589c56cb8becaf6855fa67bf4ca70
Author: Breckin Loggins <blog...@apportable.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj

Log Message:
-----------
Don't emit dSYM files for java targets (allows building cocos2d-tests-android in RELEASE configuration)


Commit: cdff33fca0377b06d9fb5af051a9df9689e80c58
https://github.com/cocos2d/cocos2d-swift/commit/cdff33fca0377b06d9fb5af051a9df9689e80c58
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)

Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless/src/main/AndroidManifest.xml

Log Message:
-----------
Merge pull request #990 from breckinloggins/develop

Fixes for building and debugging android test project


Compare: https://github.com/cocos2d/cocos2d-swift/compare/cc2300b29a67...cdff33fca037

[GitHub]

Branch: refs/heads/metal-hacking

Commit: 5553f069d8541911b68eb0fa188fd87c902e585e
https://github.com/cocos2d/cocos2d-swift/commit/5553f069d8541911b68eb0fa188fd87c902e585e
Author: Thayer J Andrews <tha...@apportable.com>

Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths:

M cocos2d/CCEffectContrast.m

Log Message:
-----------
CCEffectContrast - Fix for negative contrast values

Multiply the constant offset value, 0.5, by the input alpha value to make sure it is
also in premultiplied alpha space as the RGB values are. Without this correction,
input RGB values of (0,0,0) can become non-(0,0,0) when the contrast adjustment
is less than 1.0.


Commit: cc2300b29a671cad4a2fd2d8c1a50b2107c00504
https://github.com/cocos2d/cocos2d-swift/commit/cc2300b29a671cad4a2fd2d8c1a50b2107c00504
Author: Scott Lembcke <slem...@gmail.com>

Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths:

M cocos2d/CCEffectContrast.m

Log Message:
-----------
Merge pull request #991 from thayerandrews/develop

CCEffectContrast - Fix for negative contrast values

Commit: cdff33fca0377b06d9fb5af051a9df9689e80c58
https://github.com/cocos2d/cocos2d-swift/commit/cdff33fca0377b06d9fb5af051a9df9689e80c58
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)

Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless/src/main/AndroidManifest.xml

Log Message:
-----------
Merge pull request #990 from breckinloggins/develop

Fixes for building and debugging android test project

Commit: 29938b4cdb9a841b3b9ed2654cfce6f6f1a9e54e
https://github.com/cocos2d/cocos2d-swift/commit/29938b4cdb9a841b3b9ed2654cfce6f6f1a9e54e
Author: slembcke <slem...@gmail.com>

Date: 2014-09-24 (Wed, 24 Sep 2014)

Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless/src/main/AndroidManifest.xml

M cocos2d/CCEffectContrast.m

Log Message:
-----------
Merge branch 'develop' into metal-hacking


Commit: c264735451f1a8ad1de324293954b6db05927327
https://github.com/cocos2d/cocos2d-swift/commit/c264735451f1a8ad1de324293954b6db05927327
Author: slembcke <slem...@gmail.com>

Date: 2014-09-24 (Wed, 24 Sep 2014)

Changed paths:

M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
M cocos2d/CCDirector.m
M cocos2d/CCRenderer.m
M cocos2d/Platforms/Mac/CCGLView.m

Log Message:
-----------
Fixes for headless.


Commit: 153edf29fd38275685cc1b03f134c9d9975d1ac3
https://github.com/cocos2d/cocos2d-swift/commit/153edf29fd38275685cc1b03f134c9d9975d1ac3
Author: slembcke <slem...@gmail.com>

Date: 2014-09-24 (Wed, 24 Sep 2014)

Changed paths:

M CCRendererGLSupport.m

Log Message:
-----------
Removed some duplicated code for render textures in the iOS/Mac code path.


Compare: https://github.com/cocos2d/cocos2d-swift/compare/52aab9ac0747...153edf29fd38