[cocos2d/cocos2d-swift] 56908e: Merge remote-tracking branch 'upstream/develop' in...

[GitHub]

Branch: refs/heads/develop
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 56908e71eba4552250a054773041a263e6a78c68
https://github.com/cocos2d/cocos2d-swift/commit/56908e71eba4552250a054773041a263e6a78c68
Author: Oleg Osin <ol...@apportable.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)

Changed paths:
M .gitmodules
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-osx.xcodeproj/project.pbxproj
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Support/CCFileUtils.h
A external/ObjectAL
R external/ObjectAL/Actions/OALAction+Private.h
R external/ObjectAL/Actions/OALAction.h
R external/ObjectAL/Actions/OALAction.m
R external/ObjectAL/Actions/OALActionManager.h
R external/ObjectAL/Actions/OALActionManager.m
R external/ObjectAL/Actions/OALAudioActions.h
R external/ObjectAL/Actions/OALAudioActions.m
R external/ObjectAL/Actions/OALUtilityActions.h
R external/ObjectAL/Actions/OALUtilityActions.m
R external/ObjectAL/AudioTrack/OALAudioTrack.h
R external/ObjectAL/AudioTrack/OALAudioTrack.m
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.h
R external/ObjectAL/AudioTrack/OALAudioTrackNotifications.m
R external/ObjectAL/AudioTrack/OALAudioTracks.h
R external/ObjectAL/AudioTrack/OALAudioTracks.m
R external/ObjectAL/OALSimpleAudio.h
R external/ObjectAL/OALSimpleAudio.m
R external/ObjectAL/ObjectAL.h
R external/ObjectAL/ObjectALConfig.h
R external/ObjectAL/OpenAL/ALBuffer.h
R external/ObjectAL/OpenAL/ALBuffer.m
R external/ObjectAL/OpenAL/ALCaptureDevice.h
R external/ObjectAL/OpenAL/ALCaptureDevice.m
R external/ObjectAL/OpenAL/ALChannelSource.h
R external/ObjectAL/OpenAL/ALChannelSource.m
R external/ObjectAL/OpenAL/ALContext.h
R external/ObjectAL/OpenAL/ALContext.m
R external/ObjectAL/OpenAL/ALDevice.h
R external/ObjectAL/OpenAL/ALDevice.m
R external/ObjectAL/OpenAL/ALListener.h
R external/ObjectAL/OpenAL/ALListener.m
R external/ObjectAL/OpenAL/ALSoundSource.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.h
R external/ObjectAL/OpenAL/ALSoundSourcePool.m
R external/ObjectAL/OpenAL/ALSource.h
R external/ObjectAL/OpenAL/ALSource.m
R external/ObjectAL/OpenAL/ALTypes.h
R external/ObjectAL/OpenAL/ALWrapper.h
R external/ObjectAL/OpenAL/ALWrapper.m
R external/ObjectAL/OpenAL/OpenALManager.h
R external/ObjectAL/OpenAL/OpenALManager.m
R external/ObjectAL/Session/OALAudioSession.h
R external/ObjectAL/Session/OALAudioSession.m
R external/ObjectAL/Session/OALSuspendHandler.h
R external/ObjectAL/Session/OALSuspendHandler.m
R external/ObjectAL/Support/ALWeakArray.h
R external/ObjectAL/Support/ALWeakArray.m
R external/ObjectAL/Support/ALWeakDictionary.h
R external/ObjectAL/Support/ALWeakDictionary.m
R external/ObjectAL/Support/ALWeakElement.h
R external/ObjectAL/Support/ALWeakElement.m
R external/ObjectAL/Support/ARCSafe_MemMgmt.h
R external/ObjectAL/Support/IOSVersion.h
R external/ObjectAL/Support/IOSVersion.m
R external/ObjectAL/Support/OALAudioFile.h
R external/ObjectAL/Support/OALAudioFile.m
R external/ObjectAL/Support/OALNotifications.h
R external/ObjectAL/Support/OALTools.h
R external/ObjectAL/Support/OALTools.m
R external/ObjectAL/Support/ObjectALMacros.h
R external/ObjectAL/Support/SynthesizeSingleton.h
R external/ObjectAL/Support/mach_timing.c
R external/ObjectAL/Support/mach_timing.h
R external/ogg
R external/tremor

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

Conflicts:
.gitmodules


Commit: 072f1b88ee187ef1e5570f3d382a91641bed5b52
https://github.com/cocos2d/cocos2d-swift/commit/072f1b88ee187ef1e5570f3d382a91641bed5b52
Author: Oleg Osin <ol...@apportable.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)

Changed paths:
M .gitmodules
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d/CCEffect.h
M cocos2d/CCEffect.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.m
M cocos2d/CCEffectBrightness.m
A cocos2d/CCEffectColorChannelOffset.h
A cocos2d/CCEffectColorChannelOffset.m
M cocos2d/CCEffectContrast.m
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectHue.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffectSaturation.m
M cocos2d/CCEffectStack.m
M cocos2d/CCEffect_Private.h
M cocos2d/CCLabelBMFont.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.m
M cocos2d/CCRenderTexture.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/cocos2d.h

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

Conflicts:
.gitmodules


Commit: f1b2006136960ae4f9d9b71918a3756f39e8c502
https://github.com/cocos2d/cocos2d-swift/commit/f1b2006136960ae4f9d9b71918a3756f39e8c502
Author: Oleg Osin <ol...@apportable.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)

Changed paths:
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCTMXXMLParser.m
M cocos2d/Platforms/iOS/CCAppDelegate.m

Log Message:
-----------
Make CCXMLParser thread safe (avoid re entry on same thread). github issue: #964
Fix orientation bug for ios8/xcode6 builds (by forcing the orientation of the statusbar, yes this is a weird hack to work around Apple's bug). github issue: #973


Commit: 8bf075e9c2d0d9564e772921bab4a5456222681e
https://github.com/cocos2d/cocos2d-swift/commit/8bf075e9c2d0d9564e772921bab4a5456222681e
Author: Oleg Osin <ol...@apportable.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)

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

Log Message:
-----------
Ensuring that the android test project compiles (just added android target for a new effect).


Commit: 6e1b096728a66c5ed27b7e5f48b620d6f8dd45de
https://github.com/cocos2d/cocos2d-swift/commit/6e1b096728a66c5ed27b7e5f48b620d6f8dd45de
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)

Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCTMXXMLParser.m
M cocos2d/Platforms/iOS/CCAppDelegate.m

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

Bug fixes (#964 #973) - TileMap and Orientation fixes.


Compare: https://github.com/cocos2d/cocos2d-swift/compare/c5a9fd79707a...6e1b096728a6

[GitHub]

Branch: refs/heads/metal-hacking

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

Date: 2014-09-18 (Thu, 18 Sep 2014)

Changed paths:

M cocos2d/CCEffectStack.m

Log Message:
-----------
CCEffectStack - Make stitchEffects a class method

There's no reason for it to be an instance method so in the interest of compartmentalization
I'm changing it.


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

Date: 2014-09-18 (Thu, 18 Sep 2014)

Changed paths:

M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffect.m
M cocos2d/CCEffectStack.m

Log Message:
-----------
CCEffectStack - Fix a bug in stitching of multi-pass effects like bloom and blur

The passes of these effects would be improperly collapsed into a single pass which
cannot be done since they must maintain their multi-pass implementation. Fix this
and add a test that exercises this use case.

Commit: 8bf075e9c2d0d9564e772921bab4a5456222681e
https://github.com/cocos2d/cocos2d-swift/commit/8bf075e9c2d0d9564e772921bab4a5456222681e
Author: Oleg Osin <ol...@apportable.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)

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

Log Message:
-----------
Ensuring that the android test project compiles (just added android target for a new effect).

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

Date: 2014-09-18 (Thu, 18 Sep 2014)

Changed paths:

M cocos2d-ui-tests/tests/CCEffectsTest.m

Log Message:
-----------
CCEffectsTest - More sprites in the performance test plus stacks of stacks

Commit: 6e1b096728a66c5ed27b7e5f48b620d6f8dd45de
https://github.com/cocos2d/cocos2d-swift/commit/6e1b096728a66c5ed27b7e5f48b620d6f8dd45de
Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)

Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCTMXXMLParser.m
M cocos2d/Platforms/iOS/CCAppDelegate.m

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

Bug fixes (#964 #973) - TileMap and Orientation fixes.

Commit: b4fd3f52262f8aa0e824bd325af323efa5550495
https://github.com/cocos2d/cocos2d-swift/commit/b4fd3f52262f8aa0e824bd325af323efa5550495

Author: Scott Lembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)

Changed paths:

M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffect.m
M cocos2d/CCEffectStack.m

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

CCEffects - Stacking bug fixes plus test additions


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

Date: 2014-09-22 (Mon, 22 Sep 2014)

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

M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffect.m
M cocos2d/CCEffectStack.m

M cocos2d/CCTMXXMLParser.m
M cocos2d/Platforms/iOS/CCAppDelegate.m

Log Message:
-----------

Merge branch 'develop' into metal-hacking

Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj


Compare: https://github.com/cocos2d/cocos2d-swift/compare/ad3f5261f285...0125b7f91d28