minggo 00695eed49 Merge pull request #7261 from boyu0/fix_pvr_bgra8888_crash ... fix crash when load pvr bgra8888 image on android.		2014-06-30 21:39:20 +08:00
..
2d	unbind the VAO anyway to for safety.	2014-06-30 21:08:43 +08:00
3d	Merge pull request #7253 from super626/v3	2014-06-30 17:33:13 +08:00
audio	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-06-20 10:51:13 +08:00
base	fix compiling error on iOS	2014-06-30 17:20:13 +08:00
deprecated	CCLOGINFO compilation fix	2014-06-19 20:59:08 +04:00
editor-support	Merge pull request #7251 from 2youyouo2/v3_current_frame_index	2014-06-30 17:32:24 +08:00
math	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
network	put request param in lambda in HttpClient::networkThreadAlone	2014-06-26 02:03:53 +08:00
physics	fix transform for physics.	2014-06-27 17:30:21 +08:00
platform	issue #4895:Get events from controller to engine[android]	2014-06-30 03:23:51 +08:00
renderer	fix crash when load pvr bgra8888 image in android.	2014-06-30 20:58:26 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-06-30 09:45:03 +00:00
storage	Optimize the win32 projects configuration.	2014-06-20 10:50:43 +08:00
ui	fix scrollview crashes on win32 because of variable returned without initialization	2014-06-30 10:19:00 +08:00
Android.mk	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630	2014-06-30 13:41:55 +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]	2014-06-17 18:42:10 +08:00
cocos2d.h	change ActionTimeline to cocostudio ActionTimeline folder	2014-06-13 18:51:32 +08:00