Huabing.Xu 83bae15caf Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject ... # Conflicts: # cocos/2d/libcocos2d.vcxproj.filters # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters		2015-05-26 12:06:05 +08:00
..
2d	Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject	2015-05-26 12:06:05 +08:00
3d	use trianglescommand for sprite	2015-05-22 15:54:56 +08:00
audio	fix deprecated method	2015-05-21 13:30:51 -07:00
base	Merge branch 'v3' into v3FrameBufferObject	2015-05-25 16:56:22 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	upgrade rapidjson to 1.0.2	2015-05-25 11:43:03 +08:00
math	Optimize Vec2	2015-04-19 20:40:52 +03:00
network	fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result.	2015-05-22 10:47:52 +08:00
physics	Correct field initialization order in various places (Xcode warnings)	2015-05-01 12:19:30 +03:00
physics3d	use reference param	2015-05-13 10:13:46 +08:00
platform	Merge pull request #12003 from minggo/remove-unneeded-function	2015-05-25 16:33:38 +08:00
renderer	Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject	2015-05-26 12:06:05 +08:00
scripting	Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2	2015-05-25 15:18:15 +08:00
storage	Implement localStorage.clear on Android	2015-05-14 10:40:25 +08:00
ui	add Android 9-patch image format support	2015-05-21 16:04:37 +08:00
Android.mk	Merge branch 'v3' into v3FrameBufferObject	2015-05-25 16:56:22 +08:00
CMakeLists.txt	add physics3d support	2015-05-08 15:49:33 +08:00
cocos2d.cpp	Material uses new file format	2015-05-11 21:31:33 -07:00
cocos2d.h	Merge branch 'v3' into v3FrameBufferObject	2015-05-18 13:48:50 +08:00