axmol/cocos
minggo 4b7d5694b8 Merge pull request #8573 from Dhilan007/v3-labelatlas
fix #8569: LabelAtlas opacity do not change when setting parent node's opacity
2014-10-10 15:52:50 +08:00
..
2d Merge pull request #8573 from Dhilan007/v3-labelatlas 2014-10-10 15:52:50 +08:00
3d Merge branch 'v3' into v3_fixGLProgramCrash 2014-10-10 15:05:09 +08:00
audio wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
base Merge pull request #136 from songchengjiang/new_v3 2014-10-09 18:31:24 +08:00
deprecated Multi platform cmake support 2014-10-03 23:21:45 +01:00
editor-support Merge pull request #7979 from giginet/scene-reader-canvas-size 2014-10-10 15:00:28 +08:00
math Multi platform cmake support 2014-10-03 23:21:45 +01:00
network wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
physics Multi platform cmake support 2014-10-03 23:21:45 +01:00
platform add 'static' for global function 2014-10-10 15:13:05 +08:00
renderer remove texture unit 4-7, only 0 -3 is reserved 2014-10-10 14:06:37 +08:00
scripting/lua-bindings Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-10-10 09:52:29 +08:00
storage wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
ui fix button title only content size issue 2014-10-10 11:01:51 +08:00
Android.mk move light fix linux and android 2014-09-28 16:05:20 +08:00
CMakeLists.txt Android: added support for building libcocos2d 2014-10-03 23:22:35 +01:00
cocos2d.cpp [ci skip]update version info 2014-09-19 21:54:01 +08:00
cocos2d.h move light from 3d to base 2014-09-28 16:02:12 +08:00