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

4329 Commits

Author SHA1 Message Date
Nicolas Gramlich 7cb3be2057 Minor change. 2012-05-31 17:01:01 -07:00
Nicolas Gramlich b63559d86d Added CCBFileLoader.cpp. Fixed a bug in CCNodeLoader::onHandlePropTypeSize. 2012-05-31 14:57:13 -07:00
Nicolas Gramlich 39442e9bb6 Merged with gles20. 2012-05-31 13:10:51 -07:00
Nicolas Gramlich 4a027082be Pulled changes from github. 2012-05-31 13:08:33 -07:00
Nicolas Gramlich 8a01e33491 Added CCScale9SpriteLoader. 2012-05-31 12:38:00 -07:00
Nicolas Gramlich 948fcc3d07 CCScale9Sprite: Moved anchorpoint initialization back to updateWithBatchNode, since this is probably the intended location, but causes problems due to the order properties appear in the CCBI file format. 2012-05-31 12:37:28 -07:00
Nicolas Gramlich 8678a14b6e CCScale9Sprite: Added initialization of insets. Moved setting the default anchorpoint to its constructor. 2012-05-31 12:03:33 -07:00
Nicolas Gramlich fe9fb347aa CCScale9Sprite: Added support for insets by floats and CCRect. Fixed bug for positioning for uneven insets. Changing texture no longer affects the anchor point. Made it possible to set the SpriteFrame. (Changes according to https://github.com/YannickL/CCControlExtension/commits/gles20: d00c4f90ab53d5295bce03123ddbccc4fa0acf58, ed56cb1558c755748437d152f2f7a4bb5a1455ba, c4bbcb9beb2febfb4b55323709e30082af902c90, 5da062de92d39d91b014f87809fc30ba501538fc) 2012-05-31 11:47:16 -07:00
James Chen 41be8ff832 Merge pull request #953 from dumganhar/iss1280_labeltest 
fixed #1280: BitmapFontMultiLineAlignment test can't work correctly.
 2012-05-31 00:42:01 -07:00
James Chen 63a6b97bc5 fixed #1280: Renamed some functions. 2012-05-31 15:32:18 +08:00
James Chen b39af18a5f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1280_labeltest 2012-05-31 13:08:19 +08:00
James Chen cec50ae2d8 fixed #1280: BitmapFontMultiLineAlignment test can't work correctly. 
We should invoke 'this->setString(m_sString_initial.c_str(), true);' in the 'CCLabelBMFont::updateLabel'.
 2012-05-31 13:07:25 +08:00
minggo f583ad2f7a Merge pull request #950 from minggo/gles20 
Gles20
 2012-05-30 20:14:37 -07:00
minggo 3cdb10c613 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-31 11:13:40 +08:00
minggo 30fedb78d5 update changelog 2012-05-31 11:07:08 +08:00
minggo 34c0b96018 Merge pull request #949 from minggo/gles20 
modify android template comment and modify engine version
 2012-05-30 19:15:08 -07:00
James Chen c596257a6d Merge pull request #948 from dumganhar/gles20 
Updated main.cpp for each project of android.
 2012-05-30 19:14:41 -07:00
minggo 9237804b29 modify engine version 2012-05-31 10:14:00 +08:00
James Chen 9be586e4ec Updated main.cpp for each project of android. 2012-05-31 10:13:05 +08:00
minggo 97fbcf6b6a fixed #1191: modify comment 2012-05-31 10:11:24 +08:00
minggo b09155c60e Merge pull request #947 from minggo/gles20 
fixed #1191: update xcode template
 2012-05-30 18:53:28 -07:00
minggo a283bfed4f fixed #1191: update xcode template 2012-05-31 09:52:39 +08:00
Nicolas Gramlich b7130c3d63 Added (dysfunctional) CCScale9SpriteLoader. 2012-05-30 16:52:02 -07:00
Nicolas Gramlich 6e9fac0a58 Cleanup. 2012-05-30 16:51:33 -07:00
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
minggo 5ad2bec3d8 Merge pull request #946 from minggo/gles20 
fix some bug
 2012-05-30 03:33:19 -07:00
minggo a698f9bf69 fix some bug 2012-05-30 18:31:20 +08:00
James Chen 89ea703dad Merge pull request #945 from dumganhar/gles20 
fixed #1279: NodeNonOpaqueTest can't be shown correctly.
 2012-05-30 03:31:11 -07:00
James Chen 6be44ad7b0 fixed #1279: NodeNonOpaqueTest can't be shown correctly. 2012-05-30 18:30:11 +08:00
James Chen 24a001a282 Merge pull request #944 from dumganhar/gles20 
Updated TouchesTest.
 2012-05-30 01:57:34 -07:00
James Chen 922f7544ad Updated TouchesTest. 2012-05-30 16:55:46 +08:00
James Chen 7a32a27f1e Merge pull request #943 from dumganhar/gles20 
fixed #1277: CCToggleVisibility should implement copyWithZone.
 2012-05-30 01:36:13 -07:00
James Chen cbb45c7ecd Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-30 16:35:08 +08:00
James Chen 93d1879a56 fixed #1277: CCToggleVisibility should implement copyWithZone. 2012-05-30 16:34:42 +08:00
James Chen 4a4a99caa0 Merge pull request #942 from dumganhar/gles20 
issue #1275: Memory leaks in CCBReader and ActionsTest.
 2012-05-30 01:28:28 -07:00
James Chen 5b4495d982 Opened assert for CCTexture2D::setTexParameters and generateMipmap. 2012-05-30 16:26:47 +08:00
James Chen bd248b5ac0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-30 16:09:52 +08:00
James Chen 7115a7f3c9 issue #1275: Memory leaks in CCBReader and ActionsTest. 2012-05-30 16:09:19 +08:00
minggo 80389d0611 Merge pull request #941 from minggo/gles20 
fix some bugs
 2012-05-30 00:44:22 -07:00
minggo 4428810fd5 fixed some bugs 2012-05-30 15:42:29 +08:00
James Chen b662784730 Merge pull request #940 from dumganhar/gles20 
fixed #1273: Crash appears after clicking closed button in TextureCacheTest.
 2012-05-29 23:31:36 -07:00
James Chen 265cb135ad fixed #1273: Passed 'this' to unscheduleSelector rather than 'g_sharedTextureCache'. 2012-05-30 14:27:30 +08:00