9 Commits

Author	SHA1	Message	Date
Ed Bartley	925c21cdde	Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20	2012-09-18 18:42:41 -04:00
Ed Bartley	c67412618d	Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 ... Conflicts: extensions/GUI/CCScrollView/CCScrollView.cpp	2012-09-10 10:50:30 -04:00
Ed Bartley	01103c4cb1	Remove optimization of the mac debug build	2012-09-10 10:48:34 -04:00
James Chen	1460f4e42f	issue #1458: Updated project configuration for all platforms. ... CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.	2012-09-10 13:39:12 +08:00
Ed Bartley	a392b17182	MAC project is missing the header search path to /include	2012-09-07 13:14:22 -04:00
YuLei	da79992275	Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20	2012-09-02 00:38:57 +08:00
YuLei	a38b8d4a00	[Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function ... [Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler() [Lua] update luabinding	2012-08-25 17:08:33 +08:00
minggo	9ccf3cefdf	fixed #1417:add header search path and add CCTouch.cpp into mac project	2012-08-06 11:08:06 +08:00
Nat Weiss	9f0be2de05	Added Mac cpp HelloWorld and Tests.	2012-07-24 19:07:31 -07:00