minggo f210fadb00 Merge pull request #11472 from milos1290/v3 ... Adding Lerp for Vec3		2015-04-17 17:56:10 +08:00
..
2d	Label:Fixed the shadow color of system font may be incorrect.	2015-04-17 15:42:41 +08:00
3d	merge cocos resolve conflict	2015-04-14 13:56:05 +08:00
audio	removed WP8 project files	2015-04-15 07:13:54 -07:00
base	Label:disableEffect(LabelEffect::XXXX) support disable all effect.	2015-04-17 14:39:52 +08:00
deprecated	Optimize Vec3	2015-04-05 13:09:50 +03:00
editor-support	Merge pull request #11455 from xiaofeng11/v3	2015-04-16 14:37:22 +08:00
math	Adding linear interpolation convenient method in MathUtils.	2015-04-16 15:17:25 +02:00
network	[ci skip]Update comments.	2015-03-27 18:26:14 +08:00
physics	Physics: Fixed the rotation of physics body is wrong if the rotation for node is set before body attached.	2015-04-10 17:01:21 +08:00
platform	remove system zlib dependency since we use our own prebuilt version of	2015-04-17 17:24:33 +08:00
renderer	merge cocos resolve conflict	2015-04-14 13:56:05 +08:00
scripting/lua-bindings	Merge pull request #11482 from samuele3hu/v3_remove_useless	2015-04-17 17:54:53 +08:00
storage	[ci skip]Update comments	2015-03-24 14:12:58 +08:00
ui	Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix	2015-04-16 18:16:28 +08:00
Android.mk	use prebuilt zlib for android and mac	2015-04-07 23:20:02 +08:00
CMakeLists.txt	fix typo	2015-03-05 17:05:08 +08:00
cocos2d.cpp	[ci skip] update version	2015-04-14 10:46:20 +08:00
cocos2d.h	[ci skip] update version	2015-04-07 10:35:49 +08:00