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
7fe3f7357e
issue #1324 : Reverted old interfaces.
2012-06-14 17:18:05 +08:00
3f7b44fc23
issue #1324 : Added create() for static member functions that new an autorelease object
2012-06-14 15:13:16 +08:00
29b22adccc
Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work.
2012-06-13 14:19:13 -07:00
6c5be5e56e
CCScale9Sprite: Removed debug logging.
2012-06-04 15:30:03 -07:00
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
8678a14b6e
CCScale9Sprite: Added initialization of insets. Moved setting the default anchorpoint to its constructor.
2012-05-31 12:03:33 -07:00
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
c5f7f15090
issue #1194 : Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView.
2012-04-27 18:47:49 +08:00
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
d4f1dcfc44
finished CControlColourPickerTest.
...
moved extension resources to 'extensions' folder.
2012-04-17 11:12:05 +08:00
959acd556f
first commit CCControlExtension.
2012-04-16 18:58:43 +08:00
James Chen