[cocos2d/cocos2d-swift] 50f7d6: Fixed overflow bug in bloom/blur effects - github ...

[GitHub]

Branch: refs/heads/develop
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 50f7d6f3ab8f9acb2e538410abfe8307fb2524db
https://github.com/cocos2d/cocos2d-swift/commit/50f7d6f3ab8f9acb2e538410abfe8307fb2524db
Author: Oleg Osin <ol...@apportable.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.h
M cocos2d/CCEffectBlur.m

Log Message:
-----------
Fixed overflow bug in bloom/blur effects - github issue #985


Commit: 325983bb018b4f51f08fe03a7adb94d765ae29fe
https://github.com/cocos2d/cocos2d-swift/commit/325983bb018b4f51f08fe03a7adb94d765ae29fe
Author: Oleg Osin <ol...@apportable.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths:
M cocos2d/CCEffectContrast.m

Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop


Commit: 9e4dd652479e9ccfc9782da5c8fd7d72cc36ea3c
https://github.com/cocos2d/cocos2d-swift/commit/9e4dd652479e9ccfc9782da5c8fd7d72cc36ea3c
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)

Changed paths:
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.h
M cocos2d/CCEffectBlur.m

Log Message:
-----------
Merge pull request #992 from osinoleg/develop

Fixed overflow bug in bloom/blur effects - github issue #985


Compare: https://github.com/cocos2d/cocos2d-swift/compare/eb8d717608b2...9e4dd652479e