yangxiao 68eaadaffb merge cocos		2015-03-04 09:57:42 +08:00
..
2d	merge cocos	2015-03-03 17:23:33 +08:00
3d	allow transition time to 0	2015-03-03 11:04:34 +08:00
audio	Fixed audio can't resume after the interruption of audio session has ended on iOS.	2015-02-12 15:38:44 +08:00
base	Fixed the position of physics body is wrong when the position of parent node has been change.	2015-02-27 17:55:25 +08:00
deprecated	comments	2015-01-06 14:45:10 +03:00
editor-support	3DParticle Reader and tests	2015-02-26 09:19:14 +08:00
math	modify by colleague for cocostudio.	2015-01-16 13:23:03 +08:00
network	Merge pull request #10325 from seobyeongky/httpclient_bugfix	2015-02-27 14:32:41 +08:00
physics	Merge pull request #8980 from fspadoni/v3	2015-02-15 18:58:17 +08:00
platform	Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path	2015-02-25 20:24:07 -08:00
renderer	fix transparent render bug	2015-03-03 10:42:47 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-03-03 15:15:43 +00:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-02-26 17:27:42 +08:00
Android.mk	only mathUtil.cpp compiles with neon	2015-01-21 18:29:28 +08:00
CMakeLists.txt	cmake: fix using of external/xxhash for msvc generated project	2015-01-26 10:03:49 +03:00
cocos2d.cpp	[ci skip]update version	2015-02-26 10:39:37 +08:00
cocos2d.h	[ci skip] update version	2015-02-26 10:40:30 +08:00