Commit Graph

164 Commits

Author SHA1 Message Date
CaiWenzhi 8cfc6fcafb Remove useless samples 2014-01-07 09:47:46 +08:00
CaiWenzhi 60b340f2cd Modify wrong codes 2014-01-06 15:59:21 +08:00
CaiWenzhi 4d1d225bd1 Fixed bugs and memory leak 2014-01-06 15:07:04 +08:00
CaiWenzhi 63fbec05e9 Modify wrong codes 2014-01-06 12:19:59 +08:00
CaiWenzhi 1282debad5 Merge branch 'develop' into develop_nutty_modify_framework_addNode 2014-01-06 11:03:08 +08:00
CaiWenzhi ad30f8ff96 Fixed bug of clippinglayout 2014-01-06 10:56:33 +08:00
James Chen 03200374b0 Merge pull request #4887 from Dhilan007/develop_crash
fix crash related to not support the z length modifier for size_t on vs
2014-01-04 20:10:40 -08:00
Dhilan007 49d8b76b9e fix crash related to not support the z length modifier for size_t on vs 2014-01-05 11:59:32 +08:00
James Chen 6827538802 Adds override keyword for override functions. 2014-01-04 18:12:09 +08:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
James Chen 32546b58f9 Merge pull request #4840 from nutty898/develop_nutty_modify_framework_addNode
Develop nutty modify framework add node
2014-01-03 18:53:51 -08:00
James Chen 46153d8c34 More warning fixes. 2014-01-04 09:17:37 +08:00
CaiWenzhi 8c5678a59e Modify wrong codes. 2014-01-03 20:35:14 +08:00
CaiWenzhi 785e1740e4 Add "addNode" methods 2014-01-03 20:29:16 +08:00
CaiWenzhi 3ccb80085f Fixed bugs of page view 2014-01-03 19:14:17 +08:00
CaiWenzhi 767bf81e90 Modify renderers draw order define. 2014-01-03 15:46:42 +08:00
CaiWenzhi 9c0e669e09 Add "override" 2014-01-03 15:14:48 +08:00
CaiWenzhi 7d8d645c70 Modify "include" 2014-01-03 12:15:42 +08:00
CaiWenzhi e734f3ccaf optimize button 2014-01-03 12:14:21 +08:00
James Chen 69d681e343 Merge pull request #4781 from dumganhar/js-ui-test
Updates JSB gui test
2014-01-01 22:44:25 -08:00
James Chen efc7effac5 Adds override keyword for some override methods in gui::Widget class. 2014-01-02 14:20:52 +08:00
Lee, Jae-Hong c44dea5eb8 [Win32] Update project files.
- lIbGUI
2014-01-02 12:49:56 +09:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00
CaiWenzhi e5b0bbad74 Fixed bugs 2013-12-30 14:40:49 +08:00
James Chen b17117a1a1 More warning fixes. 2013-12-28 14:34:52 +08:00
CaiWenzhi d8a5fd6af4 Modify wrong codes 2013-12-27 18:23:53 +08:00
CaiWenzhi b2da9d2da5 Fixed bugs 2013-12-27 17:58:00 +08:00
CaiWenzhi 495e574f44 Fixed bugs 2013-12-27 17:22:51 +08:00
CaiWenzhi 6123344d9b Modify location of members define 2013-12-27 16:07:02 +08:00
CaiWenzhi e45c2a8601 Modify manager of some widgets' children 2013-12-27 16:01:03 +08:00
CaiWenzhi 1a486f22ec Add "override" 2013-12-27 15:15:11 +08:00
Dhilan007 861925e752 fix compiling error in vs project on win7. 2013-12-27 14:38:22 +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 946dab0b34 Modify android mk 2013-12-26 12:23:58 +08:00
CaiWenzhi b1d2aa9b79 Modify CMakeList 2013-12-26 11:25:49 +08:00
CaiWenzhi 581678b6b0 Modify android mk 2013-12-26 11:06:10 +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 f355fa6201 Fixed bugs 2013-12-24 11:18:25 +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
boyu0 4d0e3dbd8d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-06 18:16:26 +08:00
boyu0 af5f496861 issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed. 2013-12-06 18:07:16 +08:00
minggo fa7c97171b fix some warnings 2013-12-06 16:32:06 +08:00
James Chen 23de9bf8cd Merge pull request #4378 from hulefei/dev_addGuiNamespace
add gui namespace before SEL_TouchEvent
2013-11-26 01:43:36 -08:00
hanson d650c0a6a1 add gui namespace before SEL_TouchEvent 2013-11-26 17:03:01 +08:00
Ricardo Quesada a26b385b11 Merge branch 'develop' into constructors_are_protected 2013-11-21 10:56:03 -08:00
Ricardo Quesada d3c44cbb0b Merge branch 'develop' into constructors_are_protected
Conflicts:
	cocos/2d/CCLayer.h
2013-11-20 11:23:03 -08:00
samuele3 07ea8647c3 Add doxygen comments for the CocoStudio 2013-11-20 15:07:34 +08:00
samuele3 3ed7a79a84 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-20 13:01:07 +08:00
samuele3 8a408f9951 Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
James Chen da8c34d994 Fix of unsigned / signed mismatch in UIPageView.cpp. 2013-11-20 11:20:35 +08:00
Ricardo Quesada 9a51d6c0ba Merge branch 'develop' into constructors_are_protected 2013-11-19 17:59:43 -08:00
Ricardo Quesada 0d750cdbaf Adds virtual destructors on Interfaces
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to  Interface classes

And also enables  'warn on  missing virtual destructors'
2013-11-19 16:57:23 -08:00
Ricardo Quesada c943702bc8 Merge branch 'develop' into constructors_are_protected
Conflicts:
	cocos/editor-support/cocostudio/CCActionObject.cpp
	samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
2013-11-18 11:07:15 -08:00
Ricardo Quesada 417657b5a9 Merge branch 'develop' into constructors_are_protected 2013-11-15 10:11:49 -08:00
CaiWenzhi 71ff8fef9c Fixed crash 2013-11-15 22:25:29 +08:00
CaiWenzhi 75d9bde459 Modify relative layout 2013-11-15 14:37:34 +08:00
CaiWenzhi 1730fcddcb Modify layout 2013-11-15 13:29:39 +08:00
Ricardo Quesada cd0ba6850c Merge branch 'develop' into constructors_are_protected 2013-11-14 11:57:18 -08:00
CaiWenzhi 5f22edf095 fixed bug of widget 2013-11-14 15:42:59 +08:00
CaiWenzhi dee5305f7b fixed bugs of widget 2013-11-14 14:46:44 +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
Ricardo Quesada d590986e73 Constructors are protected 2013-11-13 15:55:36 -08:00
CaiWenzhi 3ac054edbd Fixed bugs 2013-11-13 20:38:18 +08:00
CaiWenzhi 5f68e028b5 Modify reader and fixed bugs 2013-11-13 20:01:57 +08:00
minggo 44bed76c21 Merge pull request #4175 from nutty898/develop_nutty_optimizeguireader_3
[ci skip]Develop nutty optimizeguireader 3
2013-11-11 17:36:22 -08:00
James Chen 51cfd3fb4b Merge pull request #4151 from pyrasis/develop
[Win32] fix compile error.
2013-11-11 04:42:42 -08:00
CaiWenzhi b688e39584 Merge branch 'develop' into develop_nutty_optimizeguireader_3 2013-11-11 18:23:21 +08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
Lee, Jae-Hong e132142689 [Win32] Update libGUI project
- Update files list.
2013-11-09 23:57:18 +09:00
Lee, Jae-Hong 3d23ca328e [Win32] fix compile error.
- fix C2552 error in VS2012.
2013-11-09 23:56:24 +09: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 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 18f411fd1e Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-08 11:36:59 +08:00
Ricardo Quesada ffd4342548 Adds more strings
and more `override`
and fixes some indetentation issues
2013-11-07 12:42:16 -08:00
Ricardo Quesada e4662b371a TextField uses std::string& in the public API
and uses std::string instead of std::string* internally
2013-11-07 11:58:48 -08:00
CaiWenzhi c69163559b Move some method from helper to reader 2013-11-07 21:26:56 +08:00
CaiWenzhi 9b4aa95b31 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-07 21:18:21 +08:00
minggo 237f7a7839 Merge pull request #4125 from minggo/fix-compiling-error
[ci skip]fix compiling erros on Android
2013-11-07 02:04:27 -08:00
CaiWenzhi b0a422eb09 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-07 17:40:13 +08:00
minggo b9b14571ac fix compiling erros on Android 2013-11-07 17:16:31 +08:00
CaiWenzhi e2249c8c3f Fixed crash 2013-11-07 17:15:52 +08:00
CaiWenzhi 9f2297a5a6 add "retain" to listeners 2013-11-07 16:46:41 +08:00
samuele3 9f5095b9c3 Reslove the compiled error 2013-11-07 16:43:04 +08:00
samuele3 e6fd1fece1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck 2013-11-07 15:28:48 +08:00
CaiWenzhi af5ab02bc7 temp commit 2013-11-07 14:00:51 +08:00
CaiWenzhi fa0011346e fixed linux build error 2013-11-07 09:58:24 +08:00
Ricardo Quesada ddb0111392 continue replacing `const char*` with `const std::string&`
This patch includes:

* Continue replacing `const char*` with `const std::string&`  where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -08:00
CaiWenzhi 94896b5b74 Modify mk files 2013-11-06 17:20:14 +08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
Conflicts:
	cocos/gui/UIHelper.h
2013-11-06 16:13:10 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
samuele3 b76865c692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 15:11:05 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00