samuele3hu a547d6aa33 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation ... Conflicts: tools/bindings-generator		2015-06-16 11:36:11 +08:00
..
2d	Merge pull request #12160 from namezero111111/patch-3	2015-06-16 10:27:38 +08: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	Merge pull request #12314 from xiaofeng11/v3_xiaofeng	2015-06-15 13:13:39 +08:00
math	Optimize Vec2	2015-04-19 20:40:52 +03:00
navmesh	rename CCNavMeshTool to CCNavMeshUtils	2015-06-15 12:52:55 +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	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation	2015-06-16 11:36:11 +08: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