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

19 Commits

Author SHA1 Message Date
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
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CaiWenzhi 767bf81e90 Modify renderers draw order define. 2014-01-03 15:46:42 +08:00
CaiWenzhi c516860017 Fixed bugs about color and opacity 2013-12-25 18:30:21 +08:00
CaiWenzhi 0dac69523c Remove "_renderer" from widget 2013-12-24 20:22:14 +08:00
CaiWenzhi 9aa85d2bd6 Remove NodeRGBA inherit 2013-12-23 15:02:52 +08:00
Ricardo Quesada cd0ba6850c Merge branch 'develop' into constructors_are_protected 2013-11-14 11:57:18 -08:00
CaiWenzhi 611ba9e9f5 Modify code criterion 2013-11-14 11:37:46 +08:00
Ricardo Quesada d590986e73 Constructors are protected 2013-11-13 15:55:36 -08:00
CaiWenzhi 1f389d3779 Rename event interface 2013-11-08 18:43:06 +08:00
CaiWenzhi da27169d45 add "setUserObject" method 2013-11-08 14:58:20 +08:00
CaiWenzhi 9f2297a5a6 add "retain" to listeners 2013-11-07 16:46:41 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00