63 Commits

Author	SHA1	Message	Date
carlo morgantini	002ae77698	new dynamic TTF label stuff	2013-07-11 14:41:03 -07:00
carlo morgantini	9264b3de1d	more clean up	2013-07-10 11:59:05 -07:00
samuele3hu	31d0e492c2	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-10 15:05:02 +08:00
samuele3hu	cf1cbe1bd6	issue #2377:add scriptHandlerMgr and modify ActionManager.lua	2013-07-10 15:04:00 +08:00
James Chen	a517e68c59	closed #2379: Removing CCZone.h/.cpp.	2013-07-09 14:50:31 +08:00
minggo	dfde41b932	issue #2129:fix conflicts	2013-07-05 17:32:50 +08:00
minggo	04465622b7	issue #2129:remove prefix of types in ccTypes.h	2013-07-05 16:49:22 +08:00
James Chen	d2746bbe90	issue #2373: Removing inline for virtual function. Adding more const getter functions.	2013-07-05 15:08:52 +08:00
James Chen	8f5dba6c44	issue #2371: Using the same prefix header for iOS and Mac.	2013-07-05 10:53:16 +08:00
James Chen	808ce2e208	close #2371: Adding Lua projects for Mac.	2013-07-04 16:29:06 +08:00
James Chen	397b698f07	[iOS] Adding lua projects.	2013-07-04 13:50:09 +08:00
Ricardo Quesada	22b42bfe7d	SimpleGame and HelloCpp works as expected ... their Info.plist was broken	2013-07-03 13:24:39 -07:00
Ricardo Quesada	2b73d0cb5f	ios and mac projects unified in one simple xcode project ... Not finished yet: - iOS only includes Test Cpp (Simple Game not working yet on iOS) It is easier to maintain and add more targets, files, etc.	2013-07-02 18:20:38 -07:00