16 Commits

Author	SHA1	Message	Date
James Chen	230b8a386b	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' ... with four spaces. Also, 1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead of }. 2. Removed some unused files. 3. Renamed the name of some folders, for example, "test.android"-->"proj.android" .	2012-04-19 14:35:52 +08:00
James Chen	4baebb8cab	issue #1094: renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton. ... fixed a memory leak in CCParticleSystem.	2012-04-08 12:50:15 +08:00
James Chen	64665fe7c8	issue #1094: Make ParticleBatchNode works on win32.	2012-04-07 12:02:40 +08:00
YuLei Liao	6ebdf9cb4b	* add CCScriptSupport	2012-02-09 14:07:11 +08:00
YuLei Liao	69a7e2a2e3	* change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int.	2012-02-04 11:34:17 +08:00
dumganhar	6fbf2f1d09	move SelectorProtocol to CCObject	2012-02-03 15:05:29 +08:00
YuLei Liao	4bf68e79fd	* merge upstream/master to master	2011-11-29 19:56:20 +08:00
YuLei Liao	0739c1f262	* rename LuaEngine to CCLuaEngine ... * add #if LUA_ENGINE * format source files	2011-11-29 15:42:12 +08:00
minggo	f0d22ae504	issue #879: replase assert with CCAssert	2011-11-28 17:28:43 +08:00
YuLei Liao	4ff2bf96d1	* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined	2011-11-23 13:41:48 +08:00
YuLei Liao	09d12be875	* format cocos2d-x source files	2011-11-18 21:23:54 +08:00
Leon	785b79d263	fix compile errors under ubuntu 11.10	2011-10-31 23:50:08 -07:00
Walzer	348a05a329	fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference	2011-07-07 08:23:31 +08:00
liswei	1591c7edc8	fixed #512 fix warnings in /Wall flag	2011-06-10 17:51:37 +08:00
minggo	47173778cc	fixed #409: rename NSArray UIAlignment	2011-03-18 14:31:29 +08:00
minggo	b5a99f90df	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00