James Chen
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +08:00 |
minggo
|
ac8a7b4ce1
|
Merge pull request #4983 from dabingnn/develop_layerColorBug
fix layerColor occlude sprite bug on android
|
2014-01-07 06:25:59 -08:00 |
Huabing.Xu
|
b1d9d5e55e
|
fix layerColor occlude sprite bug on android
|
2014-01-07 22:08:00 +08:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
James Chen
|
12cc6c6153
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer
Conflicts:
cocos/2d/CMakeLists.txt
|
2013-12-17 15:50:24 +08:00 |
Dhilan007
|
39280d55f3
|
new label:add support for distanceField
PerformanceTest:add performance test for label.
|
2013-12-13 12:42:15 +08:00 |
Ricardo Quesada
|
61cc365d9e
|
Merge branch 'develop' into newRenderer
Conflicts:
cocos/2d/CCGLProgram.h
cocos/2d/CCLabelTTF.h
|
2013-12-12 14:41:42 -08:00 |
Ricardo Quesada
|
f4c68e4eef
|
More renames of description() to getDescription()
|
2013-12-12 14:38:12 -08:00 |
Ricardo Quesada
|
29a15c885a
|
Merge branch 'develop' into newRenderer
|
2013-12-12 11:44:09 -08:00 |
James Chen
|
9e637a3a3b
|
issue #2790: GLProgram::getXXXLog return `std::string` to prevent using CCString which was deprecated.
|
2013-12-11 22:35:37 +08:00 |
Ricardo Quesada
|
ee0ef6bf46
|
ProgressTimer works OK
Adds _modelViewTransform as ivar of Node (temporary fix)
|
2013-12-06 17:42:16 -08:00 |
Ricardo Quesada
|
81b06f06a9
|
Merge branch 'develop' into newRenderer
Conflicts:
cocos/2d/CCAtlasNode.h
|
2013-12-05 22:24:41 -08:00 |
Ricardo Quesada
|
e699a3b765
|
Uses MV in Quad Command
|
2013-12-05 19:04:01 -08:00 |
Ricardo Quesada
|
4d7e56b44a
|
fix indentation
|
2013-11-22 09:42:21 -08:00 |
bmanGH
|
f540131320
|
add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.
|
2013-11-12 18:59:37 +08:00 |
Ricardo Quesada
|
17af5b6850
|
Adds flags in GLProgram to prevent sending uneeded uniforms
|
2013-10-31 17:56:15 -07:00 |
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |