axmol/cocos
bofeng-song 6f1404ec46 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-22 18:28:02 +08:00
..
2d Merge pull request #6854 from MSOpenTech/wp8-v3-fix 2014-05-21 14:31:18 +08:00
3d Squashed commit of the following: 2014-05-18 14:49:16 -07:00
audio Squashed commit of the following: 2014-05-16 14:36:00 -07:00
base Squashed commit of the following: 2014-05-16 14:36:00 -07:00
deprecated Point is no longer deprecated 2014-05-18 15:12:48 -07:00
editor-support Merge pull request #6734 from 2youyouo2/v3 2014-05-17 12:17:34 +08:00
math Point is no longer deprecated 2014-05-18 15:12:48 -07:00
network Squashed commit of the following: 2014-05-16 14:36:00 -07:00
physics closed #4944: fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback. 2014-05-21 16:07:49 +08:00
platform Merge pull request #6854 from MSOpenTech/wp8-v3-fix 2014-05-21 14:31:18 +08:00
renderer adding guard for the callback condition 2014-05-22 12:42:52 +08:00
scripting/lua-bindings Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-22 18:28:02 +08:00
storage upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 2014-05-07 17:41:04 +03:00
ui fixed ui header file include problem 2014-05-22 10:49:28 +08:00
Android.mk Squashed commit of the following: 2014-05-18 14:49:16 -07: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 Improvments on the shader2 tests 2014-05-14 13:09:33 -07:00
cocos2d.h Squashed commit of the following: 2014-05-18 14:49:16 -07:00