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

32 Commits

Author SHA1 Message Date
James Chen 9336ab710f fix a logic error and a memory leak in CCLabelBMFont. 2013-03-20 13:55:43 +08:00
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc. 
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
 2013-03-05 17:01:00 -08:00
minggo 0070371045 issue #1686:synchronize CCLabelBMFont.cpp 2013-02-28 10:37:47 +08:00
James Chen 7dc64fc9a6 issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
walzer 1ab552b482 Add a sample doxygen sample in CCSprite.h and CCProtocol.h 2013-01-14 16:54:20 +08:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
minggo e19b418c62 issue #1555: update to v2.1 beta3 2012-11-15 17:16:51 +08:00
James Chen 2f5f7a601b issue #1526: Moved implementations of static functions in CCActionEase.h, CCLabelBMFont.h to CCActionEase.cpp, CCLabelBMFont.cpp. 2012-11-02 10:06:48 +08:00
walzer 06f639edab update copyright to 2012, update cocos2d version to 2.0.3 
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
 2012-09-24 21:22:20 +08:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
James Chen e2629ef175 Fixed some compile errors on win32. 2012-08-30 23:10:09 +08:00
Rolando Abarca b7a7eec7b8 typo 2012-08-27 08:43:40 -07:00
Rolando Abarca 188cb8052d fixes CCLabelBMFont create 
also, a small bug in CCMenuItemToggle
 2012-08-27 08:43:39 -07:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
James Chen 24e3ec7499 fixed #1336: Updated comment information for deprecated apis. 2012-06-20 14:31:36 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
James Chen 052d8ea931 fixed #1324: Added some create methods. Compiling successfully on win32 by vs2008. 2012-06-14 18:32:44 +08:00
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
 2012-06-14 17:36:31 +08:00
James Chen 7fe3f7357e issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
James Chen 3f7b44fc23 issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
Nicolas Gramlich 5550d9f2b0 Merge with gles20. 2012-06-13 15:56:52 -07:00
James Chen b770010c41 issue #1310: Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString. 
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
 2012-06-12 14:33:53 +08:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
minggo 6b7a59f007 issue #1310:synchronize CCLableAtlas and CCLabelBMFont 2012-06-08 15:29:47 +08:00
Nicolas Gramlich 2d86a4089c CCLabelBMFont: Now using std::string to store internal data instead of just storing a 'foreign' const char *. 2012-06-05 17:11:50 -07:00
Nicolas Gramlich 8dbe897755 CCLabelBMFont: Made fntFile a property. (According to: ffbdb60a5908f5baef227bb0365a0b2653a3a59a) 2012-06-01 11:59:10 -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
James Chen 1d94ba05a0 fixed #1189: updated linebreak and tab(4 space) for all source files. 2012-04-25 18:17:04 +08:00
James Chen a5f0bc3cbc fixed #1189: syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes 2012-04-25 18:08:23 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00