10 Commits

Author	SHA1	Message	Date
Jaroslaw Lewandowski	3f7c506638	Ability to save/retrieve CCData into/from CCUserDefault	2013-05-29 01:06:41 +01:00
minggo	6f624351b3	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support	2013-05-28 11:36:05 +08:00
minggo	b038741d78	issue #2161: make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp	2013-05-27 15:06:43 +08:00
James Chen	8448280ed3	issue 2217: Updating Make file and project configuration to add ccFPSImage.c.	2013-05-23 16:50:48 +08:00
James Chen	42427634f2	fixed #2142: Adding datavisitor support for other platforms except win32.	2013-05-10 15:37:40 +08:00
Sam Clegg	ffb7360e46	Enable easy swithing between Box2D and chipmunk in linux and nacl ... The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously hardcoded in the Makefiles. Now you get chipmunk by default on both platforms and can enble Box2D by setting USE_BOX2D in your environment. Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and -D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles. These should never be defined globally like this.	2013-04-15 07:35:50 -07:00
minggo	dd8681b18b	Merge pull request #2113 from minggo/refactor-ccuserdefault ... Refactor ccuserdefault	2013-03-06 23:05:50 -08:00
minggo	e85989f76e	issue #1529:modify marmalade and native client project configuration	2013-03-07 09:51:26 +08:00
Sam Clegg	7ad171d8ee	Use same top level Makefile for nacl and linux builds. ... Also, re-use some of the concepts from the linux build system (such as quite by default) in the nacl build. Fix remaining warnings in NaCl builds.	2013-03-06 13:02:55 -08:00
Sam Clegg	33c422d1d5	Add new port: Native Client	2013-03-02 12:15:24 -08:00