minggo 37c9a9cb98 Merge pull request #11636 from super626/v3.6 ... fix bug some 3d sprite crash when texture missing on release mode		2015-04-29 09:35:37 +08:00
..
2d	Fixed warns and crash on Win32.	2015-04-28 20:10:56 +08:00
3d	fix bug some 3d sprite crash when texture missing on release mode	2015-04-28 23:55:23 +08:00
audio	removed WP8 project files	2015-04-15 07:13:54 -07:00
base	modify some about animate3D quality!	2015-04-24 11:49:28 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	Fix simulator crash when miss some armature resource	2015-04-28 11:54:36 +08:00
math	Optimize Vec2	2015-04-19 20:40:52 +03:00
network	Fix android http client memory leak	2015-04-26 20:52:09 +09:00
physics	Optimize Vec2	2015-04-19 20:40:52 +03:00
platform	Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3	2015-04-24 18:29:23 +08:00
renderer	fix	2015-04-24 11:40:15 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-04-28 12:21:56 +00:00
storage	[ci skip]Update comments	2015-03-24 14:12:58 +08:00
ui	remove uishader settings	2015-04-20 17:04:49 +08:00
Android.mk	Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest	2015-04-28 09:17:00 +08:00
CMakeLists.txt	fix typo	2015-03-05 17:05:08 +08:00
cocos2d.cpp	[ci skip] update version	2015-04-27 16:46:03 +08:00
cocos2d.h	[ci skip] update version	2015-04-07 10:35:49 +08:00