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

4071 Commits

Author SHA1 Message Date
James Chen 9887be6624 Merge pull request #890 from dumganhar/iss1191_gles20_template 
issue #1191: Updated win32 template.
 2012-05-03 20:27:33 -07:00
James Chen bf0da624b4 issue #1191: Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10. 2012-05-04 11:16:57 +08:00
Rolando Abarca f3a37cc8b3 added more classes 2012-05-03 17:45:28 -07:00
Rolando Abarca 22e9fd86d6 adds TextureAtlas and SpriteBatchNode 2012-05-03 17:14:56 -07:00
Rolando Abarca a6785e18d0 defaults to test_actions 2012-05-03 17:14:44 -07:00
Rolando Abarca 716a4d8903 updates readme 2012-05-03 17:03:32 -07:00
Rolando Abarca cad87cd16e missing semi colon 2012-05-03 16:56:51 -07:00
Ricardo Quesada 7e655ae915 color works on particles 2012-05-03 16:56:51 -07:00
Ricardo Quesada 7e0c16c53d particle test: uses texturecache 2012-05-03 16:56:50 -07:00
Ricardo Quesada fe3880f0a6 more particle tests 2012-05-03 16:56:50 -07:00
Ricardo Quesada 4a7c9a5b74 more ease action tests 2012-05-03 16:56:50 -07:00
Rolando Abarca 071882df43 fixes color assignment 2012-05-03 16:42:10 -07:00
Rolando Abarca 2f715b0b0f really fixing the issue :) 2012-05-03 15:58:31 -07:00
Rolando Abarca 78df1d75a1 small fix 2012-05-03 15:54:55 -07:00
Rolando Abarca 4a6c4f9798 updates automatic bindings 2012-05-03 15:46:50 -07:00
Rolando Abarca 4d2a15b584 adds manual bindings 2012-05-03 15:46:35 -07:00
Rolando Abarca bb9764b4bb adds CCDelayTime binding 2012-05-03 11:59:47 -07:00
James Chen 47b8148064 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template 2012-05-04 02:08:31 +08:00
Rolando Abarca 1715c2f379 main test is test_actions 2012-05-03 09:38:51 -07:00
Rolando Abarca f4eb02b22a small typo 2012-05-03 09:32:12 -07:00
Rolando Abarca abeaf20155 Merge branch 'master' of https://github.com/ricardoquesada/testjs into testjs-ricardo 2012-05-03 09:28:03 -07:00
Rolando Abarca e23971c2a1 fixes some actions inheritance 2012-05-03 09:27:26 -07:00
minggo d924b5cd9a Merge pull request #887 from minggo/iss1212_android_crash 
Iss1212 android crash
 2012-05-03 02:39:47 -07:00
minggo 28ca8a4fb1 fixed #1216: change resource path of png in iso-test-bug787.tmx 2012-05-03 17:36:51 +08:00
minggo fc4937541e Merge pull request #886 from minggo/merge_iss1216 
Merge iss1216
 2012-05-03 01:34:40 -07:00
minggo 27b5fb8074 merge commit of issue 1216 2012-05-03 16:30:13 +08:00
Walzer a584aee897 issue #1205 update license declaration 2012-05-03 15:33:22 +08:00
Walzer ebaf1da460 issue 1205, CCBReader. Not perfect yet, I will use CCNotificationCenter to improve SET macro/assign var to parent. 2012-05-03 15:29:27 +08:00
James Chen 2e66f55219 Merge pull request #884 from dumganhar/iss1215_win_retina 
fixed #1215: fixed a bug in retina support for win32.
 2012-05-03 00:09:10 -07:00
James Chen 7cdb11b668 fixed #1215: fixed a bug in retina support for win32. 2012-05-03 15:05:19 +08:00
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
Ricardo Quesada ceba45aec3 More Ease tests 2012-05-02 18:15:12 -07:00
Ricardo Quesada ffbb36b5bd Added more particle tests 2012-05-02 16:35:02 -07:00
Rolando Abarca 8e60bf65d9 more updates to the readme 2012-05-02 15:50:08 -07:00
Rolando Abarca 97a6a17785 small update 2012-05-02 15:49:05 -07:00
Rolando Abarca f193f18858 adds more classes to the list of already binded 2012-05-02 15:47:13 -07:00
Rolando Abarca ba71b1f94f working particle test 2012-05-02 15:42:10 -07:00
Rolando Abarca 14a3a89072 fixes particles 2012-05-02 15:41:57 -07:00
Rolando Abarca 5ebc6265a7 adds simple c++ particle test 2012-05-02 15:41:51 -07:00
Rolando Abarca df43b3e728 updates cocos2d-x 2012-05-02 15:41:27 -07:00
Rolando Abarca edc49f2684 default test is actions 2012-05-02 15:11:14 -07:00
Rolando Abarca e32d47aacc working ease actions 2012-05-02 15:09:52 -07:00
Rolando Abarca 85f94c21c2 Merge branch 'master' into testjs-ricardo 2012-05-02 15:06:19 -07:00