axmol/cocos
andyque 5ddfc41414 Merge branch 'v3' into refactorLayout
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-19 13:54:16 +08:00
..
2d Squashed commit of the following: 2014-05-18 14:49:16 -07: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 Squashed commit of the following: 2014-05-14 10:07:09 -07:00
platform Squashed commit of the following: 2014-05-18 14:49:16 -07:00
renderer Squashed commit of the following: 2014-05-18 14:49:16 -07:00
scripting/lua-bindings [AUTO]: updating luabinding automatically 2014-05-19 03:16:40 +00:00
storage upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 2014-05-07 17:41:04 +03:00
ui issue #5183, add layout parameter type to widget for convenient access 2014-05-16 10:33: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