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

3918 Commits

Author SHA1 Message Date
Nicolas Gramlich 36e6d94d46 Added setter for dimensions of CCLabelTTF (According to: 302dd76b4f87ddb18cc571ebec3be0811ea534ca). 2012-05-30 16:49:51 -07:00
Nicolas Gramlich d0f101b820 Added missing ASSERT_FAIL_UNEXPECTED_PROPERTY in CCNOdeLoader::onHandlePropTypeSize. 2012-05-30 16:14:02 -07:00
Nicolas Gramlich 6b3fa4abb6 Added CCLabelTTFLoader. 2012-05-30 15:38:20 -07:00
Nicolas Gramlich 5578521a69 Fixed CCLabelBMFontLoader (according to changes in: 827ee160b5). 2012-05-30 15:37:36 -07:00
Nicolas Gramlich c754dac31b Added missing case kCCBPropTypeFontTTF in CCNodeLoader::parseProperties. 2012-05-30 15:36:00 -07:00
Nicolas Gramlich 9ca7fa468a Added default init method for CCLabelTTF (See: 24125b93aad2d4fc7ebf1bc6e4ef6b8b83ff770d). 2012-05-30 15:34:50 -07:00
Nicolas Gramlich 827ee160b5 Added support for initializing a CCLabelBMFont without a fntfile and a string. (See: ffbdb60a5908f5baef227bb0365a0b2653a3a59a, a6749b38f8085ba81921063328bc50cb7a989613, e6e3917c0c3f2e95e13c3be29584cb9e3781d3a7). 2012-05-30 15:31:08 -07:00
Nicolas Gramlich a7d4fa619d Removed CCBReader to avoid conflicts. 2012-05-30 11:30:53 -07:00
Nicolas Gramlich 56ea340314 Current state of the CCB(I)Reader (dysfunctional due to CCLabelBMFont problems). 2012-05-30 11:28:50 -07:00
Nicolas Gramlich d69bc23894 Initial version of CCBReader reading ccbi format. (Only reads and checks the header so far). 2012-05-22 17:38:33 -07:00
Nicolas Gramlich 119abc6194 Fixed Xcode template to include fps_images.fnt/png (Problem: there is no way to add it as a folder reference.) 2012-05-22 14:06:56 -07:00
Nicolas Gramlich 5d3d744667 Added fps_images.fnt/png to HelloLua resources. 2012-05-22 13:27:59 -07:00
Nicolas Gramlich d516a61114 Merge branch 'gles20' of github.com:nicolasgramlich/cocos2d-x into gles20 2012-05-22 13:26:50 -07:00
Nicolas Gramlich a62e017977 Made MenuTest use a differently names labelatlas to avoid collision with fps_images.fnt/png. 2012-05-22 13:26:20 -07:00
Nicolas Gramlich ddf9f24369 Added newline at end of fps_images.fnt. 2012-05-21 18:15:16 -07:00
Nicolas Gramlich 9883194d8e Update HelloWorld/Resources/fonts/fps_images.fnt 2012-05-21 17:59:47 -07:00
Nicolas Gramlich ff71f07ac3 Updated AUTHORS. 2012-05-21 17:38:36 -07:00
Nicolas Gramlich 15ef23bac8 Removed assert which prevented CCSpriteBatchNode from being used as a root node. (Discussed this with Ricardo Quesada) 2012-05-21 17:38:24 -07:00
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