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

10 Commits

Author SHA1 Message Date
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
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 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
James Chen c5cf23c859 issue #1310: First commit since sync to rc2. 2012-06-08 14:11:48 +08:00
Nicolas Gramlich 8576837e5e CCParticleSystemQuad: Added CCParticleSystemQuad::node(). 2012-06-01 16:38:43 -07:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00