Commit Graph

12 Commits

Author SHA1 Message Date
James Chen 22b2f722b5 fixed : Using CCString::stringWithContentsOfFile to get string from lua script files. 2012-05-04 14:31:56 +08:00
James Chen 395dbc90aa Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
Conflicts:
	lua/cocos2dx_support/LuaCocos2d.cpp
2012-05-02 18:23:16 +08:00
James Chen 5fc72581cb issue : Removed CCApplication::initInstance. 2012-05-02 17:50:26 +08:00
minggo 75601fbc02 fixed : simplify the writing of Android.mk and correct corresponding template 2012-05-02 17:29:16 +08:00
James Chen a998062c57 issue : Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup. 2012-05-02 12:04:27 +08:00
James Chen 6f62251bb6 fixed : Updated some .pkg files. 2012-04-26 14:32:17 +08:00
James Chen 394622f538 issue : Updated HelloLua.java and Cocos2dxGLSurfaceView.java, make HelloLua app support opengles2.0. 2012-04-26 12:06:51 +08:00
James Chen 8d63e9f1bd issue : Updated some files for android port. 2012-04-26 11:52:21 +08:00
James Chen b21944e1d3 issue : Updated main.cpp and Android.mk for HelloLua project of android. 2012-04-26 11:45:22 +08:00
James Chen d1d0fd619a issue : Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration. 2012-04-20 15:23:00 +08:00
James Chen 230b8a386b issue : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen 4068be84e9 Refactored project folders. 2012-04-19 11:46:08 +08:00