axmol/cocos
minggo c63983345b Merge pull request #7353 from andyque/addStudio1.4
add studio v1.3, v1.4, v1.5 tests
2014-07-11 14:15:07 +08:00
..
2d Merge pull request #7363 from Dhilan007/v3-event-clear 2014-07-11 13:36:52 +08:00
3d Merge pull request #7363 from Dhilan007/v3-event-clear 2014-07-11 13:36:52 +08:00
audio fix compiling warnings 2014-07-03 11:43:56 +08:00
base Merge pull request #7363 from Dhilan007/v3-event-clear 2014-07-11 13:36:52 +08:00
deprecated fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
editor-support fix text reader binray version setFontName 2014-07-11 13:58:08 +08:00
math fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
network fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
physics fix transform for physics. 2014-06-27 17:30:21 +08:00
platform Merge pull request #7392 from xhcnb/fix_CC_ENABLE_SCRIPT_BINDING_build 2014-07-11 13:41:33 +08:00
renderer Merge pull request #7363 from Dhilan007/v3-event-clear 2014-07-11 13:36:52 +08:00
scripting/lua-bindings Merge pull request #7400 from CocosRobot/update_lua_bindings_1405057491 2014-07-11 13:52:38 +08:00
storage fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
ui fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +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