Commit Graph

19 Commits

Author SHA1 Message Date
andyque 3e1f7119f9 add virtual destructor 2014-08-11 15:54:40 +08:00
Dhilan007 b9cfa4a8b5 fix warn 2014-07-25 14:38:02 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
andyque bd663ac55e fix margin zero 2014-06-27 15:39:10 +08:00
andyque c5a118ee1b refactor UILayoutExecutant to LayoutManager 2014-05-28 10:11:49 +08:00
andyque e32a637bf5 add const to ui framework methods 2014-05-27 11:30:35 +08:00
andyque b434840bc9 issue #5183, add layout parameter type to widget for convenient access 2014-05-16 10:33:28 +08:00
andyque 1b3c28ea90 Merge branch 'v3' into refactorLayout
Conflicts:
	cocos/ui/UILayout.cpp
2014-05-16 10:22:53 +08:00
andyque b32ca246e7 issue #5183, done 2014-05-15 10:44:19 +08:00
minggo ccb55448da Merge pull request #6685 from andyque/refactor5118
closed #5118, remove WidgetType and refactor LayoutType to Type
2014-05-13 11:35:36 +08:00
Dale Stammen bad71e38d0 fixed for ABSOLUTE and RELATIVE winrt compiler reserved words 2014-05-12 09:26:39 -07:00
andyque a0a4df5ac5 closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
andyque da3e794631 issue #5057, convert const char* to std::string& 2014-05-12 14:59:00 +08:00
andyque e1fe26543d issue #5057, refactor & remove deprecated warnings 2014-05-09 18:37:22 +08:00
andyque 264769f814 issue #5057, refactor LinearGravity 2014-05-09 17:54:25 +08:00
andyque 0c0f18e7f3 issue #5047, refactor LayoutParameterType 2014-05-09 17:38:05 +08:00
andyque d12a71f738 issue #5057, refactor UILayoutDefine 2014-05-09 17:16:11 +08:00
CaiWenzhi 243b7e5822 Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00