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

24 Commits

Author SHA1 Message Date
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
James Chen 76a560a474 issue #1310: Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
Nicolas Gramlich df571e9cbb 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
Nicolas Gramlich 6c5be5e56e CCScale9Sprite: Removed debug logging. 2012-06-04 15:30:03 -07:00
Nicolas Gramlich 9576db1e28 CCControlButton: Added LabelAnchorPoint property. (According to: https://github.com/YannickL/CCControlExtension/ : 623f10433a088140adbb1e1d7d6c97e1ae05adf9) 2012-06-01 15:10:20 -07:00
Nicolas Gramlich 18fba1664d CCControlButton: Added getters and setters for backgroundspriteframe, titlettf, titlettfsize, titleBMGont. Added ZoomOnTouchDown property. (According to: https://github.com/YannickL/CCControlExtension/ : 9dfb9d97a5fe729115b461d9a52ebc36aba51c72, b31256ad6b26e7f645719f203f0e72d717e68c75, 7a79cd702d4ccb958281bcec5d8a7658723f7c2a, c4bbcb9beb2febfb4b55323709e30082af902c90, d4a88349e1f60100225d49e43af587dc10def66f) 2012-06-01 12:29:48 -07:00
icewind ac268896f1 CCControlButton update. Added zoomOnTouchDown property and setPreferredSize 
Ported some functions from original CCControlExtensions repository.
Added feature to set the preferred size of the background sprite and
toggle zooming on TouchDown event
 2012-06-01 14:07:45 +04:00
Nicolas Gramlich 39442e9bb6 Merged with gles20. 2012-05-31 13:10:51 -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 ad50d6ee57 fixed #1270: Fixed some warning on win32. 2012-05-29 17:11:33 +08:00
Walzer 184b31efa3 fix compilation warnings on android & ios 2012-05-05 10:44:42 +08:00
James Chen 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
James Chen 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
James Chen 75da752aa9 issue #1114: fixed some memory leaks in CCControlExtension. 2012-04-17 17:14:59 +08:00
James Chen a215b037b2 fixed a bug in CCControlSwitch.cpp 2012-04-17 16:39:00 +08:00
James Chen 5ce950b961 fixed a memory leak in CCControl. 2012-04-17 16:37:04 +08:00
James Chen 92e44f1c78 Updated ios project configuration. 2012-04-17 16:14:32 +08:00
James Chen 413bc3c343 Finished CCControlSwitch.Added CCActionTween. 2012-04-17 16:00:18 +08:00
James Chen d4f1dcfc44 finished CControlColourPickerTest. 
moved extension resources to 'extensions' folder.
 2012-04-17 11:12:05 +08:00
James Chen 044729dab9 Updated CCControlExtension 2012-04-16 23:16:03 +08:00
James Chen 959acd556f first commit CCControlExtension. 2012-04-16 18:58:43 +08:00