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

5428 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
Rolando Abarca bed6efa3cd adds "require" to the global namespace 2012-05-21 16:08:34 -07:00
Rolando Abarca 8196324e38 updates readme 2012-05-21 13:14:00 -07:00
Rolando Abarca 68ce2bd70c adds more bindings 
adds CCApplication, CCUserDefault and fixes a few
things in addChild
 2012-05-21 13:09:46 -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
Rolando Abarca 1dcce90b6d adds test for enums on native class 2012-05-18 15:21:24 -07: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
Rolando Abarca 07d8c781f7 updates readme 2012-05-14 16:55:16 -07:00
Rolando Abarca fb146129c1 adds TMX support for bindings 2012-05-14 15:55:27 -07:00
Rolando Abarca 57b3a9bdb5 adds simple transition test 2012-05-14 15:13:01 -07:00
Rolando Abarca 43387176b8 adds more bindings 2012-05-14 15:06:22 -07:00
Rolando Abarca 025da69340 more bindings 2012-05-14 12:57:14 -07:00
Rolando Abarca 5763726bb3 fixes broken Xcode project 2012-05-14 12:57:04 -07:00
Rolando Abarca 326e1752fb updates readme 2012-05-11 12:07:10 -07:00
Rolando Abarca 5f57e72eae adds the files for the bindings example 2012-05-11 12:03:32 -07: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
Rolando Abarca c0c42171bd updates generated cocos2d bindings 2012-05-10 16:04:18 -07:00
Rolando Abarca 8b5e30d71f minor edit (whitespace) 2012-05-10 16:04:04 -07:00
Rolando Abarca 2692de7de8 fixes evalString, error checking in runScript 2012-05-08 16:44:17 -07:00
Rolando Abarca 856ce0757c fixes addChild in order to match native version 2012-05-08 10:16:29 -07: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
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