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

4139 Commits

Author SHA1 Message Date
Walzer f039741e82 Merge commit 'c76e3c09367aea27c2428401c9d206b8ea017111' into gles20 2012-05-07 17:06:03 +08:00
Walzer c76e3c0936 remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now. 2012-05-07 17:05:17 +08:00
minggo 3c08053b0c Merge pull request #894 from minggo/iss1230_string_width 
fix a bug in calculating string width on iOS
 2012-05-06 19:19:19 -07:00
minggo ff6abd1d8c fixed #1230: fix a bug in calculating string width 2012-05-07 10:15:57 +08:00
Walzer 07276c3bba Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20 2012-05-05 15:49:11 +08:00
Walzer 184b31efa3 fix compilation warnings on android & ios 2012-05-05 10:44:42 +08:00
Walzer 6b374881f0 Merge branch 'gles20' of http://github.com/cocos2d/cocos2d-x into gles20 2012-05-05 10:07:21 +08:00
Walzer f70855e959 fixed #1229, reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency. 2012-05-05 10:06:41 +08:00
Walzer be2fa353a7 Merge commit '1afd7f2701b5e9fec0d2a4fd514d1d4e069b3830' into gles20 2012-05-05 09:55:06 +08:00
Rolando Abarca 0c408d98e5 adds test_sound.js to the list 2012-05-04 10:18:24 -07:00
Rolando Abarca 596b9fc450 some minor refactoring and adding resources 2012-05-04 10:17:59 -07:00
Rolando Abarca 8e4ab8edbc adds cocos denshion bindings 2012-05-04 10:17:41 -07:00
Rolando Abarca df7273086a test sound 2012-05-04 10:17:07 -07:00
Rolando Abarca 97bd8c356f renamed out.cpp to something more meaningful 2012-05-04 10:16:40 -07:00
minggo 1afd7f2701 Merge pull request #893 from minggo/iss1217_EaseAction_reverse 
Iss1217 ease action reverse
 2012-05-04 01:26:56 -07:00
minggo 14b923409a fixed #1217: implement reverse() for all subclass of CCEaseAction that missing it 2012-05-04 16:22:50 +08:00
James Chen dcf7c9e053 Merge pull request #892 from dumganhar/iss1220_getstring 
fixed #1220: Using CCString::stringWithContentsOfFile to get string from lua script files.
 2012-05-03 23:35:32 -07: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 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