Nicky's Pull Request plus android fixes. #1008
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rst 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.
Method added to load all filenameLookups in all search paths and merge them.
…s in all search paths and merge them in ivar.
Code re-enabled to compile.
Conflicts: cocos2d-ios.xcodeproj/project.pbxproj external/ObjectAL
A server has to explicitly return the Accept-Ranges header with a set value other than none.
currentOS now a class method.
…s when enqueue is used. A failed package download will start over when used with enqueue.
Some renaming and comments updated.
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.
…nt a crash in the cocos2d-test-ios project. Hopefully this can be solved to get the platform defines set correctly soon.
Extracted some cocos2d config code in app delegate and made that public to rerun packages tests.
Test packages added to bundle.
…t end in weird states.
…ategory. File skeletons for other package classes added. Moved two methods from CCPackage+InstallData to CCPackageInstallData.
Unzipped package added to shared resources for those tests.
…n unit tests. Simplified unit tests of CCPackageInstallData. Removed non testable CCPackageHelperTests class.
Fix for file urls serialization: Prevent prepending of file:// scheme of installURL for de/serialization cycles.
Password protected archive added for tests. Password is foobar.
…s is done in the CCPackageManager now. CCPackageCocos2dEnabler will set relevant status instead of CCPackageManager.
Seemed to be a conflict with CCScheduler and the runloop triggering in the unit tests.
Temporarily pointing to https://github.com/NickyWeber/ssziparchive.git as long as the main clone does not contain a static library target.
Updated revision of SSZipArchive. SSZipArchive header search path added.
CCPackageDownload is setting package status for failed downloads instead of download manager.
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.
Some tidying up of tests.
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.
Removed double ;. Some formatting of methods in CCPackageManager's header.
Last import removed in CCPackageTests.
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
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.
vlidholt
added a commit
that referenced
this pull request
Sep 30, 2014
Nicky's Pull Request plus android fixes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.