minggo 578af01ef1 Merge pull request #7499 from andyque/fixRichTextUTF8 ... fix richText utf8 error		2014-07-17 17:57:41 +08:00
..
2d	Merge pull request #7493 from visiblelight/render_texture_disabled	2014-07-17 17:07:54 +08:00
3d	Change atof() to utils::atof()	2014-07-14 20:45:24 +08:00
audio	fix compiling warnings	2014-07-03 11:43:56 +08:00
base	Merge pull request #7477 from Dhilan007/v3-gc0717	2014-07-17 15:13:57 +08:00
deprecated	Change atof() to utils::atof()	2014-07-14 20:45:24 +08:00
editor-support	1. fixes ActionManagerEx crashes.	2014-07-17 17:24:41 +08:00
math	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
network	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
physics	Fix the bug: flip scale for physics body make it's size incorrect.	2014-07-17 17:21:09 +08:00
platform	Merge pull request #7476 from Dhilan007/v3-gc0717	2014-07-17 11:12:31 +08:00
renderer	Fix compile errors on WP8	2014-07-11 15:10:19 +08:00
scripting/lua-bindings	Fix type judgment error.	2014-07-17 16:41:09 +08:00
storage	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
ui	Merge pull request #7499 from andyque/fixRichTextUTF8	2014-07-17 17:57:41 +08:00
Android.mk	disable warn on zero-sized structures.	2014-07-14 17:53:55 +08:00
CMakeLists.txt	Squashed commit of the following:	2014-05-18 14:49:16 -07:00
cocos2d-prefix.pch	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
cocos2d.cpp	[ci skip]	2014-07-15 15:11:17 +08:00
cocos2d.h	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix	2014-07-11 16:44:59 +08:00