Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Mar 28, 2012

  1. James Chen

    Update AUTHORS

    dumganhar authored
  2. minggo

    Merge pull request #818 from minggo/master

    win32 support ipad, new ipad
    minggo authored
  3. minggo

    fixed #1089: win32 support ipad, new ipad

    minggo authored
  4. minggo

    Merge pull request #817 from minggo/master

    win32 support retina
    minggo authored
  5. minggo

    fixed #1089: win32 support retina

    minggo authored
  6. James Chen

    Merge pull request #816 from dumganhar/iss995_marmalade

    fixed #995: Updated HelloLua.mkb for marmalade port.
    dumganhar authored
  7. James Chen

    fixed #995: Updated HelloLua.mkb for marmalade port.

    dumganhar authored
  8. James Chen

    Merge pull request #815 from dumganhar/iss737_marmalade

    fixed #737: 1. Removed the old parameter named viewId for SetTouchInfo in CCEGLView_marmalade.cpp.
    2. Removed unused function 'findTouch' in CCEGLView_marmalade.cpp.
    3. Removed "#include ,#include " in CCLabelBMFont.h, otherwise projects cannot be compiled successfully on bada platform.
    dumganhar authored
  9. James Chen

    Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into is…

    …s737_marmalade
    dumganhar authored
  10. minggo

    Merge pull request #814 from minggo/update

    modify android template because now it builds dependencies  from official repos and from sources
    minggo authored
  11. James Chen

    fixed #737: Removed the old parameter named viewId for SetTouchInfo i…

    …n CCEGLView_marmalade.cpp.
    
    And Removed unused function 'findTouch'.
    dumganhar authored
  12. minggo

    genereate new LuaCocos2d.cpp

    minggo authored
  13. James Chen

    Removed "#include <sstream> ,#include <iostream>" in CCLabelBMFont.h

    dumganhar authored
  14. minggo

    update to latest code

    minggo authored
  15. minggo

    Merge pull request #813 from minggo/master

    make build_native.sh accept ndk parameter
    minggo authored
  16. minggo

    make build_native.sh accept ndk parameter

    minggo authored
  17. minggo

    Merge pull request #812 from minggo/master

    merge pull request 786
    minggo authored
  18. minggo

    fixed #1075: fix some error for running hello.lua

    minggo authored
  19. minggo

    merge pull request 786

    minggo authored

Mar 27, 2012

  1. minggo

    update CHANGELOG

    minggo authored
  2. minggo

    fixed #1069: modify android template because now it builds dependenci…

    …es from official repos and from sources
    minggo authored
  3. minggo

    Merge pull request #810 from minggo/update

    support ipad3
    minggo authored
  4. minggo

    use ndkr7

    minggo authored

Mar 26, 2012

  1. minggo

    issue #1809: use ccc4f()

    minggo authored
  2. issue #1809: can load xxx.ipad-hd if it runs on new ipad and enalbe r…

    …etina
    honghui authored
  3. issue #1089 HelloWorld can run with modified code

    honghui authored
  4. minggo

    issue #1089:support new ipad

    minggo authored

Mar 22, 2012

  1. minggo

    Merge pull request #797 from l4u/dev

    More CCLOG changes from Objective-C to C
    minggo authored
  2. Leo Lou

    Change Objective-C %@ to %s or %p in using CCLOG

    l4u authored
  3. minggo

    Merge pull request #793 from l4u/dev

    fixed #1076: Fix wrong logging message in CCFileUtils
    minggo authored

Mar 21, 2012

  1. Leo Lou

    Convert NSString to CString in CCLOG

    l4u authored
  2. Leo Lou

    Fix wrong logging message in CCFileUtils. Convert Objective-C style t…

    …o C++
    l4u authored
  3. YuLei Liao

    fix Lua binding errors:

    * [tolua++] Invalid C++ Class register order
    * CCSequence, CCSpawn add methods for Lua binding
    * in Debug profile, remove TOLUA_RELEASE macro, let tolua++ do more check
    dualface authored

Mar 20, 2012

  1. YuLei Liao

    Merge branch 'master' of git://github.com/cocos2d/cocos2d-x into bugfix

    dualface authored
  2. YuLei Liao

    update lua binding, for latest cocos2d-x

    dualface authored
Something went wrong with that request. Please try again.