axmol/cocos
minggo 7bf2be6033 Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
Bugfix autorelease pool manager
2014-06-04 14:31:30 +08:00
..
2d Merge pull request #6969 from boyu0/bug5482_setPhysicsBody 2014-06-04 13:52:43 +08:00
3d issue #5429: treat warning as error on Mac 2014-05-30 16:46:01 +08:00
audio Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32 2014-05-29 15:25:58 +08:00
base Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager 2014-06-04 14:31:30 +08:00
deprecated Point is no longer deprecated 2014-05-18 15:12:48 -07:00
editor-support Merge pull request #6616 from xhcnb/fix_callback 2014-05-27 14:51:36 +08:00
math Point is no longer deprecated 2014-05-18 15:12:48 -07:00
network Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32 2014-05-29 15:25:58 +08: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 #6954 from visiblelight/AlphaIssues 2014-06-04 10:04:20 +08:00
renderer Merge branch 'v3.1hotfix' into v3 2014-05-30 10:19:56 +08:00
scripting/lua-bindings Merge pull request #6966 from kicktheken/v3 2014-06-04 14:12:52 +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 refactor ListView, add do Layout 2014-06-04 10:51:32 +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 update version 2014-05-23 14:30:08 +08:00
cocos2d.h move the capturen screen interface from Director to ccUtils 2014-05-27 10:44:23 +08:00