Commit Graph

19 Commits

Author SHA1 Message Date
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
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority...
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
James Chen b17117a1a1 More warning fixes. 2013-12-28 14:34:52 +08:00
CaiWenzhi 495e574f44 Fixed bugs 2013-12-27 17:22:51 +08:00
CaiWenzhi e45c2a8601 Modify manager of some widgets' children 2013-12-27 16:01:03 +08:00
CaiWenzhi 067af2fb93 optimize loop 2013-12-26 16:17:52 +08:00
CaiWenzhi 530f82ee27 Add refresh layout method 2013-12-26 14:57:30 +08:00
CaiWenzhi 9aa85d2bd6 Remove NodeRGBA inherit 2013-12-23 15:02:52 +08:00
Ricardo Quesada 99ae4d86d3 fixes compiler warnings
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
2013-12-19 12:23:42 -08:00
CaiWenzhi 2432e6e40d add "override" 2013-11-14 13:42:10 +08:00
CaiWenzhi 611ba9e9f5 Modify code criterion 2013-11-14 11:37:46 +08:00
CaiWenzhi a0f794b7df optimize layout 2013-11-08 23:26:44 +08:00
CaiWenzhi 8a5084effa add list view event 2013-11-08 20:29:49 +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