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

看一下代码？ #556

Open
wants to merge 165 commits into
base: master
Choose a base branch
from
Open

看一下代码？ #556

wants to merge 165 commits into from

Commits on Dec 31, 2013

  1. chmod

    @zrong
    zrong committed Dec 31, 2013
    Configuration menu
    Copy the full SHA
    9304fbd View commit details
    Browse the repository at this point in the history

  2. set default project to lulala

    @zrong
    zrong committed Dec 31, 2013
    Configuration menu
    Copy the full SHA
    a6c1f49 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2014

  1. Merge branch 'develop' into zrong

    @zrong
    zrong committed Jan 2, 2014
    Configuration menu
    Copy the full SHA
    a2ce4e4 View commit details
    Browse the repository at this point in the history

  2. compile framework

    @zrong
    zrong committed Jan 2, 2014
    Configuration menu
    Copy the full SHA
    9412600 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into zrong

    @zrong
    zrong committed Jan 2, 2014
    Configuration menu
    Copy the full SHA
    6daac85 View commit details
    Browse the repository at this point in the history

  4. rebuild framework

    @zrong
    zrong committed Jan 2, 2014
    Configuration menu
    Copy the full SHA
    f9173f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2014

  1. Merge branch 'develop' into zrong

    @zrong
    zrong committed Jan 5, 2014
    Configuration menu
    Copy the full SHA
    fdf7ed6 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2014

  1. merge develop

    @zrong
    zrong committed Jan 10, 2014
    Configuration menu
    Copy the full SHA
    992fc9c View commit details
    Browse the repository at this point in the history

  2. update vs project

    @zrong
    zrong committed Jan 10, 2014
    Configuration menu
    Copy the full SHA
    f9c5279 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'zrong' of github.com:zrong/quick-cocos2d-x into zrong

    @zrong
    zrong committed Jan 10, 2014
    Configuration menu
    Copy the full SHA
    4d3b628 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2014

  1. merge zrong/develop

    @zrong
    zrong committed Jan 21, 2014
    Configuration menu
    Copy the full SHA
    f9f7582 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2014

  1. compile framework

    @zrong
    zrong committed Jan 23, 2014
    Configuration menu
    Copy the full SHA
    c74cbe1 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2014

  1. modify vcxproj

    @zrong
    zrong committed Feb 8, 2014
    Configuration menu
    Copy the full SHA
    867a0db View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into zrong

    @zrong
    zrong committed Feb 8, 2014
    Configuration menu
    Copy the full SHA
    2a6ad61 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2014

  1. fix a ByteArrayVarint decode issue

    @zrong
    zrong committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    0876a99 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into zrong

    @zrong
    zrong committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    cfd8736 View commit details
    Browse the repository at this point in the history

  3. update framework

    @zrong
    zrong committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    17f4508 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2014

  1. merge zrong/develop

    @zrong
    zrong committed Mar 11, 2014
    Configuration menu
    Copy the full SHA
    b49c149 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2014

  1. merge develop

    @zrong
    zrong committed Mar 12, 2014
    Configuration menu
    Copy the full SHA
    10f834b View commit details
    Browse the repository at this point in the history

  2. merge develop

    @zrong
    zrong committed Mar 12, 2014
    Configuration menu
    Copy the full SHA
    dea5eb2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into zrong

    @zrong
    zrong committed Mar 12, 2014
    Configuration menu
    Copy the full SHA
    6249995 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2014

  1. Merge branch 'develop' into zrong

    @zrong
    zrong committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    e6edf2a View commit details
    Browse the repository at this point in the history

  2. compile framework

    @zrong
    zrong committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    55a5578 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2014

  1. merge develop

    @zrong
    zrong committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    7b9ebde View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2014

  1. merge develop

    @zrong
    zrong committed Mar 21, 2014
    Configuration menu
    Copy the full SHA
    e99f338 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2014

  1. add getColor4B and getColor4F to CCImage

    @zrong
    zrong committed Mar 27, 2014
    Configuration menu
    Copy the full SHA
    c2a9237 View commit details
    Browse the repository at this point in the history

  2. merge develop

    @zrong
    zrong committed Mar 27, 2014
    Configuration menu
    Copy the full SHA
    6803eac View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2014

  1. add getColor and getColorAlpha in CCSpriteExtend.lua

    @zrong
    zrong committed Mar 28, 2014
    Configuration menu
    Copy the full SHA
    113fabc View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2014

  1. move ccimage method to h file

    @zrong
    zrong committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    c193c6b View commit details
    Browse the repository at this point in the history

  2. mv CCImage.getColor4B and getColor4F to h file

    @zrong
    zrong committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    a598646 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2014

  1. add the filters support

    @zrong
    zrong committed Mar 30, 2014
    Configuration menu
    Copy the full SHA
    1a94ef7 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2014

  1. add filter.lua into framework

    @zrong
    zrong committed Mar 31, 2014
    Configuration menu
    Copy the full SHA
    fe93af9 View commit details
    Browse the repository at this point in the history

  2. add some comments to filte.lua

    @zrong
    zrong committed Mar 31, 2014
    Configuration menu
    Copy the full SHA
    0e2a071 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2014

  1. android build is OK now

    @zrong
    zrong committed Apr 1, 2014
    Configuration menu
    Copy the full SHA
    4587534 View commit details
    Browse the repository at this point in the history

  2. fix CCFilteredSpriteWithMulti bugs

    @zrong
    zrong committed Apr 1, 2014
    Configuration menu
    Copy the full SHA
    895e37c View commit details
    Browse the repository at this point in the history

  3. update

    @zrong
    zrong committed Apr 1, 2014
    Configuration menu
    Copy the full SHA
    0f3f579 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2014

  1. add CCDrawNodeExtend.lut, an encapsulation to CCDrawNode

    @zrong
    zrong committed Apr 2, 2014
    Configuration menu
    Copy the full SHA
    98eb3cf View commit details
    Browse the repository at this point in the history

  2. merge newSprite and newScale9Sprite

    @zrong
    zrong committed Apr 2, 2014
    Configuration menu
    Copy the full SHA
    6112b6e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'zrong' of github.com:zrong/quick-cocos2d-x into zrong

    @zrong
    zrong committed Apr 2, 2014
    Configuration menu
    Copy the full SHA
    3d6e9b9 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2014

  1. modify the path config in SimulatorConfig.cpp; 

    fix the filters compile warning.
    @zrong
    zrong committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    ede98bd View commit details
    Browse the repository at this point in the history

  2. add the filters filt to xcode project

    macmini committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    3251086 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'zrong' of 192.168.18.18:lib/quick into zrong

    macmini committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    c62d5da View commit details
    Browse the repository at this point in the history

  4. modify SimulatorConfig path

    macmini committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    6640ce5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'zrong' of github.com:zrong/quick-cocos2d-x into zrong

    @zrong
    zrong committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    c7b351f View commit details
    Browse the repository at this point in the history

  6. fix display.newFSprite

    @zrong
    zrong committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    62e44f2 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2014

  1. remove precision from shapen filter, because the PVR is not support it

    macmini committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    ac9f68f View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2014

  1. add condition compile of shaders; add samper of filters

    @zrong
    zrong committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    1f2c1f6 View commit details
    Browse the repository at this point in the history

  2. fix shader compile errors

    macmini committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    2f13e8c View commit details
    Browse the repository at this point in the history

  3. filter shader bugs

    @zrong
    zrong committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    b14a48c View commit details
    Browse the repository at this point in the history

  4. fix hue shader bug

    macmini committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    b356da2 View commit details
    Browse the repository at this point in the history

  5. improve filters sample

    @zrong
    zrong committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    0ba2753 View commit details
    Browse the repository at this point in the history

  6. modify CCGrayFilter::setPrameters

    @zrong
    zrong committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    29b2ad7 View commit details
    Browse the repository at this point in the history

  7. fix methods

    @zrong
    zrong committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    2db5b79 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2014

  1. add printscreen to display.lua

    @zrong
    zrong committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    07c663d View commit details
    Browse the repository at this point in the history

  2. improve CCDrawNodeExtend

    @zrong
    zrong committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    7007c5a View commit details
    Browse the repository at this point in the history

  3. add CCDrawNodeExtend:clear

    @zrong
    zrong committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    cfae9ae View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2014

  1. improve CCHTTPRequest to upload file

    @zrong
    zrong committed Apr 12, 2014
    Configuration menu
    Copy the full SHA
    f6f9ef4 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2014

  1. improve CCHTTPRequest to upload a file

    @zrong
    zrong committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    3be9b8a View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2014

  1. export resumeSchedulerAndActions and pauseSchedulerAndActions to lua

    @zrong
    zrong committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    95a1db3 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2014

  1. add async image to display.addSpriteFrameList

    @zrong
    zrong committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    c336ee1 View commit details
    Browse the repository at this point in the history

  2. update framework

    @zrong
    zrong committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    4c37fea View commit details
    Browse the repository at this point in the history

  3. merge develop

    @zrong
    zrong committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    db460b8 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2014

  1. Merge branch 'develop' into zrong

    @zrong
    zrong committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    4fe2341 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2014

  1. add dragonbones extension

    @zrong
    zrong committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    a740d9a View commit details
    Browse the repository at this point in the history

  2. fix DB Matrix compile error.

    @zrong
    zrong committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    6305e7a View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2014

  1. merge new DragonBones, fix Matrix compile error

    @zrong
    zrong committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    d81c9c6 View commit details
    Browse the repository at this point in the history

  2. DragonBones lua export has done

    @zrong
    zrong committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    bc508eb View commit details
    Browse the repository at this point in the history

  3. add removeAllScriptHandler method

    @zrong
    zrong committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    efe8cbf View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2014

  1. export AnimationData to lua

    @zrong
    zrong committed Apr 25, 2014
    Configuration menu
    Copy the full SHA
    2852247 View commit details
    Browse the repository at this point in the history

  2. add Heads seach paths and replace CCTextureAtlas for OS X

    macmini committed Apr 25, 2014
    Configuration menu
    Copy the full SHA
    96f108e View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2014

  1. add zip2dev.sh

    @zrong
    zrong committed Apr 28, 2014
    Configuration menu
    Copy the full SHA
    3e58f35 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dragonbones' into zrong

    @zrong
    zrong committed Apr 28, 2014
    Configuration menu
    Copy the full SHA
    1ff9748 View commit details
    Browse the repository at this point in the history

  3. update update.lua

    @zrong
    zrong committed Apr 28, 2014
    Configuration menu
    Copy the full SHA
    3612f16 View commit details
    Browse the repository at this point in the history

  4. add a parameter to drawCircle

    @zrong
    zrong committed Apr 28, 2014
    Configuration menu
    Copy the full SHA
    6d9c818 View commit details
    Browse the repository at this point in the history

  5. Move old dragonbones sample to ccarmature; 

    Create a new dragonbones sample.
    @zrong
    zrong committed Apr 28, 2014
    Configuration menu
    Copy the full SHA
    dd53ebb View commit details
    Browse the repository at this point in the history

  6. Fix memory leak of CCImage:getColor4F

    @zrong
    zrong committed Apr 28, 2014
    Configuration menu
    Copy the full SHA
    88926b6 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2014

  1. update framework

    @zrong
    zrong committed Apr 29, 2014
    Configuration menu
    Copy the full SHA
    2044248 View commit details
    Browse the repository at this point in the history

  2. Modify Android.mk to build DragonBones

    @zrong
    zrong committed Apr 29, 2014
    Configuration menu
    Copy the full SHA
    ed11ec8 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2014

  1. fix typo

    @zrong
    zrong committed May 1, 2014
    Configuration menu
    Copy the full SHA
    478d0e2 View commit details
    Browse the repository at this point in the history

  2. update framework

    @zrong
    zrong committed May 1, 2014
    Configuration menu
    Copy the full SHA
    ae55015 View commit details
    Browse the repository at this point in the history

  3. insert DRagonBones and filter to ios project

    macmini committed May 1, 2014
    Configuration menu
    Copy the full SHA
    7d3d8e0 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2014

  1. Cancel all of CCLOG; 

    Add clearFilter into CCFilter.
    @zrong
    zrong committed May 7, 2014
    Configuration menu
    Copy the full SHA
    499b7e5 View commit details
    Browse the repository at this point in the history

  2. Add clear filter function into filter sample.

    @zrong
    zrong committed May 7, 2014
    Configuration menu
    Copy the full SHA
    cdaaba9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'zrong' of 192.168.18.18:lib/quick into zrong

    @zrong
    zrong committed May 7, 2014
    Configuration menu
    Copy the full SHA
    40e186f View commit details
    Browse the repository at this point in the history

Commits on May 14, 2014

  1. Modify display.newMaskedSprite to support offset

    @zrong
    zrong committed May 14, 2014
    Configuration menu
    Copy the full SHA
    8979d68 View commit details
    Browse the repository at this point in the history

  2. Update framework.

    @zrong
    zrong committed May 14, 2014
    Configuration menu
    Copy the full SHA
    23181fb View commit details
    Browse the repository at this point in the history

  3. Update newMaskedSprite to return a Texture

    @zrong
    zrong committed May 14, 2014
    Configuration menu
    Copy the full SHA
    e373b0b View commit details
    Browse the repository at this point in the history

  4. Update framework

    @zrong
    zrong committed May 14, 2014
    Configuration menu
    Copy the full SHA
    90d7a88 View commit details
    Browse the repository at this point in the history

  5. update framework

    @zrong
    zrong committed May 14, 2014
    Configuration menu
    Copy the full SHA
    9077eb2 View commit details
    Browse the repository at this point in the history

  6. Update framework

    @zrong
    zrong committed May 14, 2014
    Configuration menu
    Copy the full SHA
    3f8ea6c View commit details
    Browse the repository at this point in the history

Commits on May 19, 2014

  1. fix a bua of CCDragonBonesExtend removeScriptListener

    @zrong
    zrong committed May 19, 2014
    Configuration menu
    Copy the full SHA
    fa21f71 View commit details
    Browse the repository at this point in the history

  2. update framework

    @zrong
    zrong committed May 19, 2014
    Configuration menu
    Copy the full SHA
    d9eb152 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2014

  1. Fixs ByteArray.writeRawByte and writeString and readString bugs, than… 

    …ks hotman.
    @zrong
    zrong committed May 22, 2014
    Configuration menu
    Copy the full SHA
    fad81f7 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2014

  1. update filter.lua

    @zrong
    zrong committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    c654976 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2014

  1. update Cocos2dxActivity.java for onResume bug

    @zrong
    zrong committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    70365ed View commit details
    Browse the repository at this point in the history

  2. update framwork

    @zrong
    zrong committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    6c33d91 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2014

  1. ignore local properties

    @zrong
    zrong committed Jun 16, 2014
    Configuration menu
    Copy the full SHA
    d815726 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'zrong' of github.com:zrong/quick-cocos2d-x into zrong

    @zrong
    zrong committed Jun 16, 2014
    Configuration menu
    Copy the full SHA
    32ed02d View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2014

  1. update proj.properties

    @zrong
    zrong committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    ccfa74a View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2014

  1. update README

    @zrong
    zrong committed Jun 23, 2014
    Configuration menu
    Copy the full SHA
    e1d39b1 View commit details
    Browse the repository at this point in the history

  2. Add WebView components for ios

    @zrong
    zrong committed Jun 23, 2014
    Configuration menu
    Copy the full SHA
    79ba04c View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2014

  1. Test WebView in Android is done

    @zrong
    zrong committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    30b25ad View commit details
    Browse the repository at this point in the history

  2. Update package name, set activity name in android project.

    @zrong
    zrong committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    a68a5ef View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2014

  1. remove CCB support and CCArmature support

    @zrong
    zrong committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    68c8a1c View commit details
    Browse the repository at this point in the history

  2. Modify template

    @zrong
    zrong committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    540a527 View commit details
    Browse the repository at this point in the history

  3. Add webview.lua; remove framework_precompiled.zip from samples

    @zrong
    zrong committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    4b707a6 View commit details
    Browse the repository at this point in the history

  4. update template

    @zrong
    zrong committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    6dad909 View commit details
    Browse the repository at this point in the history

  5. add webview support in win32

    @zrong
    zrong committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    8ad2bf7 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2014

  1. rename AssetsManager to Updater

    @zrong
    zrong committed Jun 29, 2014
    Configuration menu
    Copy the full SHA
    7083e5d View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2014

  1. modify Updater

    @zrong
    zrong committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    c7120dc View commit details
    Browse the repository at this point in the history

  2. update cocos2d-x win32 project for updater

    @zrong
    zrong committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    dba6702 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2014

  1. update update module

    @zrong
    zrong committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    5d31312 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'zrong' of github.com:zrong/quick-cocos2d-x into zrong

    @zrong
    zrong committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    3bbf1d6 View commit details
    Browse the repository at this point in the history

  3. update update module

    @zrong
    zrong committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    e138d34 View commit details
    Browse the repository at this point in the history

  4. update Updater moodule

    @zrong
    zrong committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    bdfb762 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2014

  1. update CCFileUtils and update module

    @zrong
    zrong committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    2028ae6 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2014

  1. add io.getres method for update;modify display.newSprite for update.

    @zrong
    zrong committed Jul 3, 2014
    Configuration menu
    Copy the full SHA
    e2cadeb View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2014

  1. Remove ccarmature sample.

    @zrong
    zrong committed Jul 7, 2014
    Configuration menu
    Copy the full SHA
    7a331cd View commit details
    Browse the repository at this point in the history

  2. Add DragonSwitchClothes demo

    @zrong
    zrong committed Jul 7, 2014
    Configuration menu
    Copy the full SHA
    a3b323e View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2014

  1. fix proj.mac to support extends/update module;Add 2 demo to samples/d… 

    …ragonbones;export some methods about dragobones
    @zrong
    zrong committed Jul 8, 2014
    Configuration menu
    Copy the full SHA
    102342a View commit details
    Browse the repository at this point in the history

  2. update README

    @zrong
    zrong committed Jul 8, 2014
    Configuration menu
    Copy the full SHA
    8fb6116 View commit details
    Browse the repository at this point in the history

  3. Fix update module for win32

    @zrong
    zrong committed Jul 8, 2014
    Configuration menu
    Copy the full SHA
    f14e92b View commit details
    Browse the repository at this point in the history

  4. update README.md

    @zrong
    zrong committed Jul 8, 2014
    Configuration menu
    Copy the full SHA
    34e7805 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2014

  1. Delete some methods about Long in lua.ByteArray; Add samples/bytearray

    @zrong
    zrong committed Jul 9, 2014
    Configuration menu
    Copy the full SHA
    a3d7652 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2014

  1. fix some memory issues about dragonbones

    @zrong
    zrong committed Jul 11, 2014
    Configuration menu
    Copy the full SHA
    f425ef6 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2014

  1. update dragonbone sample

    @zrong
    zrong committed Jul 15, 2014
    Configuration menu
    Copy the full SHA
    2019ea5 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2014

  1. Add async loader to CCAnimationCache and CCSpriteFrameCache

    @zrong
    zrong committed Jul 16, 2014
    Configuration menu
    Copy the full SHA
    6f6dd94 View commit details
    Browse the repository at this point in the history

  2. update README

    @zrong
    zrong committed Jul 16, 2014
    Configuration menu
    Copy the full SHA
    cb664cc View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2014

  1. Fix runtimeerror in windows

    @zrong
    zrong committed Jul 17, 2014
    Configuration menu
    Copy the full SHA
    521efc3 View commit details
    Browse the repository at this point in the history

  2. Update CCDragonBones

    @zrong
    zrong committed Jul 17, 2014
    Configuration menu
    Copy the full SHA
    5bf6a3e View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2014

  1. Update DragonBones Event system

    @zrong
    zrong committed Jul 18, 2014
    Configuration menu
    Copy the full SHA
    93bc355 View commit details
    Browse the repository at this point in the history

  2. fix addSpriteFramesWithFile error in CCSpriteFrameCache

    @zrong
    zrong committed Jul 18, 2014
    Configuration menu
    Copy the full SHA
    364ed66 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2014

  1. Add aync loading to DragonBones

    @zrong
    zrong committed Jul 19, 2014
    Configuration menu
    Copy the full SHA
    aafb048 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2014

  1. fix some syntax for ndk

    @zrong
    zrong committed Jul 21, 2014
    Configuration menu
    Copy the full SHA
    1eb0f4b View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2014

  1. Rename DragonBones/renderer/Cocos2dx* to CCDB*; Update Create functio… 

    …n; Update

frameworks;
    @zrong
    zrong committed Jul 22, 2014
    Configuration menu
    Copy the full SHA
    3068a59 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2014

  1. debug dragonbones async loading.

    @zrong
    zrong committed Jul 23, 2014
    Configuration menu
    Copy the full SHA
    b823770 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2014

  1. add some dbs files

    @zrong
    zrong committed Jul 24, 2014
    Configuration menu
    Copy the full SHA
    eb626b3 View commit details
    Browse the repository at this point in the history

  2. Fix memory leak of dragonbones

    @zrong
    zrong committed Jul 24, 2014
    Configuration menu
    Copy the full SHA
    e509068 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2014

  1. update dragonbones framework and sample

    @zrong
    zrong committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    65c0c6f View commit details
    Browse the repository at this point in the history

  2. rename __func__ to __FUNCTION__ because msvs is unsupported it

    @zrong
    zrong committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    66c6055 View commit details
    Browse the repository at this point in the history

  3. fix build error in win32

    @zrong
    zrong committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    d5ab670 View commit details
    Browse the repository at this point in the history

  4. Fix android compile error;Update README

    @zrong
    zrong committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    261f276 View commit details
    Browse the repository at this point in the history

  5. update framework

    @zrong
    zrong committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    af4ffc5 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2014

  1. Fix Sigleton error in windows

    @zrong
    zrong committed Jul 26, 2014
    Configuration menu
    Copy the full SHA
    927cc04 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2014

  1. when provide a out of range to CCImage::getColor4B, retuan a {0,0,0,0… 

    …} color.
    @zrong
    zrong committed Jul 27, 2014
    Configuration menu
    Copy the full SHA
    a73ad4b View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2014

  1. Fix slash after path

    @zrong
    zrong committed Jul 28, 2014
    Configuration menu
    Copy the full SHA
    27744e2 View commit details
    Browse the repository at this point in the history

  2. update ios project for dragonbones

    @zrong
    zrong committed Jul 28, 2014
    Configuration menu
    Copy the full SHA
    9fbb346 View commit details
    Browse the repository at this point in the history

  3. modify CCDBNode

    @zrong
    zrong committed Jul 28, 2014
    Configuration menu
    Copy the full SHA
    42800e8 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2014

  1. Add SetColor and SetOpacity supports to DragonBones.

    @zrong
    zrong committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    37bc653 View commit details
    Browse the repository at this point in the history

  2. Ignore lua path in some samples.

    @zrong
    zrong committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    8173ad0 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2014

  1. Add Javascript and Cookie support in Android

    @zrong
    zrong committed Jul 31, 2014
    Configuration menu
    Copy the full SHA
    b17e731 View commit details
    Browse the repository at this point in the history

  2. update java template for webview

    @zrong
    zrong committed Jul 31, 2014
    Configuration menu
    Copy the full SHA
    5e427cc View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2014

  1. Modify Updater module

    @zrong
    zrong committed Aug 17, 2014
    Configuration menu
    Copy the full SHA
    f38a371 View commit details
    Browse the repository at this point in the history

  2. fix curl buts

    @zrong
    zrong committed Aug 17, 2014
    Configuration menu
    Copy the full SHA
    c83afb2 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2014

  1. update framework

    @zrong
    zrong committed Aug 18, 2014
    Configuration menu
    Copy the full SHA
    d39388f View commit details
    Browse the repository at this point in the history

  2. update update

    @zrong
    zrong committed Aug 18, 2014
    Configuration menu
    Copy the full SHA
    b7034d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2014

  1. fix update bug

    @zrong
    zrong committed Aug 19, 2014
    Configuration menu
    Copy the full SHA
    2034fc0 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2014

  1. update display

    @zrong
    zrong committed Aug 20, 2014
    Configuration menu
    Copy the full SHA
    3f8c7a1 View commit details
    Browse the repository at this point in the history

  2. upadte framework

    @zrong
    zrong committed Aug 20, 2014
    Configuration menu
    Copy the full SHA
    2eb3a74 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2014

  1. modify vardump

    @zrong
    zrong committed Aug 21, 2014
    Configuration menu
    Copy the full SHA
    a46202c View commit details
    Browse the repository at this point in the history

  2. update gettext

    @zrong
    zrong committed Aug 21, 2014
    Configuration menu
    Copy the full SHA
    b93f9a0 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2014

  1. adjust functions.lua

    @zrong
    zrong committed Aug 25, 2014
    Configuration menu
    Copy the full SHA
    1e55066 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2014

  1. update display

    @zrong
    zrong committed Aug 28, 2014
    Configuration menu
    Copy the full SHA
    03a91b5 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2014

  1. update CURL to CURLOPT_FRESH_CONNECT

    @zrong
    zrong committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    03a51aa View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2014

  1. fix memory leak in CCFileteredSprite

    @zrong
    zrong committed Sep 16, 2014
    Configuration menu
    Copy the full SHA
    dab1f61 View commit details
    Browse the repository at this point in the history