axmol/cocos
samuele3hu c59ba7851e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3 2014-07-08 12:03:04 +08:00
..
2d check if _itemsPerRow == 0 to avoid divide by zero 2014-07-07 11:17:05 -07: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 Merge pull request #7329 from Dhilan007/v3-gc-refactor 2014-07-07 18:45:23 +08:00
deprecated CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00
editor-support Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:21:00 +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 #7027 from zhouxiaoxiaoxujian/improvement/COC-9 2014-07-08 10:56:16 +08:00
renderer roll back initWithImage logic 2014-07-07 17:35:05 +08:00
scripting/lua-bindings Fix some type conversion error 2014-07-08 12:01:35 +08:00
storage Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
ui Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9 2014-07-08 10:56:16 +08:00
Android.mk Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor 2014-07-04 17:03:48 +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: update version] 2014-07-07 17:24:14 +08:00
cocos2d.h change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00