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

18 Commits

Author SHA1 Message Date
CaiWenzhi 1606671224 Fixed bug of Text 2014-03-07 12:05:33 +08:00
CaiWenzhi 94339312ba Modify text filed size control 2014-03-06 21:58:45 +08:00
CaiWenzhi 2a5ecc2376 Fixed bugs of Flipping 2014-03-06 13:40:46 +08:00
CaiWenzhi ab47cafb31 Merge branch 'develop' into develop_nutty_modify_framework_for315 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/gui/UIButton.cpp
	cocos/gui/UIButton.h
	cocos/gui/UIWidget.h
 2014-03-05 16:52:31 +08:00
pandamicro 364317b532 Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes 2014-03-04 23:42:58 +08:00
CaiWenzhi 4a2dc4a607 Add custom widget and reader 2014-03-04 16:51:35 +08:00
CaiWenzhi c615811124 Modify methods of Changing color and opacity. 2014-03-03 23:24:57 +08:00
cai wenzhi 683d3c9f14 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
cai wenzhi 4f90676e92 Add method for editor 2014-03-01 22:34:25 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
CaiWenzhi f33064a2fc Fixed bug of label 2014-01-17 15:22:59 +08:00
James Chen 26efb4bf5c long —> ssize_t for some classes. 2014-01-07 18:26:31 +08:00
Zhe Wang 9b6027d284 Merge pull request #4947 from walzer/develop 
udpate copyrights for the new year 2014 and Chukong.
 2014-01-06 19:50:18 -08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CaiWenzhi 8cfc6fcafb Remove useless samples 2014-01-07 09:47:46 +08:00
CaiWenzhi 4d1d225bd1 Fixed bugs and memory leak 2014-01-06 15:07:04 +08:00
CaiWenzhi 767bf81e90 Modify renderers draw order define. 2014-01-03 15:46:42 +08:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00