[cocos2d/cocos2d-swift] 716e06: fullPathForFilename search order changed to go thr...
8 views
Skip to first unread message
GitHub
Sep 30, 2014, 6:47:01 PM9/30/14
to cocos2d-iph...@googlegroups.com
Branch: refs/heads/develop
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 716e06e955311defe4a74f01e53d5e57a8c1febb
https://github.com/cocos2d/cocos2d-swift/commit/716e06e955311defe4a74f01e53d5e57a8c1febb
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d/Support/CCFileUtils.m
Log Message:
-----------
fullPathForFilename search order changed to go through resolutions first and the search paths.
Packages work with additional search paths. Since packages usually contain only one resolution it may occur that an asset that should be replaced with the asset is found first before the asset is searched. That was the case with the previous search order.
Commit: 519b12187e5ff1ab0edab027e96c41b62b96231b
https://github.com/cocos2d/cocos2d-swift/commit/519b12187e5ff1ab0edab027e96c41b62b96231b
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/CCFileUtils.m
Log Message:
-----------
CCFileUtils: Methods added to find paths of a file in all search paths.
Method added to load all filenameLookups in all search paths and merge them.
Commit: 5c3e25912ce281d29c09a36208166df40167a856
https://github.com/cocos2d/cocos2d-swift/commit/5c3e25912ce281d29c09a36208166df40167a856
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d/CCSpriteFrameCache.h
M cocos2d/CCSpriteFrameCache.m
Log Message:
-----------
CCSpriteFrameCache: Method added to load all Sprite sheet lookup files in all search paths and merge them in ivar.
Commit: c1d27e50c4849c6da360cc7b5eb81d7c5e2cf311
https://github.com/cocos2d/cocos2d-swift/commit/c1d27e50c4849c6da360cc7b5eb81d7c5e2cf311
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
A cocos2d/CCPackage+InstallData.h
A cocos2d/CCPackage+InstallData.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/CCPackageInstallData.h
A cocos2d/CCPackageInstallData.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
Log Message:
-----------
Package classes added.
Commit: 6abf9db5d34e9b88c27fadcbc2fca382a619a000
https://github.com/cocos2d/cocos2d-swift/commit/6abf9db5d34e9b88c27fadcbc2fca382a619a000
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M .gitmodules
A external/SSZipArchive
Log Message:
-----------
SSZipArchive added as submodule.
Commit: b33c8c44c3c63db5fb3a81c87e71723fedbbe777
https://github.com/cocos2d/cocos2d-swift/commit/b33c8c44c3c63db5fb3a81c87e71723fedbbe777
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackageUnzipper.h
M cocos2d/CCPackageUnzipper.m
Log Message:
-----------
SSZipArchive included in project.
Code re-enabled to compile.
Commit: 8eeb9978c4f100256f5ced7199fa70d0eb14a3f9
https://github.com/cocos2d/cocos2d-swift/commit/8eeb9978c4f100256f5ced7199fa70d0eb14a3f9
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCPackage+InstallData.h
M cocos2d/CCPackage+InstallData.m
M cocos2d/CCPackage.h
M cocos2d/CCPackageCocos2dEnabler.h
M cocos2d/CCPackageConstants.h
M cocos2d/CCPackageConstants.m
M cocos2d/CCPackageDownload.h
M cocos2d/CCPackageDownload.m
M cocos2d/CCPackageDownloadDelegate.h
M cocos2d/CCPackageDownloadManager.h
M cocos2d/CCPackageDownloadManagerDelegate.h
M cocos2d/CCPackageInstallData.h
M cocos2d/CCPackageInstaller.h
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
M cocos2d/CCPackageUnzipper.h
M cocos2d/CCPackageUnzipperDelegate.h
Log Message:
-----------
Inline documentation added.
Commit: 51b00688e771cce9fe0cd6cf5eeb1043f6b8bf4d
https://github.com/cocos2d/cocos2d-swift/commit/51b00688e771cce9fe0cd6cf5eeb1043f6b8bf4d
Author: Nicky Weber <nicky....@gmail.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
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 feature/Packages
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
external/ObjectAL
Commit: 5def541e501ba4587eba0fc36b0807349f6eb7ac
https://github.com/cocos2d/cocos2d-swift/commit/5def541e501ba4587eba0fc36b0807349f6eb7ac
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCPackageManagerDelegate.h
Log Message:
-----------
Hint added for unzipping delegate callbacks and threads.
Commit: c98311588b34a4826062a06a2ad12b8dc8b3e547
https://github.com/cocos2d/cocos2d-swift/commit/c98311588b34a4826062a06a2ad12b8dc8b3e547
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackage+InstallData.h
M cocos2d/CCPackage+InstallData.m
M cocos2d/CCPackage.h
M cocos2d/CCPackage.m
M cocos2d/CCPackageCocos2dEnabler.h
M cocos2d/CCPackageCocos2dEnabler.m
M cocos2d/CCPackageConstants.h
M cocos2d/CCPackageDownload.h
M cocos2d/CCPackageDownload.m
M cocos2d/CCPackageDownloadDelegate.h
M cocos2d/CCPackageDownloadManager.h
M cocos2d/CCPackageDownloadManager.m
M cocos2d/CCPackageDownloadManagerDelegate.h
M cocos2d/CCPackageInstallData.h
M cocos2d/CCPackageInstallData.m
M cocos2d/CCPackageInstaller.h
M cocos2d/CCPackageInstaller.m
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
M cocos2d/CCPackageUnzipper.h
M cocos2d/CCPackageUnzipper.m
M cocos2d/CCPackageUnzipperDelegate.h
Log Message:
-----------
Warnings removed: No newline at end of files.
Commit: 7e838faa6661d0d892c2c68bf117a8377032135c
https://github.com/cocos2d/cocos2d-swift/commit/7e838faa6661d0d892c2c68bf117a8377032135c
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackageDownload.m
Log Message:
-----------
Partial download resuming more conservative regarding server response.
A server has to explicitly return the Accept-Ranges header with a set value other than none.
Commit: 2983112d8c85409274fcbb95094f6bb3e04dd7b1
https://github.com/cocos2d/cocos2d-swift/commit/2983112d8c85409274fcbb95094f6bb3e04dd7b1
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackage.h
M cocos2d/CCPackage.m
A cocos2d/CCPackageHelper.h
A cocos2d/CCPackageHelper.m
M cocos2d/CCPackageManager.m
Log Message:
-----------
CCPackageHelper added to extract currentOS method from CCPackageManager.
currentOS now a class method.
Commit: c4e9f0e44fb1d7aa672c7f00e847b5d849189fb4
https://github.com/cocos2d/cocos2d-swift/commit/c4e9f0e44fb1d7aa672c7f00e847b5d849189fb4
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackageDownloadManager.m
Log Message:
-----------
CCPackageDownloadManager will allow to resume paused package downloads when enqueue is used.
A failed package download will start over when used with enqueue.
Commit: 0a57376f00e9ead49f1c57cab86b9de333f351dd
https://github.com/cocos2d/cocos2d-swift/commit/0a57376f00e9ead49f1c57cab86b9de333f351dd
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
M cocos2d/CCPackageUnzipper.h
Log Message:
-----------
Compilation error fixed, @class CCPackage added to manager delegate.
Some renaming and comments updated.
Commit: 5bfc94cc258ec16313e08200263c957999a2404e
https://github.com/cocos2d/cocos2d-swift/commit/5bfc94cc258ec16313e08200263c957999a2404e
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
Log Message:
-----------
CCPackageManager's API changed.
An instance of a package can now be added to the manager to actually get managed without starting the whole installation life cycle.
Leading to a new method to start the download of a CCPackage instance which has already been added before.
The unzip delegate methods will return on the main thread now.
Some refactoring to attach installData with a method instead of code duplication.
Commit: dfc06259873a113147754149a455d0d24e17b5ec
https://github.com/cocos2d/cocos2d-swift/commit/dfc06259873a113147754149a455d0d24e17b5ec
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCPackageHelper.m
Log Message:
-----------
CCPackageHelper returning a default value instead of nothing to prevent a crash in the cocos2d-test-ios project.
Hopefully this can be solved to get the platform defines set correctly soon.
Commit: 9dfa2d7c57f0b23a3bfccea8d178f3ef30576a42
https://github.com/cocos2d/cocos2d-swift/commit/9dfa2d7c57f0b23a3bfccea8d178f3ef30576a42
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/ios/AppDelegate.h
M cocos2d-ui-tests/ios/AppDelegate.m
A cocos2d-ui-tests/tests/CCPackageTest.m
Log Message:
-----------
First package test added to cocos2d-tests-ios.
Extracted some cocos2d config code in app delegate and made that public to rerun packages tests.
Commit: 50c0d01e7f772fbb5e40bc61a4ed0c297614d6d4
https://github.com/cocos2d/cocos2d-swift/commit/50c0d01e7f772fbb5e40bc61a4ed0c297614d6d4
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
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-tablet.zip
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-tablethd.zip
M cocos2d-ui-tests/tests/CCPackageTest.m
Log Message:
-----------
Packages loaded from bundle, no need for an internet connection anymore.
Test packages added to bundle.
Commit: cf6d8dde29f36c8242d14e42d8127db8ea857401
https://github.com/cocos2d/cocos2d-swift/commit/cf6d8dde29f36c8242d14e42d8127db8ea857401
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCPackageTest.m
Log Message:
-----------
Warning removed by reordering NSURLProtocolClient method calls.
Commit: f56fa7e92908a8bedcb41ab02a1dfe4a39eb7d64
https://github.com/cocos2d/cocos2d-swift/commit/f56fa7e92908a8bedcb41ab02a1dfe4a39eb7d64
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCPackageCocos2dEnabler.h
M cocos2d/CCPackageCocos2dEnabler.m
Log Message:
-----------
Package enabler won't re-add a package if it is already in the search path.
Commit: 450c9c8c8fc2a91f2443175556f3b8e86cb90e2e
https://github.com/cocos2d/cocos2d-swift/commit/450c9c8c8fc2a91f2443175556f3b8e86cb90e2e
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.m
Log Message:
-----------
Safety net added for loadPackage method: Calling it more than once not end in weird states.
Commit: 3c08964fb139709ebdade2a2adaa7df29791e3d6
https://github.com/cocos2d/cocos2d-swift/commit/3c08964fb139709ebdade2a2adaa7df29791e3d6
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
Log Message:
-----------
Package Manager's queue can't be set to nil anymore.
Commit: 4f1ef608c00fdfa60829c3ecfc024714b3f85c56
https://github.com/cocos2d/cocos2d-swift/commit/4f1ef608c00fdfa60829c3ecfc024714b3f85c56
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
A UnitTests/CCPackage+InstallDataTests.m
A UnitTests/CCPackageCocos2dEnablerTests.m
A UnitTests/CCPackageDownloadManagerTests.m
A UnitTests/CCPackageDownloadTests.m
A UnitTests/CCPackageHelperTests.m
A UnitTests/CCPackageInstallDataTests.m
A UnitTests/CCPackageInstallerTests.m
A UnitTests/CCPackageManagerTests.m
A UnitTests/CCPackageTests.m
A UnitTests/CCPackageUnzipperTests.m
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackage+InstallData.h
M cocos2d/CCPackage+InstallData.m
M cocos2d/CCPackage.m
M cocos2d/CCPackageInstallData.h
M cocos2d/CCPackageInstallData.m
Log Message:
-----------
Unit tests added for CCPackageInstallData and CCPackage+InstallData category.
File skeletons for other package classes added.
Moved two methods from CCPackage+InstallData to CCPackageInstallData.
Commit: 4c6d71b50eab75e6343942b6ae799be1a432857a
https://github.com/cocos2d/cocos2d-swift/commit/4c6d71b50eab75e6343942b6ae799be1a432857a
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M cocos2d/CCPackageConstants.h
M cocos2d/CCPackageConstants.m
M cocos2d/CCPackageInstaller.m
Log Message:
-----------
Refactoring of error constant names to be closer to what they actually mean.
Commit: b3d2939b75d3b2cf7f961cd2954a5346a7acfb92
https://github.com/cocos2d/cocos2d-swift/commit/b3d2939b75d3b2cf7f961cd2954a5346a7acfb92
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M UnitTests/CCPackageInstallerTests.m
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
Log Message:
-----------
CCPackageInstaller unit tests added.
Unzipped package added to shared resources for those tests.
Commit: 6ff912a2f3a4046472c0cba0c493eec75692dfeb
https://github.com/cocos2d/cocos2d-swift/commit/6ff912a2f3a4046472c0cba0c493eec75692dfeb
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
R UnitTests/CCPackageHelperTests.m
M UnitTests/CCPackageInstallDataTests.m
A UnitTests/CCUnitTestAssertions.h
M cocos2d-tests-ios.xcodeproj/project.pbxproj
Log Message:
-----------
CCUnitTestAssertions.h added with a macro to assert string equality in unit tests.
Simplified unit tests of CCPackageInstallData.
Removed non testable CCPackageHelperTests class.
Commit: f0c322083be317f9ecdccbdd75d814089bc320fc
https://github.com/cocos2d/cocos2d-swift/commit/f0c322083be317f9ecdccbdd75d814089bc320fc
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M cocos2d/CCPackage+InstallData.m
M cocos2d/CCPackage.m
M cocos2d/CCPackageManager.m
Log Message:
-----------
Freed CCPackage of CCPackageInstallData code.
Commit: 33c31206d7328c15cc30a6570f62e65051dfe96f
https://github.com/cocos2d/cocos2d-swift/commit/33c31206d7328c15cc30a6570f62e65051dfe96f
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M UnitTests/CCPackageTests.m
M cocos2d/CCPackage.m
Log Message:
-----------
CCPackage unit tests added.
Fix for file urls serialization: Prevent prepending of file:// scheme of installURL for de/serialization cycles.
Commit: 4515dce128d46a6779f5dcfb38d71105a68c9d4b
https://github.com/cocos2d/cocos2d-swift/commit/4515dce128d46a6779f5dcfb38d71105a68c9d4b
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M UnitTests/CCPackageUnzipperTests.m
A cocos2d-ui-tests/Resources-shared/Packages/password-iOS-phone.zip
Log Message:
-----------
CCPackageUnzipper unit tests added.
Password protected archive added for tests. Password is foobar.
Commit: cf29603192c59cb7fe1d42b7983122c1f8f2fdb3
https://github.com/cocos2d/cocos2d-swift/commit/cf29603192c59cb7fe1d42b7983122c1f8f2fdb3
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M cocos2d/CCPackageCocos2dEnabler.h
M cocos2d/CCPackageCocos2dEnabler.m
M cocos2d/CCPackageInstaller.m
M cocos2d/CCPackageManager.m
Log Message:
-----------
Refactoring: CCPackageInstaller won't enable the package anymore, this is done in the CCPackageManager now.
CCPackageCocos2dEnabler will set relevant status instead of CCPackageManager.
Commit: 447ba2d7e63cea3b854ca973ad78729e0592c8fb
https://github.com/cocos2d/cocos2d-swift/commit/447ba2d7e63cea3b854ca973ad78729e0592c8fb
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageCocos2dEnablerTests.m
Log Message:
-----------
CCPackageCocos2dEnabler unit tests added.
Commit: aa34cab30804913463db8937660229a9fafabcfc
https://github.com/cocos2d/cocos2d-swift/commit/aa34cab30804913463db8937660229a9fafabcfc
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageCocos2dEnablerTests.m
M UnitTests/CCTextureTests.m
M cocos2d-ui-tests/ios/AppDelegate.h
M cocos2d-ui-tests/ios/AppDelegate.m
Log Message:
-----------
Fixed tests for CCTexture. Unit tests for CCPackageCocos2dEnabler broke them.
Solution: Setup cocos2d for each CCTexture test as well as CCPackageCocos2dEnabler tests.
Commit: 7a1fa6b3eb2d3ef568ec7350555ad4ce857fb77a
https://github.com/cocos2d/cocos2d-swift/commit/7a1fa6b3eb2d3ef568ec7350555ad4ce857fb77a
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M cocos2d/CCPackageDownload.m
Log Message:
-----------
Bugfix: CCPackageDownlod read wrong fileSize to resume a download.
Commit: 9a2c229906a3987379abedf1c1b0a35121d39da9
https://github.com/cocos2d/cocos2d-swift/commit/9a2c229906a3987379abedf1c1b0a35121d39da9
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd/boredSmiley.png
Log Message:
-----------
CCPackageCocos2dEnabler asset added. Forgot that one in a previous commit.
Commit: 4ff444c88147346209c754bb00395019e6403c14
https://github.com/cocos2d/cocos2d-swift/commit/4ff444c88147346209c754bb00395019e6403c14
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
Log Message:
-----------
CCPackageDownload unit tests for normal request and resuming request(rang request) addded.
Commit: 3b055702948e7522b5103414f8cd77cbb76c78d2
https://github.com/cocos2d/cocos2d-swift/commit/3b055702948e7522b5103414f8cd77cbb76c78d2
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
Log Message:
-----------
CCPackageDownload unit test added for 404 response.
Commit: d94c11670b8080802be3366f0addf3d734b3cf64
https://github.com/cocos2d/cocos2d-swift/commit/d94c11670b8080802be3366f0addf3d734b3cf64
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
M cocos2d/CCPackageDownload.m
Log Message:
-----------
CCPackageDownload unit tests finished.
Commit: 25de38233b8f926dfe8cd7a63218a4c56864ca25
https://github.com/cocos2d/cocos2d-swift/commit/25de38233b8f926dfe8cd7a63218a4c56864ca25
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPhysicsTests.m
Log Message:
-----------
Physics unit tests fixed by re configuring cocos2d in setUp.
Commit: 7a73f79b07b39854a3216843ceda6d05a28af8f6
https://github.com/cocos2d/cocos2d-swift/commit/7a73f79b07b39854a3216843ceda6d05a28af8f6
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
Log Message:
-----------
CCPackageDownloadTests fixed, some nondeterministic errors occured.
Seemed to be a conflict with CCScheduler and the runloop triggering in the unit tests.
Commit: c4bd8f35dd91ae1fdf041bf96ee523bccf963375
https://github.com/cocos2d/cocos2d-swift/commit/c4bd8f35dd91ae1fdf041bf96ee523bccf963375
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-ios.xcodeproj/project.pbxproj
M external/SSZipArchive
Log Message:
-----------
SSZipArchive added as subproject.
Temporarily pointing to https://github.com/NickyWeber/ssziparchive.git as long as the main clone does not contain a static library target.
Commit: 19686f54671b4af32b1b35c92fa6b3e234611410
https://github.com/cocos2d/cocos2d-swift/commit/19686f54671b4af32b1b35c92fa6b3e234611410
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackageUnzipper.h
M external/SSZipArchive
Log Message:
-----------
SSZipArchive pointing to SB repo fork again.
Updated revision of SSZipArchive.
SSZipArchive header search path added.
Commit: 503ccb10da92a396d1686dcedbea94fa2c7c8932
https://github.com/cocos2d/cocos2d-swift/commit/503ccb10da92a396d1686dcedbea94fa2c7c8932
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
M cocos2d/CCPackageDownload.m
Log Message:
-----------
CCPackageDownload will call delegate method if writing file fails.
Commit: 9164f139f6905c81bdb85d2ce30dd70e276a5af5
https://github.com/cocos2d/cocos2d-swift/commit/9164f139f6905c81bdb85d2ce30dd70e276a5af5
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
M cocos2d/CCPackageDownload.m
Log Message:
-----------
CCPackageDownload more tests added.
CCPackageDownload is setting package status for failed downloads instead of download manager.
Commit: f472aeb5620d4b731f1f3bdc58520f71d45cbf40
https://github.com/cocos2d/cocos2d-swift/commit/f472aeb5620d4b731f1f3bdc58520f71d45cbf40
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadManagerTests.m
M UnitTests/CCPackageUnzipperTests.m
M cocos2d/CCPackageDownloadManager.h
M cocos2d/CCPackageDownloadManager.m
Log Message:
-----------
CCPackageDownloadManager tests added.
CCPackageDownloadManager header documentation improved for setDownloadPath.
Bugfix for setting a new download path.
Added allDownloads properties. Mainly for testing purposes, it shouldn't hurt.
NSAssert added in CCPackageDownloadManager to assert installData is attached to CCPackageDownload.
CCPackageDownloadManager no longer sets failed download status of a package: CCPackageDownload is doing this now.
Commit: 3cfc2611975435a4a89bd726a7a1aa0f156a1f38
https://github.com/cocos2d/cocos2d-swift/commit/3cfc2611975435a4a89bd726a7a1aa0f156a1f38
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadManagerTests.m
Log Message:
-----------
CCPackageDownloadManager: more unit tests added.
Some tidying up of tests.
Commit: a962c5832f8a9450919a8149dc9bd25c6d97dad6
https://github.com/cocos2d/cocos2d-swift/commit/a962c5832f8a9450919a8149dc9bd25c6d97dad6
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackage+InstallDataTests.m
M UnitTests/CCPackageCocos2dEnablerTests.m
M UnitTests/CCPackageDownloadManagerTests.m
M UnitTests/CCPackageDownloadTests.m
M UnitTests/CCPackageInstallDataTests.m
M UnitTests/CCPackageInstallerTests.m
M UnitTests/CCPackageTests.m
M UnitTests/CCPackageUnzipperTests.m
Log Message:
-----------
Refactoring: Unit tests tidying up.
Commit: 44600d290d92ff8929826b3242b2d2f3d37b79c8
https://github.com/cocos2d/cocos2d-swift/commit/44600d290d92ff8929826b3242b2d2f3d37b79c8
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
A UnitTests/CCPackageHelperTests.m
M UnitTests/CCPackageManagerTests.m
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackage.h
M cocos2d/CCPackage.m
M cocos2d/CCPackageHelper.h
M cocos2d/CCPackageHelper.m
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
Log Message:
-----------
Support for default resolution added.
Default resolution is determined by CCFileUtil's searchResolutionsOrder array and is mapped to a sprite builder resolution.
CCPackageManager now offers a simple method to download a package only by providing a name.
CCPackage can now be initialized with a name only.
Some tests added for these cases, although CCPackageHelper tests are disabled at the moment due to a bug in CCFileUtils and handling of searchResolutionsOrder.
Commit: 5c4a07f20175c99e47d0919f9d095ee090d450ec
https://github.com/cocos2d/cocos2d-swift/commit/5c4a07f20175c99e47d0919f9d095ee090d450ec
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Packages loading and saving moved to CCAppDelegate.
Commit: f100553da01caaee6cda5167613dd8b5da3cdcc3
https://github.com/cocos2d/cocos2d-swift/commit/f100553da01caaee6cda5167613dd8b5da3cdcc3
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
Log Message:
-----------
Published download manager's resumeDownloads flag in CCPackageManager.
Commit: 257f3af8f81873b477ca3d459a4717739cfad8e3
https://github.com/cocos2d/cocos2d-swift/commit/257f3af8f81873b477ca3d459a4717739cfad8e3
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
Log Message:
-----------
Refactoring: Minor renaming.
Removed double ;.
Some formatting of methods in CCPackageManager's header.
Commit: 159a3b03e6ae9824c8d2b218cd9abcf6188ee1c2
https://github.com/cocos2d/cocos2d-swift/commit/159a3b03e6ae9824c8d2b218cd9abcf6188ee1c2
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackage.h
M cocos2d/CCPackage.m
A cocos2d/CCPackage_private.h
Log Message:
-----------
CCPackage private header added to make properties accessible internally.
Commit: ee0015513cea72f688d04991b8204fd3dc8ed9d1
https://github.com/cocos2d/cocos2d-swift/commit/ee0015513cea72f688d04991b8204fd3dc8ed9d1
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageUnzipperTests.m
M cocos2d/CCPackageUnzipper.m
Log Message:
-----------
CCPackageUnzipper and tests cleansed of installData.
Commit: 87a59eca70cb6ffb07c57c2e1108a5f9e773e482
https://github.com/cocos2d/cocos2d-swift/commit/87a59eca70cb6ffb07c57c2e1108a5f9e773e482
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadManagerTests.m
M cocos2d/CCPackageDownloadManager.m
Log Message:
-----------
CCPackageDownloadManager cleansed of installData.
Commit: 405a8f26fbd026620d0cffdd10cf0618b54eb84e
https://github.com/cocos2d/cocos2d-swift/commit/405a8f26fbd026620d0cffdd10cf0618b54eb84e
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageTests.m
M cocos2d/CCPackage.m
Log Message:
-----------
CCPackage with install data now.
Commit: 66bd1a5214bb2a764b12fbf5aa09a6d391d248e4
https://github.com/cocos2d/cocos2d-swift/commit/66bd1a5214bb2a764b12fbf5aa09a6d391d248e4
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M cocos2d/CCPackageDownload.m
Log Message:
-----------
CCPackageDownload using private CCPackage header.
Commit: ed5b75b7c3babc471c63d282417901a9640ad5e4
https://github.com/cocos2d/cocos2d-swift/commit/ed5b75b7c3babc471c63d282417901a9640ad5e4
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
R UnitTests/CCPackage+InstallDataTests.m
M UnitTests/CCPackageCocos2dEnablerTests.m
R UnitTests/CCPackageInstallDataTests.m
R cocos2d/CCPackage+InstallData.h
R cocos2d/CCPackage+InstallData.m
R cocos2d/CCPackageInstallData.h
R cocos2d/CCPackageInstallData.m
Log Message:
-----------
CCPackageCocos2dEnabler using CCPackage private header.
Commit: 229624f7e23fd9d2499d043382daee981c68a78e
https://github.com/cocos2d/cocos2d-swift/commit/229624f7e23fd9d2499d043382daee981c68a78e
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageInstallerTests.m
M cocos2d/CCPackageInstaller.m
Log Message:
-----------
CCPackageInstaller and tests cleansed of install data.
Commit: b35cccc4f69c02843329472dfb2ee44aaf5c7581
https://github.com/cocos2d/cocos2d-swift/commit/b35cccc4f69c02843329472dfb2ee44aaf5c7581
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.m
Log Message:
-----------
CCPackageManager cleansed of install data.
Commit: 74c072442dd239b6ff3e92f4ff09e37ddec40eb7
https://github.com/cocos2d/cocos2d-swift/commit/74c072442dd239b6ff3e92f4ff09e37ddec40eb7
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageTests.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
Log Message:
-----------
Install data related files removed from project.
Last import removed in CCPackageTests.
Commit: 00884dcddeb679e7fa2be2c005c4d365a8c6a863
https://github.com/cocos2d/cocos2d-swift/commit/00884dcddeb679e7fa2be2c005c4d365a8c6a863
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M Chipmunk7-ios.xcodeproj/project.pbxproj
M UnitTests/CCRendererTests.m
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/xcshareddata/xcschemes/kazmath.xcscheme
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless/src/main/AndroidManifest.xml
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/ios/AppDelegate.m
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui-tests/tests/CCRendererTest.m
A cocos2d-ui-tests/tests/TestShaders.metal
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/Platform/CCPlatformTextField.m
M cocos2d/CCCache.h
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.h
M cocos2d/CCEffect.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.h
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/CCEffectDropShadow.h
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectHue.m
M cocos2d/CCEffectNode.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffectSaturation.m
M cocos2d/CCEffectStack.m
M cocos2d/CCEffectUtils.h
M cocos2d/CCEffectUtils.m
M cocos2d/CCEffect_Private.h
M cocos2d/CCLabelBMFont.m
M cocos2d/CCMotionStreak.m
M cocos2d/CCNoARC.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.m
M cocos2d/CCRenderDispatch.h
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
A cocos2d/CCRendererBasicTypes.h
A cocos2d/CCRendererBasicTypes.m
A cocos2d/CCRendererBasicTypes_Private.h
A cocos2d/CCRendererSharedTypes.h
A cocos2d/CCRenderer_Private.h
R cocos2d/CCRenderer_private.h
M cocos2d/CCResponderManager.h
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/CCSprite.m
M cocos2d/CCTMXXMLParser.m
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTextureCache.m
M cocos2d/CCTexturePVR.m
M cocos2d/CCTouch.h
A cocos2d/NSValue+CCRenderer.h
A cocos2d/NSValue+CCRenderer.m
M cocos2d/Platforms/Android/CCDirectorAndroid.m
M cocos2d/Platforms/Android/CCGLView.h
M cocos2d/Platforms/Android/CCGLView.m
M cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCDirectorIOS.m
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/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCMetalSupport_Private.h
M cocos2d/Platforms/iOS/CCMetalView.h
M cocos2d/Platforms/iOS/CCMetalView.m
M cocos2d/Platforms/iOS/CCShaders.metal
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/NSAttributedString+CCAdditions.m
M cocos2d/cocos2d.h
Log Message:
-----------
Merge branch 'develop' into feature/Packages
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-tests-ios.xcodeproj/project.pbxproj
cocos2d-ui-tests/ios/AppDelegate.m
cocos2d/Platforms/iOS/CCAppDelegate.m
cocos2d/Support/CCFileUtils.h
Commit: e0cefa85d2d6d235b2cf809c1c0e1a61b673c774
https://github.com/cocos2d/cocos2d-swift/commit/e0cefa85d2d6d235b2cf809c1c0e1a61b673c774
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageHelperTests.m
M UnitTests/CCPackageManagerTests.m
M cocos2d/Support/CCFileUtils.h
Log Message:
-----------
Bugfix for CCFileUtils searchResolutionsOrder.
It was internally declared as NSMutableArray but accessible and writable(copy) as NSArray.
This caused all kinds of weird crashes when assigning new values after setup and running the tests.
Reenabled the tests depending on this.
Commit: 2135b8d32a7a46dc8c7faea2b42152155f5475cd
https://github.com/cocos2d/cocos2d-swift/commit/2135b8d32a7a46dc8c7faea2b42152155f5475cd
Author: Daniel DeCovnick <dan...@apportable.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M .gitmodules
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
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 'feature/Packages' into develop
Commit: ce8cbe25264b25c36a58cc1e09cf6d585a27af6f
https://github.com/cocos2d/cocos2d-swift/commit/ce8cbe25264b25c36a58cc1e09cf6d585a27af6f
Author: Daniel DeCovnick <dan...@apportable.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackageConstants.m
M cocos2d/CCPackageUnzipper.m
Log Message:
-----------
Fix package stuff so it'll build on android
Commit: 7908afc521763d71863921a14c98b3c2c030d695
https://github.com/cocos2d/cocos2d-swift/commit/7908afc521763d71863921a14c98b3c2c030d695
Author: Viktor Lidholt <viktor...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M .gitmodules
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
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 pull request #1008 from danhd123/develop
Nicky's Pull Request plus android fixes.
Compare: https://github.com/cocos2d/cocos2d-swift/compare/eb8613644b3f...7908afc52176
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 716e06e955311defe4a74f01e53d5e57a8c1febb
https://github.com/cocos2d/cocos2d-swift/commit/716e06e955311defe4a74f01e53d5e57a8c1febb
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d/Support/CCFileUtils.m
Log Message:
-----------
fullPathForFilename search order changed to go through resolutions first and the search paths.
Packages work with additional search paths. Since packages usually contain only one resolution it may occur that an asset that should be replaced with the asset is found first before the asset is searched. That was the case with the previous search order.
Commit: 519b12187e5ff1ab0edab027e96c41b62b96231b
https://github.com/cocos2d/cocos2d-swift/commit/519b12187e5ff1ab0edab027e96c41b62b96231b
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/CCFileUtils.m
Log Message:
-----------
CCFileUtils: Methods added to find paths of a file in all search paths.
Method added to load all filenameLookups in all search paths and merge them.
Commit: 5c3e25912ce281d29c09a36208166df40167a856
https://github.com/cocos2d/cocos2d-swift/commit/5c3e25912ce281d29c09a36208166df40167a856
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d/CCSpriteFrameCache.h
M cocos2d/CCSpriteFrameCache.m
Log Message:
-----------
CCSpriteFrameCache: Method added to load all Sprite sheet lookup files in all search paths and merge them in ivar.
Commit: c1d27e50c4849c6da360cc7b5eb81d7c5e2cf311
https://github.com/cocos2d/cocos2d-swift/commit/c1d27e50c4849c6da360cc7b5eb81d7c5e2cf311
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
A cocos2d/CCPackage+InstallData.h
A cocos2d/CCPackage+InstallData.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/CCPackageInstallData.h
A cocos2d/CCPackageInstallData.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
Log Message:
-----------
Package classes added.
Commit: 6abf9db5d34e9b88c27fadcbc2fca382a619a000
https://github.com/cocos2d/cocos2d-swift/commit/6abf9db5d34e9b88c27fadcbc2fca382a619a000
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M .gitmodules
A external/SSZipArchive
Log Message:
-----------
SSZipArchive added as submodule.
Commit: b33c8c44c3c63db5fb3a81c87e71723fedbbe777
https://github.com/cocos2d/cocos2d-swift/commit/b33c8c44c3c63db5fb3a81c87e71723fedbbe777
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackageUnzipper.h
M cocos2d/CCPackageUnzipper.m
Log Message:
-----------
SSZipArchive included in project.
Code re-enabled to compile.
Commit: 8eeb9978c4f100256f5ced7199fa70d0eb14a3f9
https://github.com/cocos2d/cocos2d-swift/commit/8eeb9978c4f100256f5ced7199fa70d0eb14a3f9
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCPackage+InstallData.h
M cocos2d/CCPackage+InstallData.m
M cocos2d/CCPackage.h
M cocos2d/CCPackageCocos2dEnabler.h
M cocos2d/CCPackageConstants.h
M cocos2d/CCPackageConstants.m
M cocos2d/CCPackageDownload.h
M cocos2d/CCPackageDownload.m
M cocos2d/CCPackageDownloadDelegate.h
M cocos2d/CCPackageDownloadManager.h
M cocos2d/CCPackageDownloadManagerDelegate.h
M cocos2d/CCPackageInstallData.h
M cocos2d/CCPackageInstaller.h
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
M cocos2d/CCPackageUnzipper.h
M cocos2d/CCPackageUnzipperDelegate.h
Log Message:
-----------
Inline documentation added.
Commit: 51b00688e771cce9fe0cd6cf5eeb1043f6b8bf4d
https://github.com/cocos2d/cocos2d-swift/commit/51b00688e771cce9fe0cd6cf5eeb1043f6b8bf4d
Author: Nicky Weber <nicky....@gmail.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
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 feature/Packages
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
external/ObjectAL
Commit: 5def541e501ba4587eba0fc36b0807349f6eb7ac
https://github.com/cocos2d/cocos2d-swift/commit/5def541e501ba4587eba0fc36b0807349f6eb7ac
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
Changed paths:
M cocos2d/CCPackageManagerDelegate.h
Log Message:
-----------
Hint added for unzipping delegate callbacks and threads.
Commit: c98311588b34a4826062a06a2ad12b8dc8b3e547
https://github.com/cocos2d/cocos2d-swift/commit/c98311588b34a4826062a06a2ad12b8dc8b3e547
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackage+InstallData.h
M cocos2d/CCPackage+InstallData.m
M cocos2d/CCPackage.h
M cocos2d/CCPackage.m
M cocos2d/CCPackageCocos2dEnabler.h
M cocos2d/CCPackageCocos2dEnabler.m
M cocos2d/CCPackageConstants.h
M cocos2d/CCPackageDownload.h
M cocos2d/CCPackageDownload.m
M cocos2d/CCPackageDownloadDelegate.h
M cocos2d/CCPackageDownloadManager.h
M cocos2d/CCPackageDownloadManager.m
M cocos2d/CCPackageDownloadManagerDelegate.h
M cocos2d/CCPackageInstallData.h
M cocos2d/CCPackageInstallData.m
M cocos2d/CCPackageInstaller.h
M cocos2d/CCPackageInstaller.m
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
M cocos2d/CCPackageUnzipper.h
M cocos2d/CCPackageUnzipper.m
M cocos2d/CCPackageUnzipperDelegate.h
Log Message:
-----------
Warnings removed: No newline at end of files.
Commit: 7e838faa6661d0d892c2c68bf117a8377032135c
https://github.com/cocos2d/cocos2d-swift/commit/7e838faa6661d0d892c2c68bf117a8377032135c
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackageDownload.m
Log Message:
-----------
Partial download resuming more conservative regarding server response.
A server has to explicitly return the Accept-Ranges header with a set value other than none.
Commit: 2983112d8c85409274fcbb95094f6bb3e04dd7b1
https://github.com/cocos2d/cocos2d-swift/commit/2983112d8c85409274fcbb95094f6bb3e04dd7b1
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackage.h
M cocos2d/CCPackage.m
A cocos2d/CCPackageHelper.h
A cocos2d/CCPackageHelper.m
M cocos2d/CCPackageManager.m
Log Message:
-----------
CCPackageHelper added to extract currentOS method from CCPackageManager.
currentOS now a class method.
Commit: c4e9f0e44fb1d7aa672c7f00e847b5d849189fb4
https://github.com/cocos2d/cocos2d-swift/commit/c4e9f0e44fb1d7aa672c7f00e847b5d849189fb4
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackageDownloadManager.m
Log Message:
-----------
CCPackageDownloadManager will allow to resume paused package downloads when enqueue is used.
A failed package download will start over when used with enqueue.
Commit: 0a57376f00e9ead49f1c57cab86b9de333f351dd
https://github.com/cocos2d/cocos2d-swift/commit/0a57376f00e9ead49f1c57cab86b9de333f351dd
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
M cocos2d/CCPackageUnzipper.h
Log Message:
-----------
Compilation error fixed, @class CCPackage added to manager delegate.
Some renaming and comments updated.
Commit: 5bfc94cc258ec16313e08200263c957999a2404e
https://github.com/cocos2d/cocos2d-swift/commit/5bfc94cc258ec16313e08200263c957999a2404e
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
Log Message:
-----------
CCPackageManager's API changed.
An instance of a package can now be added to the manager to actually get managed without starting the whole installation life cycle.
Leading to a new method to start the download of a CCPackage instance which has already been added before.
The unzip delegate methods will return on the main thread now.
Some refactoring to attach installData with a method instead of code duplication.
Commit: dfc06259873a113147754149a455d0d24e17b5ec
https://github.com/cocos2d/cocos2d-swift/commit/dfc06259873a113147754149a455d0d24e17b5ec
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d/CCPackageHelper.m
Log Message:
-----------
CCPackageHelper returning a default value instead of nothing to prevent a crash in the cocos2d-test-ios project.
Hopefully this can be solved to get the platform defines set correctly soon.
Commit: 9dfa2d7c57f0b23a3bfccea8d178f3ef30576a42
https://github.com/cocos2d/cocos2d-swift/commit/9dfa2d7c57f0b23a3bfccea8d178f3ef30576a42
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)
Changed paths:
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/ios/AppDelegate.h
M cocos2d-ui-tests/ios/AppDelegate.m
A cocos2d-ui-tests/tests/CCPackageTest.m
Log Message:
-----------
First package test added to cocos2d-tests-ios.
Extracted some cocos2d config code in app delegate and made that public to rerun packages tests.
Commit: 50c0d01e7f772fbb5e40bc61a4ed0c297614d6d4
https://github.com/cocos2d/cocos2d-swift/commit/50c0d01e7f772fbb5e40bc61a4ed0c297614d6d4
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
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-tablet.zip
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-tablethd.zip
M cocos2d-ui-tests/tests/CCPackageTest.m
Log Message:
-----------
Packages loaded from bundle, no need for an internet connection anymore.
Test packages added to bundle.
Commit: cf6d8dde29f36c8242d14e42d8127db8ea857401
https://github.com/cocos2d/cocos2d-swift/commit/cf6d8dde29f36c8242d14e42d8127db8ea857401
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d-ui-tests/tests/CCPackageTest.m
Log Message:
-----------
Warning removed by reordering NSURLProtocolClient method calls.
Commit: f56fa7e92908a8bedcb41ab02a1dfe4a39eb7d64
https://github.com/cocos2d/cocos2d-swift/commit/f56fa7e92908a8bedcb41ab02a1dfe4a39eb7d64
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCPackageCocos2dEnabler.h
M cocos2d/CCPackageCocos2dEnabler.m
Log Message:
-----------
Package enabler won't re-add a package if it is already in the search path.
Commit: 450c9c8c8fc2a91f2443175556f3b8e86cb90e2e
https://github.com/cocos2d/cocos2d-swift/commit/450c9c8c8fc2a91f2443175556f3b8e86cb90e2e
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.m
Log Message:
-----------
Safety net added for loadPackage method: Calling it more than once not end in weird states.
Commit: 3c08964fb139709ebdade2a2adaa7df29791e3d6
https://github.com/cocos2d/cocos2d-swift/commit/3c08964fb139709ebdade2a2adaa7df29791e3d6
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
Log Message:
-----------
Package Manager's queue can't be set to nil anymore.
Commit: 4f1ef608c00fdfa60829c3ecfc024714b3f85c56
https://github.com/cocos2d/cocos2d-swift/commit/4f1ef608c00fdfa60829c3ecfc024714b3f85c56
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
A UnitTests/CCPackage+InstallDataTests.m
A UnitTests/CCPackageCocos2dEnablerTests.m
A UnitTests/CCPackageDownloadManagerTests.m
A UnitTests/CCPackageDownloadTests.m
A UnitTests/CCPackageHelperTests.m
A UnitTests/CCPackageInstallDataTests.m
A UnitTests/CCPackageInstallerTests.m
A UnitTests/CCPackageManagerTests.m
A UnitTests/CCPackageTests.m
A UnitTests/CCPackageUnzipperTests.m
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackage+InstallData.h
M cocos2d/CCPackage+InstallData.m
M cocos2d/CCPackage.m
M cocos2d/CCPackageInstallData.h
M cocos2d/CCPackageInstallData.m
Log Message:
-----------
Unit tests added for CCPackageInstallData and CCPackage+InstallData category.
File skeletons for other package classes added.
Moved two methods from CCPackage+InstallData to CCPackageInstallData.
Commit: 4c6d71b50eab75e6343942b6ae799be1a432857a
https://github.com/cocos2d/cocos2d-swift/commit/4c6d71b50eab75e6343942b6ae799be1a432857a
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M cocos2d/CCPackageConstants.h
M cocos2d/CCPackageConstants.m
M cocos2d/CCPackageInstaller.m
Log Message:
-----------
Refactoring of error constant names to be closer to what they actually mean.
Commit: b3d2939b75d3b2cf7f961cd2954a5346a7acfb92
https://github.com/cocos2d/cocos2d-swift/commit/b3d2939b75d3b2cf7f961cd2954a5346a7acfb92
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M UnitTests/CCPackageInstallerTests.m
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
Log Message:
-----------
CCPackageInstaller unit tests added.
Unzipped package added to shared resources for those tests.
Commit: 6ff912a2f3a4046472c0cba0c493eec75692dfeb
https://github.com/cocos2d/cocos2d-swift/commit/6ff912a2f3a4046472c0cba0c493eec75692dfeb
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
R UnitTests/CCPackageHelperTests.m
M UnitTests/CCPackageInstallDataTests.m
A UnitTests/CCUnitTestAssertions.h
M cocos2d-tests-ios.xcodeproj/project.pbxproj
Log Message:
-----------
CCUnitTestAssertions.h added with a macro to assert string equality in unit tests.
Simplified unit tests of CCPackageInstallData.
Removed non testable CCPackageHelperTests class.
Commit: f0c322083be317f9ecdccbdd75d814089bc320fc
https://github.com/cocos2d/cocos2d-swift/commit/f0c322083be317f9ecdccbdd75d814089bc320fc
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M cocos2d/CCPackage+InstallData.m
M cocos2d/CCPackage.m
M cocos2d/CCPackageManager.m
Log Message:
-----------
Freed CCPackage of CCPackageInstallData code.
Commit: 33c31206d7328c15cc30a6570f62e65051dfe96f
https://github.com/cocos2d/cocos2d-swift/commit/33c31206d7328c15cc30a6570f62e65051dfe96f
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M UnitTests/CCPackageTests.m
M cocos2d/CCPackage.m
Log Message:
-----------
CCPackage unit tests added.
Fix for file urls serialization: Prevent prepending of file:// scheme of installURL for de/serialization cycles.
Commit: 4515dce128d46a6779f5dcfb38d71105a68c9d4b
https://github.com/cocos2d/cocos2d-swift/commit/4515dce128d46a6779f5dcfb38d71105a68c9d4b
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M UnitTests/CCPackageUnzipperTests.m
A cocos2d-ui-tests/Resources-shared/Packages/password-iOS-phone.zip
Log Message:
-----------
CCPackageUnzipper unit tests added.
Password protected archive added for tests. Password is foobar.
Commit: cf29603192c59cb7fe1d42b7983122c1f8f2fdb3
https://github.com/cocos2d/cocos2d-swift/commit/cf29603192c59cb7fe1d42b7983122c1f8f2fdb3
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M cocos2d/CCPackageCocos2dEnabler.h
M cocos2d/CCPackageCocos2dEnabler.m
M cocos2d/CCPackageInstaller.m
M cocos2d/CCPackageManager.m
Log Message:
-----------
Refactoring: CCPackageInstaller won't enable the package anymore, this is done in the CCPackageManager now.
CCPackageCocos2dEnabler will set relevant status instead of CCPackageManager.
Commit: 447ba2d7e63cea3b854ca973ad78729e0592c8fb
https://github.com/cocos2d/cocos2d-swift/commit/447ba2d7e63cea3b854ca973ad78729e0592c8fb
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageCocos2dEnablerTests.m
Log Message:
-----------
CCPackageCocos2dEnabler unit tests added.
Commit: aa34cab30804913463db8937660229a9fafabcfc
https://github.com/cocos2d/cocos2d-swift/commit/aa34cab30804913463db8937660229a9fafabcfc
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageCocos2dEnablerTests.m
M UnitTests/CCTextureTests.m
M cocos2d-ui-tests/ios/AppDelegate.h
M cocos2d-ui-tests/ios/AppDelegate.m
Log Message:
-----------
Fixed tests for CCTexture. Unit tests for CCPackageCocos2dEnabler broke them.
Solution: Setup cocos2d for each CCTexture test as well as CCPackageCocos2dEnabler tests.
Commit: 7a1fa6b3eb2d3ef568ec7350555ad4ce857fb77a
https://github.com/cocos2d/cocos2d-swift/commit/7a1fa6b3eb2d3ef568ec7350555ad4ce857fb77a
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M cocos2d/CCPackageDownload.m
Log Message:
-----------
Bugfix: CCPackageDownlod read wrong fileSize to resume a download.
Commit: 9a2c229906a3987379abedf1c1b0a35121d39da9
https://github.com/cocos2d/cocos2d-swift/commit/9a2c229906a3987379abedf1c1b0a35121d39da9
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
A cocos2d-ui-tests/Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd/boredSmiley.png
Log Message:
-----------
CCPackageCocos2dEnabler asset added. Forgot that one in a previous commit.
Commit: 4ff444c88147346209c754bb00395019e6403c14
https://github.com/cocos2d/cocos2d-swift/commit/4ff444c88147346209c754bb00395019e6403c14
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
Log Message:
-----------
CCPackageDownload unit tests for normal request and resuming request(rang request) addded.
Commit: 3b055702948e7522b5103414f8cd77cbb76c78d2
https://github.com/cocos2d/cocos2d-swift/commit/3b055702948e7522b5103414f8cd77cbb76c78d2
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
Log Message:
-----------
CCPackageDownload unit test added for 404 response.
Commit: d94c11670b8080802be3366f0addf3d734b3cf64
https://github.com/cocos2d/cocos2d-swift/commit/d94c11670b8080802be3366f0addf3d734b3cf64
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
M cocos2d/CCPackageDownload.m
Log Message:
-----------
CCPackageDownload unit tests finished.
Commit: 25de38233b8f926dfe8cd7a63218a4c56864ca25
https://github.com/cocos2d/cocos2d-swift/commit/25de38233b8f926dfe8cd7a63218a4c56864ca25
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPhysicsTests.m
Log Message:
-----------
Physics unit tests fixed by re configuring cocos2d in setUp.
Commit: 7a73f79b07b39854a3216843ceda6d05a28af8f6
https://github.com/cocos2d/cocos2d-swift/commit/7a73f79b07b39854a3216843ceda6d05a28af8f6
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
Log Message:
-----------
CCPackageDownloadTests fixed, some nondeterministic errors occured.
Seemed to be a conflict with CCScheduler and the runloop triggering in the unit tests.
Commit: c4bd8f35dd91ae1fdf041bf96ee523bccf963375
https://github.com/cocos2d/cocos2d-swift/commit/c4bd8f35dd91ae1fdf041bf96ee523bccf963375
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-ios.xcodeproj/project.pbxproj
M external/SSZipArchive
Log Message:
-----------
SSZipArchive added as subproject.
Temporarily pointing to https://github.com/NickyWeber/ssziparchive.git as long as the main clone does not contain a static library target.
Commit: 19686f54671b4af32b1b35c92fa6b3e234611410
https://github.com/cocos2d/cocos2d-swift/commit/19686f54671b4af32b1b35c92fa6b3e234611410
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M .gitmodules
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackageUnzipper.h
M external/SSZipArchive
Log Message:
-----------
SSZipArchive pointing to SB repo fork again.
Updated revision of SSZipArchive.
SSZipArchive header search path added.
Commit: 503ccb10da92a396d1686dcedbea94fa2c7c8932
https://github.com/cocos2d/cocos2d-swift/commit/503ccb10da92a396d1686dcedbea94fa2c7c8932
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
M cocos2d/CCPackageDownload.m
Log Message:
-----------
CCPackageDownload will call delegate method if writing file fails.
Commit: 9164f139f6905c81bdb85d2ce30dd70e276a5af5
https://github.com/cocos2d/cocos2d-swift/commit/9164f139f6905c81bdb85d2ce30dd70e276a5af5
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadTests.m
M cocos2d/CCPackageDownload.m
Log Message:
-----------
CCPackageDownload more tests added.
CCPackageDownload is setting package status for failed downloads instead of download manager.
Commit: f472aeb5620d4b731f1f3bdc58520f71d45cbf40
https://github.com/cocos2d/cocos2d-swift/commit/f472aeb5620d4b731f1f3bdc58520f71d45cbf40
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadManagerTests.m
M UnitTests/CCPackageUnzipperTests.m
M cocos2d/CCPackageDownloadManager.h
M cocos2d/CCPackageDownloadManager.m
Log Message:
-----------
CCPackageDownloadManager tests added.
CCPackageDownloadManager header documentation improved for setDownloadPath.
Bugfix for setting a new download path.
Added allDownloads properties. Mainly for testing purposes, it shouldn't hurt.
NSAssert added in CCPackageDownloadManager to assert installData is attached to CCPackageDownload.
CCPackageDownloadManager no longer sets failed download status of a package: CCPackageDownload is doing this now.
Commit: 3cfc2611975435a4a89bd726a7a1aa0f156a1f38
https://github.com/cocos2d/cocos2d-swift/commit/3cfc2611975435a4a89bd726a7a1aa0f156a1f38
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadManagerTests.m
Log Message:
-----------
CCPackageDownloadManager: more unit tests added.
Some tidying up of tests.
Commit: a962c5832f8a9450919a8149dc9bd25c6d97dad6
https://github.com/cocos2d/cocos2d-swift/commit/a962c5832f8a9450919a8149dc9bd25c6d97dad6
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M UnitTests/CCPackage+InstallDataTests.m
M UnitTests/CCPackageCocos2dEnablerTests.m
M UnitTests/CCPackageDownloadManagerTests.m
M UnitTests/CCPackageDownloadTests.m
M UnitTests/CCPackageInstallDataTests.m
M UnitTests/CCPackageInstallerTests.m
M UnitTests/CCPackageTests.m
M UnitTests/CCPackageUnzipperTests.m
Log Message:
-----------
Refactoring: Unit tests tidying up.
Commit: 44600d290d92ff8929826b3242b2d2f3d37b79c8
https://github.com/cocos2d/cocos2d-swift/commit/44600d290d92ff8929826b3242b2d2f3d37b79c8
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
A UnitTests/CCPackageHelperTests.m
M UnitTests/CCPackageManagerTests.m
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackage.h
M cocos2d/CCPackage.m
M cocos2d/CCPackageHelper.h
M cocos2d/CCPackageHelper.m
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
Log Message:
-----------
Support for default resolution added.
Default resolution is determined by CCFileUtil's searchResolutionsOrder array and is mapped to a sprite builder resolution.
CCPackageManager now offers a simple method to download a package only by providing a name.
CCPackage can now be initialized with a name only.
Some tests added for these cases, although CCPackageHelper tests are disabled at the moment due to a bug in CCFileUtils and handling of searchResolutionsOrder.
Commit: 5c4a07f20175c99e47d0919f9d095ee090d450ec
https://github.com/cocos2d/cocos2d-swift/commit/5c4a07f20175c99e47d0919f9d095ee090d450ec
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
Log Message:
-----------
Packages loading and saving moved to CCAppDelegate.
Commit: f100553da01caaee6cda5167613dd8b5da3cdcc3
https://github.com/cocos2d/cocos2d-swift/commit/f100553da01caaee6cda5167613dd8b5da3cdcc3
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
Log Message:
-----------
Published download manager's resumeDownloads flag in CCPackageManager.
Commit: 257f3af8f81873b477ca3d459a4717739cfad8e3
https://github.com/cocos2d/cocos2d-swift/commit/257f3af8f81873b477ca3d459a4717739cfad8e3
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.h
M cocos2d/CCPackageManager.m
M cocos2d/CCPackageManagerDelegate.h
Log Message:
-----------
Refactoring: Minor renaming.
Removed double ;.
Some formatting of methods in CCPackageManager's header.
Commit: 159a3b03e6ae9824c8d2b218cd9abcf6188ee1c2
https://github.com/cocos2d/cocos2d-swift/commit/159a3b03e6ae9824c8d2b218cd9abcf6188ee1c2
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackage.h
M cocos2d/CCPackage.m
A cocos2d/CCPackage_private.h
Log Message:
-----------
CCPackage private header added to make properties accessible internally.
Commit: ee0015513cea72f688d04991b8204fd3dc8ed9d1
https://github.com/cocos2d/cocos2d-swift/commit/ee0015513cea72f688d04991b8204fd3dc8ed9d1
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageUnzipperTests.m
M cocos2d/CCPackageUnzipper.m
Log Message:
-----------
CCPackageUnzipper and tests cleansed of installData.
Commit: 87a59eca70cb6ffb07c57c2e1108a5f9e773e482
https://github.com/cocos2d/cocos2d-swift/commit/87a59eca70cb6ffb07c57c2e1108a5f9e773e482
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageDownloadManagerTests.m
M cocos2d/CCPackageDownloadManager.m
Log Message:
-----------
CCPackageDownloadManager cleansed of installData.
Commit: 405a8f26fbd026620d0cffdd10cf0618b54eb84e
https://github.com/cocos2d/cocos2d-swift/commit/405a8f26fbd026620d0cffdd10cf0618b54eb84e
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageTests.m
M cocos2d/CCPackage.m
Log Message:
-----------
CCPackage with install data now.
Commit: 66bd1a5214bb2a764b12fbf5aa09a6d391d248e4
https://github.com/cocos2d/cocos2d-swift/commit/66bd1a5214bb2a764b12fbf5aa09a6d391d248e4
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M cocos2d/CCPackageDownload.m
Log Message:
-----------
CCPackageDownload using private CCPackage header.
Commit: ed5b75b7c3babc471c63d282417901a9640ad5e4
https://github.com/cocos2d/cocos2d-swift/commit/ed5b75b7c3babc471c63d282417901a9640ad5e4
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
R UnitTests/CCPackage+InstallDataTests.m
M UnitTests/CCPackageCocos2dEnablerTests.m
R UnitTests/CCPackageInstallDataTests.m
R cocos2d/CCPackage+InstallData.h
R cocos2d/CCPackage+InstallData.m
R cocos2d/CCPackageInstallData.h
R cocos2d/CCPackageInstallData.m
Log Message:
-----------
CCPackageCocos2dEnabler using CCPackage private header.
Commit: 229624f7e23fd9d2499d043382daee981c68a78e
https://github.com/cocos2d/cocos2d-swift/commit/229624f7e23fd9d2499d043382daee981c68a78e
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageInstallerTests.m
M cocos2d/CCPackageInstaller.m
Log Message:
-----------
CCPackageInstaller and tests cleansed of install data.
Commit: b35cccc4f69c02843329472dfb2ee44aaf5c7581
https://github.com/cocos2d/cocos2d-swift/commit/b35cccc4f69c02843329472dfb2ee44aaf5c7581
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M cocos2d/CCPackageManager.m
Log Message:
-----------
CCPackageManager cleansed of install data.
Commit: 74c072442dd239b6ff3e92f4ff09e37ddec40eb7
https://github.com/cocos2d/cocos2d-swift/commit/74c072442dd239b6ff3e92f4ff09e37ddec40eb7
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageTests.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
Log Message:
-----------
Install data related files removed from project.
Last import removed in CCPackageTests.
Commit: 00884dcddeb679e7fa2be2c005c4d365a8c6a863
https://github.com/cocos2d/cocos2d-swift/commit/00884dcddeb679e7fa2be2c005c4d365a8c6a863
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M CCRendererGLSupport.m
M Chipmunk7-ios.xcodeproj/project.pbxproj
M UnitTests/CCRendererTests.m
M VERSION
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/xcshareddata/xcschemes/kazmath.xcscheme
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless/src/main/AndroidManifest.xml
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/ios/AppDelegate.m
M cocos2d-ui-tests/tests/CCBMFontTest.m
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui-tests/tests/CCRendererTest.m
A cocos2d-ui-tests/tests/TestShaders.metal
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d-ui/CCTextField.h
M cocos2d-ui/Platform/CCPlatformTextField.m
M cocos2d/CCCache.h
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.h
M cocos2d/CCEffect.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.h
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/CCEffectDropShadow.h
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectHue.m
M cocos2d/CCEffectNode.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffectSaturation.m
M cocos2d/CCEffectStack.m
M cocos2d/CCEffectUtils.h
M cocos2d/CCEffectUtils.m
M cocos2d/CCEffect_Private.h
M cocos2d/CCLabelBMFont.m
M cocos2d/CCMotionStreak.m
M cocos2d/CCNoARC.m
M cocos2d/CCNode.h
M cocos2d/CCNode.m
M cocos2d/CCNodeColor.m
M cocos2d/CCRenderDispatch.h
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
A cocos2d/CCRendererBasicTypes.h
A cocos2d/CCRendererBasicTypes.m
A cocos2d/CCRendererBasicTypes_Private.h
A cocos2d/CCRendererSharedTypes.h
A cocos2d/CCRenderer_Private.h
R cocos2d/CCRenderer_private.h
M cocos2d/CCResponderManager.h
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/CCSprite.m
M cocos2d/CCTMXXMLParser.m
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTextureCache.m
M cocos2d/CCTexturePVR.m
M cocos2d/CCTouch.h
A cocos2d/NSValue+CCRenderer.h
A cocos2d/NSValue+CCRenderer.m
M cocos2d/Platforms/Android/CCDirectorAndroid.m
M cocos2d/Platforms/Android/CCGLView.h
M cocos2d/Platforms/Android/CCGLView.m
M cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCDirectorIOS.m
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/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCMetalSupport_Private.h
M cocos2d/Platforms/iOS/CCMetalView.h
M cocos2d/Platforms/iOS/CCMetalView.m
M cocos2d/Platforms/iOS/CCShaders.metal
M cocos2d/Support/CCFileUtils.h
M cocos2d/Support/NSAttributedString+CCAdditions.m
M cocos2d/cocos2d.h
Log Message:
-----------
Merge branch 'develop' into feature/Packages
Conflicts:
cocos2d-ios.xcodeproj/project.pbxproj
cocos2d-tests-ios.xcodeproj/project.pbxproj
cocos2d-ui-tests/ios/AppDelegate.m
cocos2d/Platforms/iOS/CCAppDelegate.m
cocos2d/Support/CCFileUtils.h
Commit: e0cefa85d2d6d235b2cf809c1c0e1a61b673c774
https://github.com/cocos2d/cocos2d-swift/commit/e0cefa85d2d6d235b2cf809c1c0e1a61b673c774
Author: Nicky Weber <nicky....@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M UnitTests/CCPackageHelperTests.m
M UnitTests/CCPackageManagerTests.m
M cocos2d/Support/CCFileUtils.h
Log Message:
-----------
Bugfix for CCFileUtils searchResolutionsOrder.
It was internally declared as NSMutableArray but accessible and writable(copy) as NSArray.
This caused all kinds of weird crashes when assigning new values after setup and running the tests.
Reenabled the tests depending on this.
Commit: 2135b8d32a7a46dc8c7faea2b42152155f5475cd
https://github.com/cocos2d/cocos2d-swift/commit/2135b8d32a7a46dc8c7faea2b42152155f5475cd
Author: Daniel DeCovnick <dan...@apportable.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M .gitmodules
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
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 'feature/Packages' into develop
Commit: ce8cbe25264b25c36a58cc1e09cf6d585a27af6f
https://github.com/cocos2d/cocos2d-swift/commit/ce8cbe25264b25c36a58cc1e09cf6d585a27af6f
Author: Daniel DeCovnick <dan...@apportable.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/CCPackageConstants.m
M cocos2d/CCPackageUnzipper.m
Log Message:
-----------
Fix package stuff so it'll build on android
Commit: 7908afc521763d71863921a14c98b3c2c030d695
https://github.com/cocos2d/cocos2d-swift/commit/7908afc521763d71863921a14c98b3c2c030d695
Author: Viktor Lidholt <viktor...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M .gitmodules
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
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 pull request #1008 from danhd123/develop
Nicky's Pull Request plus android fixes.
Compare: https://github.com/cocos2d/cocos2d-swift/compare/eb8613644b3f...7908afc52176
Reply all
Reply to author
Forward
0 new messages