9 Commits

Author	SHA1	Message	Date
James Chen	19c96632b5	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
James Chen	22b2f722b5	fixed #1220: 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 #1204: Removed CCApplication::initInstance.	2012-05-02 17:50:26 +08:00
minggo	75601fbc02	fixed #1201: simplify the writing of Android.mk and correct corresponding template	2012-05-02 17:29:16 +08:00
James Chen	a998062c57	issue #1194: Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup.	2012-05-02 12:04:27 +08:00
James Chen	b21944e1d3	issue #1190: Updated main.cpp and Android.mk for HelloLua project of android.	2012-04-26 11:45:22 +08:00
James Chen	230b8a386b	issue #1176: 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