minggo 9f51adfafa Merge pull request #7461 from joshuastray/fix_constructor_access ... fix LabelAtlas constructor protected to CC_CONSTRUCTOR_ACCESS		2014-08-06 10:15:02 +08:00
..
2d	Merge pull request #7461 from joshuastray/fix_constructor_access	2014-08-06 10:15:02 +08:00
3d	spelling error	2014-08-04 16:07:16 +08:00
audio	change CocosDenshion to libcocosdenshion	2014-07-28 21:35:16 +08:00
base	Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr	2014-08-05 13:51:15 +08:00
deprecated	Merge branch 'v3' into v3_dll	2014-07-17 14:12:10 +08:00
editor-support	remove some update condition of Frame::apply function	2014-08-01 14:40:42 +08:00
math	add Quaternion::ZERO	2014-07-31 18:36:30 +08:00
network	change libnetwork and libSpine	2014-07-29 09:31:52 +08:00
physics	Mac dylib version works now	2014-07-17 20:58:50 +08:00
platform	merge v3 into v3_wp8glviewhookpr	2014-08-04 16:49:42 +08:00
renderer	add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib	2014-08-05 15:15:17 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-08-05 05:35:12 +00:00
storage	remove unused windows localstorage project file	2014-07-29 15:23:07 +08:00
ui	Merge pull request #7674 from darkdukey/patch-12	2014-08-06 09:50:47 +08:00
Android.mk	merge cocos2d, fix lua	2014-08-04 12:07:27 +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 cocos2d, fix lua	2014-08-04 12:07:27 +08:00