axmol/cocos
yangxiao 7b35f36ba3 Merge branch 'newcode' into v3 2014-07-09 09:56:23 +08:00
..
2d Merge pull request #7277 from darkdukey/fix_rotation3D 2014-07-08 22:05:27 +08:00
3d adjust api according feedback 2014-07-09 09:53:15 +08:00
audio fix compiling warnings 2014-07-03 11:43:56 +08:00
base Merge pull request #7347 from Dhilan007/v3-memory-leak 2014-07-08 21:13:56 +08:00
deprecated CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00
editor-support 1、fixes warning. 2014-07-09 00:09:35 +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 #7347 from Dhilan007/v3-memory-leak 2014-07-08 21:13:56 +08:00
renderer Merge pull request #7339 from super626/v3 2014-07-08 22:09:50 +08:00
scripting/lua-bindings Merge pull request #7339 from super626/v3 2014-07-08 22:09:50 +08:00
storage Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
ui Merge pull request #7336 from andyque/addMoreUITests 2014-07-08 20:15:21 +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 add 3d file to cocos2d.h 2014-07-08 11:02:29 +08:00