axmol/cocos
chuanweizhang2013 e32eadc364 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-04 13:36:51 +08:00
..
2d Merge pull request #7299 from dabingnn/fast_tmx 2014-07-04 09:49:30 +08:00
3d Merge pull request #7253 from super626/v3 2014-06-30 17:33:13 +08:00
audio fix compiling warnings 2014-07-03 11:43:56 +08:00
base fixed can't get valid value from trigger button. 2014-07-02 14:19:10 +08:00
deprecated CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00
editor-support Merge pull request #7305 from andyque/fixLayoutReader 2014-07-03 17:16:56 +08:00
math Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
network fix compiling warnings 2014-07-03 11:43:56 +08:00
physics fix transform for physics. 2014-06-27 17:30:21 +08:00
platform Merge pull request #7286 from Dhilan007/v3-gc0702 2014-07-02 16:24:24 +08:00
renderer fix crash when load pvr bgra8888 image in android. 2014-06-30 20:58:26 +08:00
scripting/lua-bindings Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-03 11:13:59 +08:00
storage Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
ui Merge pull request #7295 from minggo/support-regular-expression 2014-07-03 15:20:06 +08:00
Android.mk fix compiling warnings 2014-07-03 11:43:56 +08:00
CMakeLists.txt Squashed commit of the following: 2014-05-18 14:49:16 -07:00
cocos2d-prefix.pch Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d.cpp [ci skip] 2014-06-17 18:42:10 +08:00
cocos2d.h change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00