Dale Stammen eb2bc78970 Merge branch 'v3' into v3-winrt-librecast		2015-06-16 07:13:53 -07:00
..
2d	Merge branch 'v3' into v3-winrt-librecast	2015-06-16 07:13:53 -07:00
3d	Merge pull request #12102 from super626/navigation2	2015-06-15 13:39:05 +08:00
audio	Merge pull request #12080 from linshun/v3	2015-06-15 12:45:11 +08:00
base	Merge pull request #12349 from WenhaiLin/v3-37-NotificationNode-crashfix	2015-06-16 09:53:39 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	added librecast. Updated build properties	2015-06-15 18:44:14 -07:00
math	Optimize Vec2	2015-04-19 20:40:52 +03:00
navmesh	remove unused code, and use nullptr for pointer	2015-06-16 11:15:39 +08:00
network	Merge pull request #12080 from linshun/v3	2015-06-15 12:45:11 +08:00
physics	issue #12078: added subgroup of physics 2d.	2015-06-15 10:28:37 +08:00
physics3d	Removes not-needed draws	2015-06-15 10:40:47 -07:00
platform	Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix	2015-06-15 14:48:42 +08:00
renderer	StateBlock() is public	2015-06-15 17:43:37 -07:00
scripting	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-06-15 05:46:51 +00:00
storage	issue #12078: added storage group.	2015-05-28 15:48:08 +08:00
ui	Removes not-needed draws	2015-06-15 10:40:47 -07:00
Android.mk	rename CCNavMeshTool to CCNavMeshUtils	2015-06-15 12:52:55 +08:00
CMakeLists.txt	add 3d navigation	2015-05-29 16:45:33 +08:00
cocos2d.cpp	Material uses new file format	2015-05-11 21:31:33 -07:00
cocos2d.h	file rename CCFrameBufferObject->CCFrameBuffer	2015-06-09 15:32:12 +08:00