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

3900 Commits

Author SHA1 Message Date
Nicolas Gramlich 83ef3d828f Added fps_images.fnt/png to Microsoft Visual Studio template. 2012-05-21 17:31:06 -07:00
Nicolas Gramlich 51b9df5737 Added fps_images.fnt/png to xcode4 base ios template. 2012-05-21 17:29:27 -07:00
Nicolas Gramlich 320b181dbf CCDirector stats labels are now CCLabelBMFont instead of CCLabelTTF. 2012-05-21 17:20:47 -07:00
Walzer 9ee1b32c26 Merge pull request #903 from walzer/gles20 
add CCBReader_v2.cpp in vcproj & vcxproj
 2012-05-21 02:58:59 -07:00
Walzer 9ac0b68981 modify CCBReader.cpp to CCBReader_v2.cpp in vcproj/vcxproj. 2012-05-21 17:56:09 +08:00
minggo ce3aab085c Merge pull request #901 from minggo/iss1236_JniHelper 
Iss1236 jni helper
 2012-05-15 23:19:26 -07:00
minggo 683c91bbfa fixed #1236: return empty string when parameter is null 2012-05-16 14:17:37 +08:00
minggo 08430a6dbd Merge pull request #900 from minggo/iss1237_line_number 
Iss1237 line number
 2012-05-15 23:13:39 -07:00
minggo 1d18c6607a fixed #1237: correct line number output by CCAssert 2012-05-16 14:10:27 +08:00
Walzer a3bd26a52b modify CCBReader.cpp to CCBReader_v2.cpp in cocos2dx/Android.mk 2012-05-11 22:40:31 +08:00
Walzer 7dadd8128c rename tests/Resource/CocosBuilder to CocosBuilder_v1 2012-05-11 21:22:50 +08:00
Walzer f393aa6289 Merge pull request #899 from walzer/gles20 
support ccb file format v2, add relative-position support in ccb
 2012-05-11 06:20:04 -07:00
Walzer d6dde5a5ee move kBottomLeft series enum from CCNode.h to CCBReader.h 2012-05-11 21:10:02 +08:00
Walzer e453307823 Merge commit 'dc18dc0942fdbb1b0fd289760b0ee7de3c93570d' into gles20 2012-05-11 21:07:07 +08:00
Walzer dc18dc0942 test ccb v2 format, add relative-position support 2012-05-11 20:53:30 +08:00
Walzer 599036e562 merge parnet/gles20 2012-05-11 19:57:20 +08:00
Walzer 740038a73e Merge pull request #885 from walzer/gles20 
add CocosBuilder support for gles20 branch
 2012-05-07 22:38:12 -07:00
Walzer ae12434128 fixed #1205, rename CCCustomClass to CCCustomClassProtocol, add windows support. 2012-05-08 11:30:08 +08:00
Walzer f10b94fd15 issue #1205, CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported. 2012-05-07 22:52:58 +08:00
Walzer a91032ccb5 Merge commit 'e895a2a1e8109381329d7cd8e29c780b73643351' into gles20 2012-05-07 18:15:16 +08:00
Walzer 1a73064055 issue #1205, refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android 2012-05-07 18:14:15 +08:00
minggo e895a2a1e8 Merge pull request #895 from minggo/iss1232_cclayergradient 
Make CCLayerGradient have correct effect
 2012-05-07 02:19:40 -07:00
minggo 5388e9c863 fixed #1232: don't do type cast 2012-05-07 17:15:32 +08:00
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
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
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
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