[cocos2d/cocos2d-swift] 5f8102: Create an environment variable for toggling the UI...
4 views
Skip to first unread message
GitHub
Sep 24, 2014, 3:15:18 PM9/24/14
to cocos2d-iph...@googlegroups.com
Branch: refs/heads/develop
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 5f8102514c5033bf9790e4e15b8f809e1d3f59c6
https://github.com/cocos2d/cocos2d-swift/commit/5f8102514c5033bf9790e4e15b8f809e1d3f59c6
Author: slembcke <slem...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ui-tests/ios/AppDelegate.m
Log Message:
-----------
Create an environment variable for toggling the UI-test debug stats.
Commit: 32a4b84d3b5f1ba01f3e3cefb5cb6e1478bb854f
https://github.com/cocos2d/cocos2d-swift/commit/32a4b84d3b5f1ba01f3e3cefb5cb6e1478bb854f
Author: slembcke <slem...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M Chipmunk7-ios.xcodeproj/project.pbxproj
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/xcshareddata/xcschemes/kazmath.xcscheme
M cocos2d-tests-ios.xcodeproj/project.pbxproj
Log Message:
-----------
Updating recommended project settings to get rid of warnings.
Commit: a6f2584c6777cacb5814b7f9fdb75bdd72376e87
https://github.com/cocos2d/cocos2d-swift/commit/a6f2584c6777cacb5814b7f9fdb75bdd72376e87
Author: slembcke <slem...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/Platform/CCPlatformTextField.m
M cocos2d/CCCache.h
M cocos2d/CCConfiguration.m
M cocos2d/CCEffectDropShadow.h
M cocos2d/CCEffectOuterGlow.h
M cocos2d/CCLabelBMFont.m
M cocos2d/CCRenderDispatch.h
M cocos2d/CCResponderManager.h
M cocos2d/CCTouch.h
M cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/iOS/CCES2Renderer.h
M cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Support/NSAttributedString+CCAdditions.m
Log Message:
-----------
Fixing warnings.
Commit: 8933dcc314126938c152dbb2733e2254c51465e4
https://github.com/cocos2d/cocos2d-swift/commit/8933dcc314126938c152dbb2733e2254c51465e4
Author: slembcke <slem...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M UnitTests/CCRendererTests.m
M cocos2d/CCDirector.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCTextureCache.m
Log Message:
-----------
Make a unique render state cache key type to prevent the cache from retaining textures.
Commit: 33b0f6ac411fd8b8030fd0e1307988a266baf6f7
https://github.com/cocos2d/cocos2d-swift/commit/33b0f6ac411fd8b8030fd0e1307988a266baf6f7
Author: slembcke <slem...@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCBReader/CCBReader_Private.h
M cocos2d/CCPhysicsBody.m
Log Message:
-----------
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Commit: 116d4f5b7968e963929c85f437ed05d33b5e192f
https://github.com/cocos2d/cocos2d-swift/commit/116d4f5b7968e963929c85f437ed05d33b5e192f
Author: slembcke <slem...@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/cocos2d.h
Log Message:
-----------
Bumping the develop branch version number.
Commit: 85934a95283d54d3e5a98f78271341a0c8231cde
https://github.com/cocos2d/cocos2d-swift/commit/85934a95283d54d3e5a98f78271341a0c8231cde
Author: slembcke <slem...@gmail.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M cocos2d-ui/CCBReader/CCBReader.m
Log Message:
-----------
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Commit: acf9cd69b0d6305f3721a568a1eb39a6028d1b3b
https://github.com/cocos2d/cocos2d-swift/commit/acf9cd69b0d6305f3721a568a1eb39a6028d1b3b
Author: slembcke <slem...@gmail.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/Platforms/CCGL.h
Log Message:
-----------
Some Metal debugging cleanup. (Stashed from last week? Whoops.)
Commit: 42e23d202354edb6d93cfb97e347d64987df10fe
https://github.com/cocos2d/cocos2d-swift/commit/42e23d202354edb6d93cfb97e347d64987df10fe
Author: slembcke <slem...@gmail.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCNoARC.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/Platforms/iOS/CCMetalSupport.m
Log Message:
-----------
Buffer bindings now own their buffers instead of the renderer.
Commit: 1b9acd446c12c1868ed946d703b65f23466a0b58
https://github.com/cocos2d/cocos2d-swift/commit/1b9acd446c12c1868ed946d703b65f23466a0b58
Author: slembcke <slem...@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
M UnitTests/CCRendererTests.m
M cocos2d/CCDirector.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCShader.h
M cocos2d/CCShader.m
Log Message:
-----------
Packing uniforms into uniform buffers.
Commit: e2fa29342d8b68c982a9e99f69cc566712f9bce8
https://github.com/cocos2d/cocos2d-swift/commit/e2fa29342d8b68c982a9e99f69cc566712f9bce8
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCNoARC.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCMetalSupport_Private.h
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
Custom Metal shader uniforms working. (?)
Commit: 3d194fadec01859ba88dd47a9a2ba8496f0cfaed
https://github.com/cocos2d/cocos2d-swift/commit/3d194fadec01859ba88dd47a9a2ba8496f0cfaed
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d/CCEffectNode.m
M cocos2d/CCRenderTexture.m
Log Message:
-----------
Temporary compile fixes for render textures.
Commit: 67630cb32db24f3bd23840b3809f19567736e896
https://github.com/cocos2d/cocos2d-swift/commit/67630cb32db24f3bd23840b3809f19567736e896
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
A Resources/Images/df_sprite.png
A Resources/Images/output.png
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
R cocos2d-tests-android/Headless/tests/CCEffectPongTest.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.m
A cocos2d/CCEffectDFOutline.h
A cocos2d/CCEffectDFOutline.m
A cocos2d/CCEffectDistanceField.h
A cocos2d/CCEffectDistanceField.m
M cocos2d/CCEffectDropShadow.h
M cocos2d/CCEffectDropShadow.m
A cocos2d/CCEffectDropShadow_dist.h
A cocos2d/CCEffectDropShadow_dist.m
R cocos2d/CCEffectOuterGlow.h
R cocos2d/CCEffectOuterGlow.m
M cocos2d/CCRenderTexture.m
M cocos2d/ccConfig.h
M cocos2d/cocos2d.h
Log Message:
-----------
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d/CCEffectOuterGlow.h
Commit: 43bd3970a76b0c699b5cc8ee92b3b5ecba87cb0f
https://github.com/cocos2d/cocos2d-swift/commit/43bd3970a76b0c699b5cc8ee92b3b5ecba87cb0f
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCEffectNode.m
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
Log Message:
-----------
Making renderers responsible for their own globals. Render textures use pooled renderers.
Commit: fdf102d0699eefc98f5ef3cb98bf37c8ea36433a
https://github.com/cocos2d/cocos2d-swift/commit/fdf102d0699eefc98f5ef3cb98bf37c8ea36433a
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
A cocos2d/NSValue+CCRenderer.h
A cocos2d/NSValue+CCRenderer.m
Log Message:
-----------
Move CCRenderer NSValue additions into it’s own file.
Commit: 6f36e4d961ebd9ae9cc7ad5a6d26728c277a6f1b
https://github.com/cocos2d/cocos2d-swift/commit/6f36e4d961ebd9ae9cc7ad5a6d26728c277a6f1b
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCDirector.m
M cocos2d/CCEffectNode.m
M cocos2d/CCMotionStreak.m
M cocos2d/CCNode.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.m
A cocos2d/CCRenderer_Private.h
R cocos2d/CCRenderer_private.h
M cocos2d/CCShader.m
M cocos2d/CCSprite.m
M cocos2d/CCTextureCache.m
M cocos2d/Platforms/Android/CCDirectorAndroid.m
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/iOS/CCDirectorIOS.m
Log Message:
-----------
CCRenderer_private.h -> CCRenderer_Private.h
Commit: a0852a557cda60773d6a43b39d75b6c314792c9a
https://github.com/cocos2d/cocos2d-swift/commit/a0852a557cda60773d6a43b39d75b6c314792c9a
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
A cocos2d/CCRendererBasicTypes.h
A cocos2d/CCRendererBasicTypes.m
A cocos2d/CCRendererBasicTypes_Private.h
M cocos2d/CCRenderer_Private.h
M cocos2d/NSValue+CCRenderer.m
Log Message:
-----------
Splitting up the CCRenderer code more.
Commit: fd20cd4538d77c777608cd4b5359971dc6443d02
https://github.com/cocos2d/cocos2d-swift/commit/fd20cd4538d77c777608cd4b5359971dc6443d02
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCDirector.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCRendererBasicTypes_Private.h
M cocos2d/CCRenderer_Private.h
M cocos2d/Platforms/iOS/CCGLView.h
Log Message:
-----------
Extracting framebuffer objects into their own class. CCRenderers are bound to a single FBO. Implementation for effects and render textures not finished.
Commit: 4cb674df5772db37b6f784463f8d9b0e9023253a
https://github.com/cocos2d/cocos2d-swift/commit/4cb674df5772db37b6f784463f8d9b0e9023253a
Author: slembcke <slem...@gmail.com>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
Re-bind the color render buffer before presenting.
Commit: 89a99c89581de07d4607ea597dad98a11b8be3b9
https://github.com/cocos2d/cocos2d-swift/commit/89a99c89581de07d4607ea597dad98a11b8be3b9
Author: slembcke <slem...@gmail.com>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCRendererBasicTypes_Private.h
Log Message:
-----------
Make framebuffer objects abstract.
Commit: 009abb408b99d9f65ee2b0944e6d32bcde6de4c3
https://github.com/cocos2d/cocos2d-swift/commit/009abb408b99d9f65ee2b0944e6d32bcde6de4c3
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M .gitmodules
Log Message:
-----------
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Commit: ae37cbc9277511674de5a3821b2ad11c75850e43
https://github.com/cocos2d/cocos2d-swift/commit/ae37cbc9277511674de5a3821b2ad11c75850e43
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCEffectNode.m
M cocos2d/CCRenderTexture.m
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCMetalSupport_Private.h
M cocos2d/Platforms/iOS/CCMetalView.h
M cocos2d/Platforms/iOS/CCMetalView.m
Log Message:
-----------
Render textures working for Metal.
Commit: ea53e27005d211a5a137addd0bc647a010a0ceea
https://github.com/cocos2d/cocos2d-swift/commit/ea53e27005d211a5a137addd0bc647a010a0ceea
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
R cocos2d/Platforms/iOS/CCES2Renderer.h
R cocos2d/Platforms/iOS/CCES2Renderer.m
R cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
M cocos2d/Platforms/iOS/CCMetalView.m
Log Message:
-----------
Merge CCES2Renderer and CCGLView.m on iOS.
Commit: e473df4c5f8d64f77a2ccfaaec19af24ac56b5bd
https://github.com/cocos2d/cocos2d-swift/commit/e473df4c5f8d64f77a2ccfaaec19af24ac56b5bd
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
More CCGLView cleanup.
Commit: 48dee672327b7a2172680b422f237f87c669cd46
https://github.com/cocos2d/cocos2d-swift/commit/48dee672327b7a2172680b422f237f87c669cd46
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes_Private.h
M cocos2d/CCRenderer_Private.h
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCMetalSupport_Private.h
Log Message:
-----------
CCFrameBufferObject bind with clear.
Commit: 6edcca8838e2df651f6d933cb79860a9d0626f7f
https://github.com/cocos2d/cocos2d-swift/commit/6edcca8838e2df651f6d933cb79860a9d0626f7f
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
MSAA fixes.
Commit: d4d57d5277db8c6f1e3e94a6c86e80eb1c89cfc0
https://github.com/cocos2d/cocos2d-swift/commit/d4d57d5277db8c6f1e3e94a6c86e80eb1c89cfc0
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d/CCEffectNode.m
M cocos2d/CCRendererBasicTypes_Private.h
Log Message:
-----------
Update CCEffectNode with the CCRenderTexture changes.
Commit: 5611d0c71974d6122356531132589ea68f64022e
https://github.com/cocos2d/cocos2d-swift/commit/5611d0c71974d6122356531132589ea68f64022e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d/CCRenderer.m
Log Message:
-----------
Reset the clear mask of a renderer after flushing.
Commit: d7dcfa184ddfd81dbb177dc0f3be429f7f79cbad
https://github.com/cocos2d/cocos2d-swift/commit/d7dcfa184ddfd81dbb177dc0f3be429f7f79cbad
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes.h
A cocos2d/CCRendererSharedTypes.h
M cocos2d/CCRenderer_Private.h
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
Moving some metal/objc type definitions to shared header.
Commit: a388c58d8cafc72e1f6836057e39ad75b7fc6c91
https://github.com/cocos2d/cocos2d-swift/commit/a388c58d8cafc72e1f6836057e39ad75b7fc6c91
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCRendererBasicTypes.m
Log Message:
-----------
Uniform buffers were not being reset.
Commit: 2449289ca6c904ca9cd388966024f84f7a04a85e
https://github.com/cocos2d/cocos2d-swift/commit/2449289ca6c904ca9cd388966024f84f7a04a85e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCDirector.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCRendererBasicTypes_Private.h
Log Message:
-----------
Enable depth testing when binding a CCFrameBufferObject.
Commit: 8d6af692ac80d405eddff4db143d053465da1f25
https://github.com/cocos2d/cocos2d-swift/commit/8d6af692ac80d405eddff4db143d053465da1f25
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCRendererTest.m
M cocos2d/CCNoARC.m
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
Fix some issues with setting metal shader state. More shader API for metal.
Commit: 44568f3c429cca158bad8011946016eb0f1e0b9c
https://github.com/cocos2d/cocos2d-swift/commit/44568f3c429cca158bad8011946016eb0f1e0b9c
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCNode.m
M cocos2d/CCRendererBasicTypes.m
Log Message:
-----------
Add more assertions.
Commit: 6ce398b39076ebe36296791287db1a1513d4e0ad
https://github.com/cocos2d/cocos2d-swift/commit/6ce398b39076ebe36296791287db1a1513d4e0ad
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCRenderer.m
Log Message:
-----------
Don’t copy render states if threaded rendering is not enabled.
Commit: 453a9ef7d396d0ca3ee0dddc54d96d6230a765a5
https://github.com/cocos2d/cocos2d-swift/commit/453a9ef7d396d0ca3ee0dddc54d96d6230a765a5
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
A cocos2d-ui-tests/tests/TestShaders.metal
M cocos2d/CCShader.m
Log Message:
-----------
Implemented [CCShader shaderNamed:] for metal.
Commit: 67384fcc6adfdfdc5ca4fedf764d793da4141478
https://github.com/cocos2d/cocos2d-swift/commit/67384fcc6adfdfdc5ca4fedf764d793da4141478
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCTextureCache.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCMetalView.m
Log Message:
-----------
Cleaning up some TODO warnings.
Commit: 3ded0294b3ea0d0d3fee47f1555851ae9b636ec7
https://github.com/cocos2d/cocos2d-swift/commit/3ded0294b3ea0d0d3fee47f1555851ae9b636ec7
Author: slembcke <slem...@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M .gitmodules
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-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/CCConfiguration.h
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
A cocos2d/CCEffectDFInnerGlow.h
A cocos2d/CCEffectDFInnerGlow.m
M cocos2d/CCEffectDFOutline.h
M cocos2d/CCEffectDFOutline.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/Mac/CCGLView.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/cocos2d.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 branch 'develop' into metal-hacking
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-ui/CCBReader/CCBReader.m
cocos2d/CCRenderTexture.m
cocos2d/cocos2d.h
Commit: c04c5925791a2cb5d0a16f4278a2df2869581079
https://github.com/cocos2d/cocos2d-swift/commit/c04c5925791a2cb5d0a16f4278a2df2869581079
Author: slembcke <slem...@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
Don’t check for GL errors when there is no context set.
Commit: 5124beef60d835ddedca1a83723f83f25b29eb3a
https://github.com/cocos2d/cocos2d-swift/commit/5124beef60d835ddedca1a83723f83f25b29eb3a
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d/CCConfiguration.m
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
Log Message:
-----------
Fixed some Mac issues.
Commit: 7ce3e775b6abcacc8670db8262c21ff3c743b76e
https://github.com/cocos2d/cocos2d-swift/commit/7ce3e775b6abcacc8670db8262c21ff3c743b76e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCDrawNode.m
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
CCDrawNode metal support.
Commit: ea3ba67bef49981ae40ef0c2caad193f1a655fcc
https://github.com/cocos2d/cocos2d-swift/commit/ea3ba67bef49981ae40ef0c2caad193f1a655fcc
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.m
M cocos2d/CCShader.m
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
Log Message:
-----------
Fixing some Metal runtime validation errors.
Commit: c9ac7bab39c61b12edc958803fc798ebc2c06432
https://github.com/cocos2d/cocos2d-swift/commit/c9ac7bab39c61b12edc958803fc798ebc2c06432
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
Log Message:
-----------
Fixed projection flipping bug for Metal render textures.
Commit: 5128f96d9abed634ea12a4a3c54ec5eeaa9cf13c
https://github.com/cocos2d/cocos2d-swift/commit/5128f96d9abed634ea12a4a3c54ec5eeaa9cf13c
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCShader.m
Log Message:
-----------
Cleaning up the metal shader header for JIT compiled shaders.
Commit: fa1210d9d24b9b0cb587e92c19a8281af44f6303
https://github.com/cocos2d/cocos2d-swift/commit/fa1210d9d24b9b0cb587e92c19a8281af44f6303
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCConfiguration.m
M cocos2d/Platforms/Mac/CCGLView.m
Log Message:
-----------
Better Mac fix for early graphics API setup.
Commit: dfc15ae3bd014aa351a42988b498c4b9f73e9518
https://github.com/cocos2d/cocos2d-swift/commit/dfc15ae3bd014aa351a42988b498c4b9f73e9518
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/Platforms/iOS/CCMetalSupport.m
Log Message:
-----------
View size fix for CCFrameBufferObject.
Commit: e4563bd4e703f836a6d3e2dd0585c7a1f986a900
https://github.com/cocos2d/cocos2d-swift/commit/e4563bd4e703f836a6d3e2dd0585c7a1f986a900
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCTexturePVR.m
Log Message:
-----------
Threaded rendering/PVR loading fix.
Commit: ad3f5261f28555ac0f38fb1abbeccf86b7809187
https://github.com/cocos2d/cocos2d-swift/commit/ad3f5261f28555ac0f38fb1abbeccf86b7809187
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCClippingNode.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCTexturePVR.m
Log Message:
-----------
Adding assertions for not-yet-implemented functionality for Metal.
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
Commit: c1353a63225a6aa1b942f8b4daf9cea5bc1ae915
https://github.com/cocos2d/cocos2d-swift/commit/c1353a63225a6aa1b942f8b4daf9cea5bc1ae915
Author: slembcke <slem...@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/Platforms/Android/CCGLView.h
M cocos2d/Platforms/Android/CCGLView.m
M cocos2d/Platforms/CCGL.h
Log Message:
-----------
Fix compile issues for Android.
Commit: 3ad9cb030bc8aa8e1890112dc835c83d0da4f34e
https://github.com/cocos2d/cocos2d-swift/commit/3ad9cb030bc8aa8e1890112dc835c83d0da4f34e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.m
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.m
M cocos2d/CCEffectStack.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCShader.m
M cocos2d/CCTMXXMLParser.m
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTexturePVR.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
Merge branch 'metal-hacking' of github.com:cocos2d/cocos2d-iphone into metal-hacking
Commit: 52aab9ac0747e5e2fd3c608fc2a94a74e45b7128
https://github.com/cocos2d/cocos2d-swift/commit/52aab9ac0747e5e2fd3c608fc2a94a74e45b7128
Author: slembcke <slem...@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M cocos2d/CCShader.m
Log Message:
-----------
More consistent naming of Metal global values to their Obj-C API counterparts. (cc_DefaultGlobals -> cc_GlobalUniforms)
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/cdff33fca037...153edf29fd38
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 5f8102514c5033bf9790e4e15b8f809e1d3f59c6
https://github.com/cocos2d/cocos2d-swift/commit/5f8102514c5033bf9790e4e15b8f809e1d3f59c6
Author: slembcke <slem...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M cocos2d-ui-tests/ios/AppDelegate.m
Log Message:
-----------
Create an environment variable for toggling the UI-test debug stats.
Commit: 32a4b84d3b5f1ba01f3e3cefb5cb6e1478bb854f
https://github.com/cocos2d/cocos2d-swift/commit/32a4b84d3b5f1ba01f3e3cefb5cb6e1478bb854f
Author: slembcke <slem...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M Chipmunk7-ios.xcodeproj/project.pbxproj
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/xcshareddata/xcschemes/kazmath.xcscheme
M cocos2d-tests-ios.xcodeproj/project.pbxproj
Log Message:
-----------
Updating recommended project settings to get rid of warnings.
Commit: a6f2584c6777cacb5814b7f9fdb75bdd72376e87
https://github.com/cocos2d/cocos2d-swift/commit/a6f2584c6777cacb5814b7f9fdb75bdd72376e87
Author: slembcke <slem...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/Platform/CCPlatformTextField.m
M cocos2d/CCCache.h
M cocos2d/CCConfiguration.m
M cocos2d/CCEffectDropShadow.h
M cocos2d/CCEffectOuterGlow.h
M cocos2d/CCLabelBMFont.m
M cocos2d/CCRenderDispatch.h
M cocos2d/CCResponderManager.h
M cocos2d/CCTouch.h
M cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/iOS/CCES2Renderer.h
M cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Support/NSAttributedString+CCAdditions.m
Log Message:
-----------
Fixing warnings.
Commit: 8933dcc314126938c152dbb2733e2254c51465e4
https://github.com/cocos2d/cocos2d-swift/commit/8933dcc314126938c152dbb2733e2254c51465e4
Author: slembcke <slem...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M UnitTests/CCRendererTests.m
M cocos2d/CCDirector.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCTextureCache.m
Log Message:
-----------
Make a unique render state cache key type to prevent the cache from retaining textures.
Commit: 33b0f6ac411fd8b8030fd0e1307988a266baf6f7
https://github.com/cocos2d/cocos2d-swift/commit/33b0f6ac411fd8b8030fd0e1307988a266baf6f7
Author: slembcke <slem...@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-ui/CCBReader/CCAnimationManager.m
M cocos2d-ui/CCBReader/CCBReader.h
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCBReader/CCBReader_Private.h
M cocos2d/CCPhysicsBody.m
Log Message:
-----------
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Commit: 116d4f5b7968e963929c85f437ed05d33b5e192f
https://github.com/cocos2d/cocos2d-swift/commit/116d4f5b7968e963929c85f437ed05d33b5e192f
Author: slembcke <slem...@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Changed paths:
M cocos2d/cocos2d.h
Log Message:
-----------
Bumping the develop branch version number.
Commit: 85934a95283d54d3e5a98f78271341a0c8231cde
https://github.com/cocos2d/cocos2d-swift/commit/85934a95283d54d3e5a98f78271341a0c8231cde
Author: slembcke <slem...@gmail.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M cocos2d-ui/CCBReader/CCBReader.m
Log Message:
-----------
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Commit: acf9cd69b0d6305f3721a568a1eb39a6028d1b3b
https://github.com/cocos2d/cocos2d-swift/commit/acf9cd69b0d6305f3721a568a1eb39a6028d1b3b
Author: slembcke <slem...@gmail.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/Platforms/CCGL.h
Log Message:
-----------
Some Metal debugging cleanup. (Stashed from last week? Whoops.)
Commit: 42e23d202354edb6d93cfb97e347d64987df10fe
https://github.com/cocos2d/cocos2d-swift/commit/42e23d202354edb6d93cfb97e347d64987df10fe
Author: slembcke <slem...@gmail.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCNoARC.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/Platforms/iOS/CCMetalSupport.m
Log Message:
-----------
Buffer bindings now own their buffers instead of the renderer.
Commit: 1b9acd446c12c1868ed946d703b65f23466a0b58
https://github.com/cocos2d/cocos2d-swift/commit/1b9acd446c12c1868ed946d703b65f23466a0b58
Author: slembcke <slem...@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
M UnitTests/CCRendererTests.m
M cocos2d/CCDirector.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCShader.h
M cocos2d/CCShader.m
Log Message:
-----------
Packing uniforms into uniform buffers.
Commit: e2fa29342d8b68c982a9e99f69cc566712f9bce8
https://github.com/cocos2d/cocos2d-swift/commit/e2fa29342d8b68c982a9e99f69cc566712f9bce8
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCNoARC.m
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCMetalSupport_Private.h
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
Custom Metal shader uniforms working. (?)
Commit: 3d194fadec01859ba88dd47a9a2ba8496f0cfaed
https://github.com/cocos2d/cocos2d-swift/commit/3d194fadec01859ba88dd47a9a2ba8496f0cfaed
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d/CCEffectNode.m
M cocos2d/CCRenderTexture.m
Log Message:
-----------
Temporary compile fixes for render textures.
Commit: 67630cb32db24f3bd23840b3809f19567736e896
https://github.com/cocos2d/cocos2d-swift/commit/67630cb32db24f3bd23840b3809f19567736e896
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
A Resources/Images/df_sprite.png
A Resources/Images/output.png
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
R cocos2d-tests-android/Headless/tests/CCEffectPongTest.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.m
A cocos2d/CCEffectDFOutline.h
A cocos2d/CCEffectDFOutline.m
A cocos2d/CCEffectDistanceField.h
A cocos2d/CCEffectDistanceField.m
M cocos2d/CCEffectDropShadow.h
M cocos2d/CCEffectDropShadow.m
A cocos2d/CCEffectDropShadow_dist.h
A cocos2d/CCEffectDropShadow_dist.m
R cocos2d/CCEffectOuterGlow.h
R cocos2d/CCEffectOuterGlow.m
M cocos2d/CCRenderTexture.m
M cocos2d/ccConfig.h
M cocos2d/cocos2d.h
Log Message:
-----------
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d/CCEffectOuterGlow.h
Commit: 43bd3970a76b0c699b5cc8ee92b3b5ecba87cb0f
https://github.com/cocos2d/cocos2d-swift/commit/43bd3970a76b0c699b5cc8ee92b3b5ecba87cb0f
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCEffectNode.m
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.m
M cocos2d/CCRenderer_private.h
Log Message:
-----------
Making renderers responsible for their own globals. Render textures use pooled renderers.
Commit: fdf102d0699eefc98f5ef3cb98bf37c8ea36433a
https://github.com/cocos2d/cocos2d-swift/commit/fdf102d0699eefc98f5ef3cb98bf37c8ea36433a
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
A cocos2d/NSValue+CCRenderer.h
A cocos2d/NSValue+CCRenderer.m
Log Message:
-----------
Move CCRenderer NSValue additions into it’s own file.
Commit: 6f36e4d961ebd9ae9cc7ad5a6d26728c277a6f1b
https://github.com/cocos2d/cocos2d-swift/commit/6f36e4d961ebd9ae9cc7ad5a6d26728c277a6f1b
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCDirector.m
M cocos2d/CCEffectNode.m
M cocos2d/CCMotionStreak.m
M cocos2d/CCNode.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.m
A cocos2d/CCRenderer_Private.h
R cocos2d/CCRenderer_private.h
M cocos2d/CCShader.m
M cocos2d/CCSprite.m
M cocos2d/CCTextureCache.m
M cocos2d/Platforms/Android/CCDirectorAndroid.m
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/iOS/CCDirectorIOS.m
Log Message:
-----------
CCRenderer_private.h -> CCRenderer_Private.h
Commit: a0852a557cda60773d6a43b39d75b6c314792c9a
https://github.com/cocos2d/cocos2d-swift/commit/a0852a557cda60773d6a43b39d75b6c314792c9a
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
A cocos2d/CCRendererBasicTypes.h
A cocos2d/CCRendererBasicTypes.m
A cocos2d/CCRendererBasicTypes_Private.h
M cocos2d/CCRenderer_Private.h
M cocos2d/NSValue+CCRenderer.m
Log Message:
-----------
Splitting up the CCRenderer code more.
Commit: fd20cd4538d77c777608cd4b5359971dc6443d02
https://github.com/cocos2d/cocos2d-swift/commit/fd20cd4538d77c777608cd4b5359971dc6443d02
Author: slembcke <slem...@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCDirector.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCRendererBasicTypes_Private.h
M cocos2d/CCRenderer_Private.h
M cocos2d/Platforms/iOS/CCGLView.h
Log Message:
-----------
Extracting framebuffer objects into their own class. CCRenderers are bound to a single FBO. Implementation for effects and render textures not finished.
Commit: 4cb674df5772db37b6f784463f8d9b0e9023253a
https://github.com/cocos2d/cocos2d-swift/commit/4cb674df5772db37b6f784463f8d9b0e9023253a
Author: slembcke <slem...@gmail.com>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
Re-bind the color render buffer before presenting.
Commit: 89a99c89581de07d4607ea597dad98a11b8be3b9
https://github.com/cocos2d/cocos2d-swift/commit/89a99c89581de07d4607ea597dad98a11b8be3b9
Author: slembcke <slem...@gmail.com>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCRendererBasicTypes_Private.h
Log Message:
-----------
Make framebuffer objects abstract.
Commit: 009abb408b99d9f65ee2b0944e6d32bcde6de4c3
https://github.com/cocos2d/cocos2d-swift/commit/009abb408b99d9f65ee2b0944e6d32bcde6de4c3
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M .gitmodules
Log Message:
-----------
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Commit: ae37cbc9277511674de5a3821b2ad11c75850e43
https://github.com/cocos2d/cocos2d-swift/commit/ae37cbc9277511674de5a3821b2ad11c75850e43
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCEffectNode.m
M cocos2d/CCRenderTexture.m
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCMetalSupport_Private.h
M cocos2d/Platforms/iOS/CCMetalView.h
M cocos2d/Platforms/iOS/CCMetalView.m
Log Message:
-----------
Render textures working for Metal.
Commit: ea53e27005d211a5a137addd0bc647a010a0ceea
https://github.com/cocos2d/cocos2d-swift/commit/ea53e27005d211a5a137addd0bc647a010a0ceea
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
R cocos2d/Platforms/iOS/CCES2Renderer.h
R cocos2d/Platforms/iOS/CCES2Renderer.m
R cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
M cocos2d/Platforms/iOS/CCMetalView.m
Log Message:
-----------
Merge CCES2Renderer and CCGLView.m on iOS.
Commit: e473df4c5f8d64f77a2ccfaaec19af24ac56b5bd
https://github.com/cocos2d/cocos2d-swift/commit/e473df4c5f8d64f77a2ccfaaec19af24ac56b5bd
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
More CCGLView cleanup.
Commit: 48dee672327b7a2172680b422f237f87c669cd46
https://github.com/cocos2d/cocos2d-swift/commit/48dee672327b7a2172680b422f237f87c669cd46
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes_Private.h
M cocos2d/CCRenderer_Private.h
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCMetalSupport_Private.h
Log Message:
-----------
CCFrameBufferObject bind with clear.
Commit: 6edcca8838e2df651f6d933cb79860a9d0626f7f
https://github.com/cocos2d/cocos2d-swift/commit/6edcca8838e2df651f6d933cb79860a9d0626f7f
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
MSAA fixes.
Commit: d4d57d5277db8c6f1e3e94a6c86e80eb1c89cfc0
https://github.com/cocos2d/cocos2d-swift/commit/d4d57d5277db8c6f1e3e94a6c86e80eb1c89cfc0
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d/CCEffectNode.m
M cocos2d/CCRendererBasicTypes_Private.h
Log Message:
-----------
Update CCEffectNode with the CCRenderTexture changes.
Commit: 5611d0c71974d6122356531132589ea68f64022e
https://github.com/cocos2d/cocos2d-swift/commit/5611d0c71974d6122356531132589ea68f64022e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M cocos2d/CCRenderer.m
Log Message:
-----------
Reset the clear mask of a renderer after flushing.
Commit: d7dcfa184ddfd81dbb177dc0f3be429f7f79cbad
https://github.com/cocos2d/cocos2d-swift/commit/d7dcfa184ddfd81dbb177dc0f3be429f7f79cbad
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes.h
A cocos2d/CCRendererSharedTypes.h
M cocos2d/CCRenderer_Private.h
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
Moving some metal/objc type definitions to shared header.
Commit: a388c58d8cafc72e1f6836057e39ad75b7fc6c91
https://github.com/cocos2d/cocos2d-swift/commit/a388c58d8cafc72e1f6836057e39ad75b7fc6c91
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCRendererBasicTypes.m
Log Message:
-----------
Uniform buffers were not being reset.
Commit: 2449289ca6c904ca9cd388966024f84f7a04a85e
https://github.com/cocos2d/cocos2d-swift/commit/2449289ca6c904ca9cd388966024f84f7a04a85e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCDirector.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCRendererBasicTypes_Private.h
Log Message:
-----------
Enable depth testing when binding a CCFrameBufferObject.
Commit: 8d6af692ac80d405eddff4db143d053465da1f25
https://github.com/cocos2d/cocos2d-swift/commit/8d6af692ac80d405eddff4db143d053465da1f25
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCRendererTest.m
M cocos2d/CCNoARC.m
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
Fix some issues with setting metal shader state. More shader API for metal.
Commit: 44568f3c429cca158bad8011946016eb0f1e0b9c
https://github.com/cocos2d/cocos2d-swift/commit/44568f3c429cca158bad8011946016eb0f1e0b9c
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCNode.m
M cocos2d/CCRendererBasicTypes.m
Log Message:
-----------
Add more assertions.
Commit: 6ce398b39076ebe36296791287db1a1513d4e0ad
https://github.com/cocos2d/cocos2d-swift/commit/6ce398b39076ebe36296791287db1a1513d4e0ad
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCRenderer.m
Log Message:
-----------
Don’t copy render states if threaded rendering is not enabled.
Commit: 453a9ef7d396d0ca3ee0dddc54d96d6230a765a5
https://github.com/cocos2d/cocos2d-swift/commit/453a9ef7d396d0ca3ee0dddc54d96d6230a765a5
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
A cocos2d-ui-tests/tests/TestShaders.metal
M cocos2d/CCShader.m
Log Message:
-----------
Implemented [CCShader shaderNamed:] for metal.
Commit: 67384fcc6adfdfdc5ca4fedf764d793da4141478
https://github.com/cocos2d/cocos2d-swift/commit/67384fcc6adfdfdc5ca4fedf764d793da4141478
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCTextureCache.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCMetalView.m
Log Message:
-----------
Cleaning up some TODO warnings.
Commit: 3ded0294b3ea0d0d3fee47f1555851ae9b636ec7
https://github.com/cocos2d/cocos2d-swift/commit/3ded0294b3ea0d0d3fee47f1555851ae9b636ec7
Author: slembcke <slem...@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M .gitmodules
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-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/CCConfiguration.h
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
A cocos2d/CCEffectDFInnerGlow.h
A cocos2d/CCEffectDFInnerGlow.m
M cocos2d/CCEffectDFOutline.h
M cocos2d/CCEffectDFOutline.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/Mac/CCGLView.h
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/cocos2d.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 branch 'develop' into metal-hacking
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-ui/CCBReader/CCBReader.m
cocos2d/CCRenderTexture.m
cocos2d/cocos2d.h
Commit: c04c5925791a2cb5d0a16f4278a2df2869581079
https://github.com/cocos2d/cocos2d-swift/commit/c04c5925791a2cb5d0a16f4278a2df2869581079
Author: slembcke <slem...@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M cocos2d/Platforms/iOS/CCGLView.m
Log Message:
-----------
Don’t check for GL errors when there is no context set.
Commit: 5124beef60d835ddedca1a83723f83f25b29eb3a
https://github.com/cocos2d/cocos2d-swift/commit/5124beef60d835ddedca1a83723f83f25b29eb3a
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d/CCConfiguration.m
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
Log Message:
-----------
Fixed some Mac issues.
Commit: 7ce3e775b6abcacc8670db8262c21ff3c743b76e
https://github.com/cocos2d/cocos2d-swift/commit/7ce3e775b6abcacc8670db8262c21ff3c743b76e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCDrawNode.m
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
CCDrawNode metal support.
Commit: ea3ba67bef49981ae40ef0c2caad193f1a655fcc
https://github.com/cocos2d/cocos2d-swift/commit/ea3ba67bef49981ae40ef0c2caad193f1a655fcc
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.m
M cocos2d/CCShader.m
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
Log Message:
-----------
Fixing some Metal runtime validation errors.
Commit: c9ac7bab39c61b12edc958803fc798ebc2c06432
https://github.com/cocos2d/cocos2d-swift/commit/c9ac7bab39c61b12edc958803fc798ebc2c06432
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
Log Message:
-----------
Fixed projection flipping bug for Metal render textures.
Commit: 5128f96d9abed634ea12a4a3c54ec5eeaa9cf13c
https://github.com/cocos2d/cocos2d-swift/commit/5128f96d9abed634ea12a4a3c54ec5eeaa9cf13c
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCShader.m
Log Message:
-----------
Cleaning up the metal shader header for JIT compiled shaders.
Commit: fa1210d9d24b9b0cb587e92c19a8281af44f6303
https://github.com/cocos2d/cocos2d-swift/commit/fa1210d9d24b9b0cb587e92c19a8281af44f6303
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCConfiguration.m
M cocos2d/Platforms/Mac/CCGLView.m
Log Message:
-----------
Better Mac fix for early graphics API setup.
Commit: dfc15ae3bd014aa351a42988b498c4b9f73e9518
https://github.com/cocos2d/cocos2d-swift/commit/dfc15ae3bd014aa351a42988b498c4b9f73e9518
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/Platforms/iOS/CCMetalSupport.m
Log Message:
-----------
View size fix for CCFrameBufferObject.
Commit: e4563bd4e703f836a6d3e2dd0585c7a1f986a900
https://github.com/cocos2d/cocos2d-swift/commit/e4563bd4e703f836a6d3e2dd0585c7a1f986a900
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCTexturePVR.m
Log Message:
-----------
Threaded rendering/PVR loading fix.
Commit: ad3f5261f28555ac0f38fb1abbeccf86b7809187
https://github.com/cocos2d/cocos2d-swift/commit/ad3f5261f28555ac0f38fb1abbeccf86b7809187
Author: slembcke <slem...@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCClippingNode.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCTexturePVR.m
Log Message:
-----------
Adding assertions for not-yet-implemented functionality for Metal.
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
Commit: c1353a63225a6aa1b942f8b4daf9cea5bc1ae915
https://github.com/cocos2d/cocos2d-swift/commit/c1353a63225a6aa1b942f8b4daf9cea5bc1ae915
Author: slembcke <slem...@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/Platforms/Android/CCGLView.h
M cocos2d/Platforms/Android/CCGLView.m
M cocos2d/Platforms/CCGL.h
Log Message:
-----------
Fix compile issues for Android.
Commit: 3ad9cb030bc8aa8e1890112dc835c83d0da4f34e
https://github.com/cocos2d/cocos2d-swift/commit/3ad9cb030bc8aa8e1890112dc835c83d0da4f34e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.m
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.m
M cocos2d/CCEffectStack.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCShader.m
M cocos2d/CCTMXXMLParser.m
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTexturePVR.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCShaders.metal
Log Message:
-----------
Merge branch 'metal-hacking' of github.com:cocos2d/cocos2d-iphone into metal-hacking
Commit: 52aab9ac0747e5e2fd3c608fc2a94a74e45b7128
https://github.com/cocos2d/cocos2d-swift/commit/52aab9ac0747e5e2fd3c608fc2a94a74e45b7128
Author: slembcke <slem...@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M cocos2d/CCShader.m
Log Message:
-----------
More consistent naming of Metal global values to their Obj-C API counterparts. (cc_DefaultGlobals -> cc_GlobalUniforms)
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/cdff33fca037...153edf29fd38
Reply all
Reply to author
Forward
0 new messages