Ricardo Quesada
|
7ac663e02c
|
GL Program API fixes
|
2014-03-04 13:51:43 -08:00 |
Huabing.Xu
|
52ca254ecf
|
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
|
2014-01-24 18:39:26 +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 |
Huabing.Xu
|
57b0426994
|
fix bug clippingNodetest on mobile
|
2014-01-02 16:19:23 +08:00 |
Dhilan007
|
f250d24766
|
fix black screen when back to foreground on android.
|
2013-12-27 11:56:56 +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
|
81b06f06a9
|
Merge branch 'develop' into newRenderer
Conflicts:
cocos/2d/CCAtlasNode.h
|
2013-12-05 22:24:41 -08:00 |
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |