Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Iss1489 assets manager #2040

Merged
merged 18 commits into from Feb 25, 2013
Merged

Iss1489 assets manager #2040

merged 18 commits into from Feb 25, 2013

Commits on Feb 22, 2013

  1. fix a bug of CCUserDefault

    @minggo
    minggo committed Feb 22, 2013
    Configuration menu
    Copy the full SHA
    f716897 View commit details
    Browse the repository at this point in the history

  2. issue 1489:add AssetsManager

    @minggo
    minggo committed Feb 22, 2013
    Configuration menu
    Copy the full SHA
    b3f6325 View commit details
    Browse the repository at this point in the history

  3. Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager

    @minggo
    minggo committed Feb 22, 2013
    Configuration menu
    Copy the full SHA
    8602335 View commit details
    Browse the repository at this point in the history

  4. issue cocos2d#1489:modify sample code and add readme

    @minggo
    minggo committed Feb 22, 2013
    Configuration menu
    Copy the full SHA
    6c9fe9d View commit details
    Browse the repository at this point in the history

  5. Update samples/Cpp/AssetsManagerTest/README.md

    @minggo
    minggo committed Feb 22, 2013
    Configuration menu
    Copy the full SHA
    3c334b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2013

  1. Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager

    @minggo
    minggo committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    454b795 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/coc… 

    …os2d-x into iss1489-AssetsManager
    @minggo
    minggo committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    85e4a85 View commit details
    Browse the repository at this point in the history

  3. issue cocos2d#1489: update ios libcurl and add android project

    @minggo
    minggo committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    7a9d105 View commit details
    Browse the repository at this point in the history

  4. issue cocos2d#1489:rename AssetsManagerProtocol to AssetsManagerDelegate

    @minggo
    minggo committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    bc2c705 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/coc… 

    …os2d-x into minggo-iss1489-AssetsManager
    James Chen committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    fc72700 View commit details
    Browse the repository at this point in the history

  6. issue cocos2d#1489:android works ok

    @minggo
    minggo committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    5a628b4 View commit details
    Browse the repository at this point in the history

  7. issue cocos2d#1489:add some log

    @minggo
    minggo committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    e6cdac0 View commit details
    Browse the repository at this point in the history

  8. Adds AssetsManager support for win32.

    James Chen committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    345fb03 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #9 from minggo/iss1489-AssetsManager 

    issue cocos2d#1489: Updates with upstream.
    James Chen committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    2e17cad View commit details
    Browse the repository at this point in the history

  10. Merge branch 'iss1489-AssetsManager' of https://github.com/dumganhar/… 

    …cocos2d-x into minggo-iss1489-AssetsManager
    James Chen committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    d4231a6 View commit details
    Browse the repository at this point in the history

  11. Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager

    @minggo
    minggo committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    2166709 View commit details
    Browse the repository at this point in the history

  12. issue cocos2d#1489: ZEXPORT -> CC_DLL for unzip.h.

    James Chen committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    e1b52c7 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #6 from dumganhar/iss1489-AssetsManager 

    Adds AssetsManager support for win32.
    @minggo
    minggo committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    b08723e View commit details
    Browse the repository at this point in the history