Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: develop

Apr 16, 2014

  1. James Chen

    Merge pull request #6289 from lmskater/create-save-apk

    [Jenkins][ci skip] Create and save cpp-empty-test apk for autotest
    authored
  2. James Chen

    Merge pull request #6282 from shujunqiao/empty-test

    [ci skip], add emptytest.py
    authored

Apr 15, 2014

  1. Ricardo Quesada

    Merge pull request #6290 from ricardoquesada/fix_changelog

    argh... changelog is outdated
  2. Ricardo Quesada

    argh... changelog is outdated

  3. shujun.qiao

    [ci skip], modify apk path.

    authored
  4. lmskater

    [Jenkins][ci skip] Create and save cpp-empty-test apk for autotest

    authored
  5. shujun.qiao

    [ci skip], modify information of print.

    authored
  6. minggo

    Merge pull request #6287 from minggo/update-version

    update version information
    authored
  7. minggo

    update version information

    authored
  8. shujun.qiao

    [ci skip], modify print infomation in emptytest.py

    authored
  9. minggo

    Merge pull request #6286 from dumganhar/rename-listener-method

    Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'-> 'EventListener::(s|g)etAssociatedNode'
    authored
  10. minggo

    Merge pull request #6285 from dumganhar/template-ios5.1-crash-fix

    closed #4607: Fixed project created by template crashes on iOS5.1 device...
    authored
  11. James Chen

    Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'

    -> 'EventListener::(s|g)etAssociatedNode'
    authored
  12. James Chen

    closed #4607: Fixed project created by template crashes on iOS5.1 dev…

    …ice.
    authored
  13. minggo

    Merge pull request #6284 from natural-law/issue4849

    The environment variable take effect without reboot machine on windows
    authored
  14. Bin Zhang

    closed #4849, The environment variable take effect without reboot mac…

    …hine on windows.
    authored
  15. James Chen

    Merge pull request #6283 from CocosRobot/update_lua_bindings_1397533229

    [AUTO]: updating luabinding automatically
    authored
  16. CocosRobot

    [AUTO]: updating luabinding automatically

    authored
  17. Ricardo Quesada

    Merge pull request #6281 from ricardoquesada/autoculling_working_ok

    Culling working again
  18. Ricardo Quesada

    compiles on windows

Apr 14, 2014

  1. Ricardo Quesada

    Culling working again

  2. minggo

    Merge pull request #6280 from chuanweizhang2013/luaruntime

    update
    authored
  3. Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/coc…

    …os2d-x into luaruntime
    authored
  4. add no-res

    authored
  5. minggo

    Merge pull request #6279 from minggo/update-console

    update console submodule
    authored
  6. minggo

    update console submodule

    authored
  7. shujun.qiao

    [ci skip], add emptytest.py

    authored
  8. minggo

    Merge pull request #6277 from natural-law/issue4786

    Show tip message when python is not compatible.
    authored
  9. James Chen

    Merge pull request #6276 from dabingnn/develop_fix_depth_in_IOSvertexZ

    manually enable depth test in test case TMXIsoVertexZ
    authored
  10. Bin Zhang

    closed #4786, Show tip message when python is not compatible.

    authored
  11. chuanweizhang2013

    Merge pull request #24 from cocos2d/develop

    update cocos2d-x
  12. Huabing.Xu

    manually enable depth test in test case TMXIsoVertexZ

    authored
  13. minggo

    Merge pull request #6273 from CocosRobot/update_lua_bindings_1397458473

    [AUTO]: updating luabinding automatically
    authored
  14. CocosRobot

    [AUTO]: updating luabinding automatically

    authored
  15. minggo

    Merge pull request #6257 from dumganhar/group-command-manager-not-sin…

    …gleton
    
    GroupCommandManager should not be a singleton, it should be managed by Renderer.
    authored
Something went wrong with that request. Please try again.