Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,847 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

3847 Commits

Author SHA1 Message Date
Walzer 2fc1322cc8 update copyright and license declaration of CCCBReader relative files 2012-05-03 14:43:27 +08:00
Walzer 5faaab0d16 add CocosBuilderTest into extension test. fix a bug in CCLayerGradient::updateColor 2012-05-03 12:17:28 +08:00
Walzer 160b0aba88 Merge commit 'b7b21f3dc2e2c541a06fdd381b6b43d213a90093' into gles20 2012-05-03 12:02:13 +08:00
Walzer 9e62412ce9 issue #1205, add CCBReader, CppReflection, CocosBuilderTestCase 2012-05-03 11:58:53 +08:00
James Chen b7b21f3dc2 Merge pull request #882 from dumganhar/iss1211_ToEng 
fixed #1211: Translated Chinese comments to English for CCTextureWatcher and CCListView. And Updated AUTHORS file.
 2012-05-02 20:12:08 -07:00
James Chen b6a1e89aa5 fixed #1211: Translated Chinese comments to English for CCTextureWatcher and CCListView. And Updated AUTHORS file. 2012-05-03 11:09:27 +08:00
James Chen ec433b46cd Merge pull request #881 from dumganhar/iss1204_initInstance 
fixed #1204: Removed CCApplication::initInstance.
If users want to custom some features of CCEGLView, e.g. set the design resolution, they should add the following code in "HelloWorld/proj.win32/main.cpp" (on win32) or "HelloWorld/proj.android/jni/helloworld/main.cpp" (on android).

CCEGLView::sharedOpenGLView().setDesignResolutionSize(480, 320);
You should look into main.cpp files for detail infomations.

This commit also update something as follows:
1. Modified some project configuations for win32, we used MultiByte rather than Unicode as CharacterSet for all win32 projects, and removed some unused codes for win32 platform.
2. Made CCEGLView::Create(on win32) as a private function.
3. Updated ExtensionsTest.
4. Updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
 2012-05-02 19:38:34 -07:00
James Chen 82439733c5 fixed #1204: Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest. 
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
 2012-05-03 10:12:00 +08:00
James Chen 136866bc12 issue #1204: Updated tests/proj.win32/main.cpp 2012-05-02 18:56:03 +08:00
James Chen ca5ef69d50 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance 2012-05-02 18:44:30 +08:00
minggo 405deb6c67 Merge pull request #880 from minggo/iss1201_android_build 
Iss1201 android build
 2012-05-02 03:42:14 -07:00
minggo 4bcf67078d fixed #1201: add prebuilt libs 2012-05-02 18:37:37 +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 aa93497b45 Merge branch 'iss1204_initInstance' of https://github.com/dumganhar/cocos2d-x into iss1204_initInstance 2012-05-02 18:21:26 +08:00
minggo 7e882ae89e Merge pull request #879 from minggo/iss1201_android_build 
simplify writing of Android.mk
 2012-05-02 03:19:36 -07:00
James Chen 4580fffed7 issue #1204: Updated CCApplication.mm and ios template. 2012-05-02 18:18:43 +08:00
Walzer da2b2e42fc Merge commit '46f2abeb8ef9cbf5908608d7ea8b9d6002fc387f' into gles20 2012-05-02 18:16:28 +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 d68e6400e4 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-02 14:57:13 +08:00
James Chen 46f2abeb8e Merge pull request #878 from dumganhar/iss1206_remove 
fixed #1206: Removed some unused files, first release will only support ios, win32 and android.
 2012-05-01 23:54:42 -07:00
James Chen 61f33a87af fixed #1206: Removed some unused files, first release will only support ios, win32 and android. 2012-05-02 14:50:47 +08:00
minggo c048fe77c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build 2012-05-02 14:41:49 +08:00
James Chen e2e2798639 Merge pull request #877 from dumganhar/iss1194_tex_wat 
fixed #1194: Added CCTextureWatcher  and updated template files.
Also, added extension namespace, all extension classes are in cocos2d::extension namespace.
 2012-05-01 23:37:56 -07:00
James Chen db92c9c1dc Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat 2012-05-02 14:32:27 +08:00
James Chen a666dc7edb fixed #1194: Updated template file -- cocos2d_chipmunk.xctemplate/Classes/HelloWorldScene.cpp. 2012-05-02 14:31:46 +08:00
James Chen 547bd6910d fixed #1194: Updated ios template. 2012-05-02 14:29:36 +08:00
James Chen 99bc442dad #issue #1194: Updated chipmuck template for ios platform. 2012-05-02 14:17:14 +08:00
James Chen 77d9b811be issue #1194: Updated ChipmunkAccelTouchTest. 2012-05-02 14:06:40 +08:00
James Chen 41b1bca740 issue #1194: Updated the chipmuck template for ios platform. 2012-05-02 14:06:12 +08:00
James Chen 849a4ebc7f issue #1194: Updated the box2d template for ios platform. 2012-05-02 13:03:47 +08:00
James Chen 4a002ea9cc issue #1194: Updated ios template of box2d. 2012-05-02 12:51:48 +08:00
James Chen abdc94ae3c Merge branch 'iss1194_tex_wat' of https://github.com/dumganhar/cocos2d-x into iss1194_tex_wat 2012-05-02 12:05:39 +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 5c7e7f6563 issue #1194: Updated ios template. 2012-05-02 12:01:53 +08:00
minggo f37d3dd5d3 issue #1201: simplify writing of Android.mk 2012-05-02 12:00:39 +08:00
Walzer cb6a8e60df Add *.sdf into .gitignore, which would be generated by visual studio. Remove shell scripts for linux/bada/qnx at root folder. 2012-05-02 11:35:14 +08:00
minggo 741f219f16 issue 1201: remove module to prebuilt 2012-05-02 10:45:21 +08:00
minggo 57d6884757 rename modules to prebuilt 2012-05-02 10:44:40 +08:00
James Chen 63a8bbf0d9 issue #1194: Updated ios project configurations after adding CCTextureWatcher. 2012-05-02 10:39:39 +08:00
Walzer 2addd06f21 fixed #1203, remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone. 2012-05-02 10:39:17 +08:00
James Chen de35aaa101 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat 2012-05-02 09:49:12 +08:00
minggo 2223cbcd69 Merge pull request #876 from minggo/gles20 
optimize CCTextureCache::removeUnusedCache()
 2012-04-27 20:44:47 -07:00
minggo cbfe1e0d0c optimize CCTextureCache::removeUnusedCache() 2012-04-28 11:34:13 +08:00
minggo 53733091d3 Merge pull request #874 from minggo/iss931_refactor_ccimage_texture2d 
Iss931 refactor ccimage texture2d
 2012-04-27 18:48:11 -07:00
James Chen c5f7f15090 issue #1194: Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView. 2012-04-27 18:47:49 +08:00
minggo a4e8c9ad17 fixed #931: refactor CCImage and CCTexture2D 2012-04-27 18:37:11 +08:00
minggo a1570e931f issue #931:make convert to rgb565 and A8 correct 2012-04-27 15:53:29 +08:00
James Chen fd08f9852b issue #1194: Added some files refer to TextureWatcher. 2012-04-27 12:00:54 +08:00
James Chen 8af448f1ba Merge pull request #873 from dumganhar/iss931_minggo 
issue #931: refactor CCImage and CCTexture2D
 2012-04-26 03:21:37 -07:00