Permalink
Switch branches/tags
Commits on May 7, 2017
  1. Merge pull request #441 from zsounder/v3

    dualface committed May 7, 2017
    avoid app crash when str is nil
Commits on May 5, 2017
  1. avoid app crash when str is nil

    zsounder committed May 5, 2017
    avoid app crash when str is nil
Commits on Dec 17, 2016
  1. Merge pull request #440 from yszheda/patch-2

    dualface committed Dec 17, 2016
    Make `json` support all `cjson` APIs
Commits on Dec 15, 2016
  1. Make `json` support all `cjson` APIs

    yszheda committed Dec 15, 2016
    The same [patch](chukong/quick-cocos2d-x#554) for [chukong/quick-cocos2d-x](https://github.com/chukong/quick-cocos2d-x). I'm not sure which quick-cocos2d-x repo is still active, so I make another PR here.
Commits on Aug 10, 2015
  1. Merge pull request #438 from yszheda/v3

    SunLightJuly committed Aug 10, 2015
    fix memory leak in UIListView
  2. fix memory leak in UIListView

    yszheda committed Aug 10, 2015
Commits on Jun 10, 2015
Commits on May 23, 2015
  1. fixed bugs in framework

    SunLightJuly committed May 23, 2015
Commits on May 5, 2015
Commits on Apr 17, 2015
  1. Fixed: compile error with wp8

    yinjimmy committed Apr 17, 2015
Commits on Apr 15, 2015
  1. Fixed: compile error with wp8

    yinjimmy committed Apr 15, 2015
Commits on Apr 3, 2015
  1. Merge pull request #422 from dualface/fix_touch_node

    SunLightJuly committed Apr 3, 2015
    Fix touch node
Commits on Apr 2, 2015
  1. Merge pull request #421 from htlxyz/v3

    hugohuang1111 committed Apr 2, 2015
    fixed the uiscrollview scroll bug when scale scrollview'parent
Commits on Mar 24, 2015
  1. Merge pull request #420 from wangyue9014/v3

    SunLightJuly committed Mar 24, 2015
    bugfix: use iterator and earse in loop lead to crash
Commits on Mar 16, 2015
  1. Merge pull request #419 from htlxyz/v3

    hugohuang1111 committed Mar 16, 2015
    modify hitTest function
  2. modify hitTest function

    hugohuang1111 committed Mar 16, 2015
Commits on Mar 6, 2015
  1. Merge pull request #416 from htlxyz/v3

    hugohuang1111 committed Mar 6, 2015
    remove uninvoke code
  2. remove uninvoke code

    hugohuang1111 committed Mar 6, 2015
  3. Merge pull request #415 from htlxyz/v3

    hugohuang1111 committed Mar 6, 2015
    add ccsloader2 for new json format export by ccs2
Commits on Mar 3, 2015
Commits on Feb 28, 2015
Commits on Feb 27, 2015
Commits on Feb 5, 2015
Commits on Feb 3, 2015
  1. Merge pull request #410 from htlxyz/v3

    hugohuang1111 committed Feb 3, 2015
    fixed #402
  2. fixed #402

    hugohuang1111 committed Feb 3, 2015