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

28 Commits

Author SHA1 Message Date
edwardzhou e1c21aa9cb rename UIHelper to Helper for consistency 2014-01-07 16:22:18 +08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +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 46153d8c34 More warning fixes. 2014-01-04 09:17:37 +08:00
CaiWenzhi 767bf81e90 Modify renderers draw order define. 2014-01-03 15:46:42 +08:00
James Chen b17117a1a1 More warning fixes. 2013-12-28 14:34:52 +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 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 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 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
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 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
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
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 e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00