minggo c7473611b8 Merge pull request #7463 from Dhilan007/v3-320final ... Remove prompt box of connect controller[Nibiru].		2014-07-16 15:26:24 +08:00
..
2d	disable warn on zero-sized structures.	2014-07-14 17:53:55 +08:00
3d	Merge pull request #7363 from Dhilan007/v3-event-clear	2014-07-11 13:36:52 +08:00
audio	fix compiling warnings	2014-07-03 11:43:56 +08:00
base	Merge pull request #7412 from Dhilan007/v3-320final	2014-07-11 18:50:25 +08:00
deprecated	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
editor-support	1. Fixes CCTimeLine warning.	2014-07-15 18:07:33 +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 transform for physics.	2014-06-27 17:30:21 +08:00
platform	Remove prompt box of connect controller[Nibiru].	2014-07-16 14:48:22 +08:00
renderer	Fix compile errors on WP8	2014-07-11 15:10:19 +08:00
scripting/lua-bindings	Update bindings-generator config files and manual bindings files to fix the compile warning	2014-07-15 17:38:56 +08:00
storage	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
ui	update UI module code comments	2014-07-15 15:56:07 +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