minggo 9509f4cf9a Merge pull request #8139 from tttreal/label-getStringNumLines-bugfix ... [CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty		2014-09-25 14:44:28 +08:00
..
2d	Merge pull request #8139 from tttreal/label-getStringNumLines-bugfix	2014-09-25 14:44:28 +08:00
3d	Merge pull request #8106 from super626/v3	2014-09-19 16:16:33 +08:00
audio	fix noise on mac	2014-09-22 16:59:24 +08:00
base	call getCascadeBoundingBox() properly	2014-09-18 15:40:28 +08:00
deprecated	Adds MARK: TODO: FIXME: in code	2014-08-29 12:54:24 -07:00
editor-support	remove deprecated warning	2014-09-12 17:06:13 +08:00
math	added Node::getCascadeBoundingBox()	2014-09-18 13:11:10 +08:00
network	Rename setSSLVerification	2014-09-14 00:28:11 +09:00
physics	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
platform	Merge pull request #8149 from andyque/fixIOS8EditBox	2014-09-25 13:47:23 +08:00
renderer	add comment	2014-09-18 12:04:42 +08:00
scripting/lua-bindings	update lua binding	2014-09-22 15:54:35 +08:00
storage/local-storage	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
ui	remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp	2014-09-24 17:47:38 +08:00
Android.mk	Merge pull request #7968 from Dhilan007/v3-audio903	2014-09-11 15:23:17 +08:00
CMakeLists.txt	fix compile on ubuntu.	2014-09-21 23:49:43 +08:00
cocos2d.cpp	[ci skip]update version info	2014-09-19 21:54:01 +08:00
cocos2d.h	merge cocos	2014-09-10 10:28:59 +08:00