33 Commits

Author	SHA1	Message	Date
James Gregory	1e1c4156e7	Switch to using GL_DYNAMIC_DRAW.	2013-04-08 22:08:44 -07:00
James Gregory	f42254125f	Get CCGrid to work.	2013-04-08 17:51:30 -07:00
Sam Clegg	38878b084b	Fix all compiler warnings produced by gcc. ... This allows the linux and NaCl builds (and perhaps others) to be compiles with -Wall and -Werror, and it makes the build output much less noisy.	2013-03-05 17:01:00 -08:00
James Chen	6d29e63294	fixed #1494: Change the value of CCObject::m_uAutoreleaseCount in CCAutoreleasePool class.	2012-10-08 14:05:03 +08:00
James Chen	54b4c690d1	fixed #1494: Missing removing auto-release object from AutoReleasePool if invoking 'autorelease' method more times.	2012-10-08 13:41:48 +08:00
walzer	0cca568ffe	fixed #1492, assert if user add an CCObject* into CCAutoreleasePool twice.	2012-09-28 18:22:00 +08:00
Donald Alan Morrison	4cbd993091	Minor English Spelling Corrections. A few grammar corrections.	2012-09-17 00:02:24 -07:00
James Chen	7d8b261ced	fixed #1477: Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.	2012-09-11 14:02:33 +08:00
James Chen	9ba5a1bfef	issue #1454: Removed COCOS2D_JAVASCRIPT macro.	2012-08-31 21:23:23 +08:00
minggo	860d3eff4b	issue #1454: make js binding work together with lua binding and native codes	2012-08-31 17:55:45 +08:00
Rohan Kuruvilla	8d7516a0ef	Test project for cocos2d-x js.	2012-08-27 10:07:31 -07:00
Rolando Abarca	42ce395f05	uses proxy instead of Get/SetPrivate	2012-08-27 08:43:38 -07:00
Rohan Kuruvilla	0e9ba1173a	Callbacks	2012-08-27 08:43:37 -07:00
Rolando Abarca	4e640ecb35	uses new ADD_OBJECT_TYPE macro	2012-08-27 08:43:37 -07:00
Rolando Abarca	701f5e9dfc	roots & unroots jsobject	2012-08-27 08:43:37 -07:00
Luis Vallejo	c9408b7b75	Fixed Spelling Error CCObject::isSingleRefrence to CCObject::isSingleReference	2012-07-14 09:56:07 +08:00
minggo	90448ec7d0	issue #1269:fix some compiling error because of including error header files	2012-06-19 16:20:46 +08:00
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