Branch: refs/heads/develop
Home:
https://github.com/cocos2d/cocos2d-swift
Commit: e77c7d0e335fa396188cc8aab556127da53cf60e
https://github.com/cocos2d/cocos2d-swift/commit/e77c7d0e335fa396188cc8aab556127da53cf60e
Author: slembcke <
slem...@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M cocos2d-ui-tests/tests/CCRendererTest.m
M cocos2d/CCNoARC.m
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCRendererBasicTypes_Private.h
M cocos2d/CCRenderer_Private.h
Log Message:
-----------
Vertex paging for GL.
Commit: 4bbcd4c12f040c977459c7712af281ef918b551c
https://github.com/cocos2d/cocos2d-swift/commit/4bbcd4c12f040c977459c7712af281ef918b551c
Author: slembcke <
slem...@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M cocos2d/CCNoARC.m
M cocos2d/CCShader.m
Log Message:
-----------
Vertex paging for Metal.
Commit: c2cda65e58edc6a780ecbce3102f82f24a863172
https://github.com/cocos2d/cocos2d-swift/commit/c2cda65e58edc6a780ecbce3102f82f24a863172
Author: slembcke <
slem...@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
Changed paths:
M .gitmodules
A UnitTests/CCEffectTests.m
A UnitTests/CCPackageCocos2dEnablerTests.m
A UnitTests/CCPackageDownloadManagerTests.m
A UnitTests/CCPackageDownloadTests.m
A UnitTests/CCPackageHelperTests.m
A UnitTests/CCPackageInstallerTests.m
A UnitTests/CCPackageManagerTests.m
A UnitTests/CCPackageTests.m
A UnitTests/CCPackageUnzipperTests.m
M UnitTests/CCPhysicsTests.m
M UnitTests/CCTextureTests.m
A UnitTests/CCUnitTestAssertions.h
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
A cocos2d-ui-tests/Resources-shared/Packages/password-iOS-phone.zip
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phone.zip
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd.zip
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd/boredSmiley.png
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd/configCocos2d.plist
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd/fileLookup.plist
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd/resources-phonehd/jollySmiley.png
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd/resources-phonehd/smileys.plist
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd/resources-phonehd/smileys.png
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd/spriteFrameFileList.plist
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-tablet.zip
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-tablethd.zip
M cocos2d-ui-tests/ios/AppDelegate.h
M cocos2d-ui-tests/ios/AppDelegate.m
A cocos2d-ui-tests/tests/CCPackageTest.m
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectUtils.m
A cocos2d/CCPackage.h
A cocos2d/CCPackage.m
A cocos2d/CCPackageCocos2dEnabler.h
A cocos2d/CCPackageCocos2dEnabler.m
A cocos2d/CCPackageConstants.h
A cocos2d/CCPackageConstants.m
A cocos2d/CCPackageDownload.h
A cocos2d/CCPackageDownload.m
A cocos2d/CCPackageDownloadDelegate.h
A cocos2d/CCPackageDownloadManager.h
A cocos2d/CCPackageDownloadManager.m
A cocos2d/CCPackageDownloadManagerDelegate.h
A cocos2d/CCPackageHelper.h
A cocos2d/CCPackageHelper.m
A cocos2d/CCPackageInstaller.h
A cocos2d/CCPackageInstaller.m
A cocos2d/CCPackageManager.h
A cocos2d/CCPackageManager.m
A cocos2d/CCPackageManagerDelegate.h
A cocos2d/CCPackageTypes.h
A cocos2d/CCPackageUnzipper.h
A cocos2d/CCPackageUnzipper.m
A cocos2d/CCPackageUnzipperDelegate.h
A cocos2d/CCPackage_private.h
M cocos2d/CCSpriteFrameCache.h
M cocos2d/CCSpriteFrameCache.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/CCFileUtils.m
A external/SSZipArchive
Log Message:
-----------
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Commit: 1069c35cfa02fd11686d9485583a5a39a0c8fb86
https://github.com/cocos2d/cocos2d-swift/commit/1069c35cfa02fd11686d9485583a5a39a0c8fb86
Author: slembcke <
slem...@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
Changed paths:
M cocos2d/CCSpriteFrameCache.m
Log Message:
-----------
Prevent [CCSpriteFrameCache +purgeSpriteFrameCache] from discarding configuration settings.
Compare:
https://github.com/cocos2d/cocos2d-swift/compare/7908afc52176...1069c35cfa02