Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/extensions/CCControlExtension
History
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
..
CCControl.cpp Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCControl.h Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCControlButton.cpp Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCControlButton.h Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCControlColourPicker.cpp Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCControlColourPicker.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCControlExtensions.h issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCControlHuePicker.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCControlHuePicker.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCControlSaturationBrightnessPicker.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCControlSaturationBrightnessPicker.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCControlSlider.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCControlSlider.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCControlSwitch.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCControlSwitch.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCControlUtils.cpp issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
CCControlUtils.h 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
CCInvocation.cpp CCControlExtension: Added support for SEL_CCControlHandler (as opposed to SEL_MenuHandler), which also passes the CCControlEvent parameter. 2012-06-06 14:31:14 -07:00
CCInvocation.h CCControlExtension: Added support for SEL_CCControlHandler (as opposed to SEL_MenuHandler), which also passes the CCControlEvent parameter. 2012-06-06 14:31:14 -07:00
CCMenuPassive.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCMenuPassive.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCScale9Sprite.cpp Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCScale9Sprite.h Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCSpacer.cpp 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
CCSpacer.h 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