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

72 Commits

Author SHA1 Message Date
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