axmol/cocos
andyque 40f2128acd Merge branch 'v3' into 5176
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/UIPageView.cpp
	cocos/ui/UIScrollView.cpp
	cocos/ui/UIScrollView.h
2014-05-26 14:00:23 +08:00
..
2d Fixes compiler warnings for mac and ios 2014-05-22 16:34:16 -03: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 Set jpeg save quality to 90 (default is only 75, on a scale of 0 to 100). 2014-05-22 16:24:29 +05:30
renderer remove new lines 2014-05-23 18:01:17 +08:00
scripting/lua-bindings [AUTO]: updating luabinding automatically 2014-05-26 01:58:46 +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 Merge branch 'v3' into 5176 2014-05-26 14:00:23 +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 Squashed commit of the following: 2014-05-18 14:49:16 -07:00