Huabing.Xu 22ddf53539 Merge branch 'v3FrameBufferObject' into v3		2015-05-29 10:38:42 +08:00
..
2d	Merge branch 'v3FrameBufferObject' into v3	2015-05-29 10:38:42 +08:00
3d	Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue	2015-05-27 11:17:31 +08:00
audio	Merge pull request #11762 from WenhaiLin/v3-audioengine-i11697	2015-05-28 14:52:20 +08:00
base	Merge branch 'v3FrameBufferObject' into v3	2015-05-29 10:38:42 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	Merge branch 'v3' into v3-winrt-audio	2015-05-27 11:54:21 -07: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 branch 'v3' into v3-winrt-audio	2015-05-27 11:54:21 -07:00
renderer	Merge branch 'v3FrameBufferObject' into v3	2015-05-29 10:38:42 +08:00
scripting	Merge pull request #11908 from flashjay/patch-1	2015-05-28 10:58:46 +08:00
storage	Implement localStorage.clear on Android	2015-05-14 10:40:25 +08:00
ui	add bmfont test	2015-05-27 16:58:52 +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